Удалены методы item из коллекций. Обновлены тесты.

ColCh · Feb 3, 2014 · 0091af9 · 0091af9
1 parent 4ff1537
commit 0091af9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 32 deletions.
diff --git a/src/abstractions.js b/src/abstractions.js
@@ -244,14 +244,6 @@
 
     };
 
-    /**
-     * Вернёт ключевой кадр по индексу
-     * @param {number} index
-     */
-    KeyframesCollection.prototype.item = function (index) {
-        return this[index];
-    };
-
     /**
      * Объект с описанием анимируемого свойства
      * @param {string} propertyName
@@ -374,15 +366,6 @@
         return propertyDescriptor;
     };
 
-    /**
-     * Вернёт дескриптор свойства по определённому индексу
-     * @param {number} index
-     * @return {!PropertyDescriptor}
-     */
-    PropertyDescriptorCollection.prototype.item = function (index) {
-        return this[ index ];
-    };
-
     /** @const */
     var EasingRegistry = {
         /**

diff --git a/src/animate_class.js b/src/animate_class.js
@@ -81,7 +81,7 @@
         if (propertyDescriptorIndex === NOT_FOUND) {
             propertyDescriptor = this.animatedProperties.add(propertyName);
         } else {
-            propertyDescriptor = this.animatedProperties.item(propertyDescriptorIndex);
+            propertyDescriptor = this.animatedProperties[ propertyDescriptorIndex ];
         }
 
         /** @type {!KeyframesCollection} */
@@ -95,7 +95,7 @@
         var keyframe;
 
         if (keyframeIndex !== NOT_FOUND) {
-            keyframe = propertyKeyframes.item(keyframeIndex);
+            keyframe = propertyKeyframes[ keyframeIndex ];
         } else {
             keyframe = propertyKeyframes.add(progress);
         }
@@ -120,7 +120,7 @@
         var propertyDescriptorIndex = this.animatedProperties.indexOf(propertyName);
 
         if (propertyDescriptorIndex !== NOT_FOUND) {
-            propertyDescriptor = this.animatedProperties.item(propertyDescriptorIndex);
+            propertyDescriptor = this.animatedProperties[ propertyDescriptorIndex ];
 
             /** @type {!KeyframesCollection} */
             var propertyKeyframes = propertyDescriptor.getKeyframes();
@@ -130,7 +130,7 @@
             var keyframe;
 
             if (keyframeIndex !== NOT_FOUND) {
-                keyframe = propertyKeyframes.item(keyframeIndex);
+                keyframe = propertyKeyframes[ keyframeIndex ];
 
                 return keyframe.getValue();
             }
@@ -159,7 +159,7 @@
         if (propertyDescriptorIndex === NOT_FOUND) {
             propertyDescriptor = this.animatedProperties.add(propertyName);
         } else {
-            propertyDescriptor = this.animatedProperties.item(propertyDescriptorIndex);
+            propertyDescriptor = this.animatedProperties[ propertyDescriptorIndex ];
         }
 
         /** @type {!Keyframe} */
@@ -184,7 +184,7 @@
         var propertyDescriptorIndex = this.animatedProperties.indexOf(propertyName);
 
         if (propertyDescriptorIndex !== NOT_FOUND) {
-            propertyDescriptor = this.animatedProperties.item(propertyDescriptorIndex);
+            propertyDescriptor = this.animatedProperties[ propertyDescriptorIndex ];
 
             /** @type {!Keyframe} */
             var startingValue = propertyDescriptor.startingValue;
@@ -449,7 +449,7 @@
 
         for (var i = 0; i < this.animatedProperties.length; i++) {
 
-            propertyDescriptor = this.animatedProperties.item(i);
+            propertyDescriptor = this.animatedProperties[ i ];
             propertyKeyframes = propertyDescriptor.getKeyframes();
 
             propertyKeyframes.moveIndexTo(this.fractionalTime);
@@ -499,12 +499,12 @@
             // Формирование тела правила "@keyframes"
             for (var i = 0; i < this.animatedProperties.length; i++) {
 
-                var propertyDescriptor = this.animatedProperties.item(i);
+                var propertyDescriptor = this.animatedProperties[ i ];
                 var propertyKeyframes = propertyDescriptor.getKeyframes();
 
                 for (var j = 0; j < propertyKeyframes.length; j++) {
 
-                    var propertyKeyframe = propertyKeyframes.item(j);
+                    var propertyKeyframe = propertyKeyframes[ j ];
 
                     var key = propertyKeyframe.numericKey * 1e2;
                     var domStringKey = key_toDOMString(key);
@@ -626,7 +626,7 @@
         } else {
             // Возвращение анимированных свойств в доанимированное состояние
             for (var i = 0; i < this.animatedProperties.length; i++) {
-                var propertyDescriptor = this.animatedProperties.item(i);
+                var propertyDescriptor = this.animatedProperties[ i ];
                 var startingValue = propertyDescriptor.startingValue;
                 this.render(propertyDescriptor, startingValue.getValue());
             }

diff --git a/tests/tests/abstractions.js b/tests/tests/abstractions.js
@@ -53,16 +53,18 @@ test('KeyframesCollection', function () {
     var every = false;
     var i = numberOfKeyframes;
     while ( i-->1 ) {
-        every = dummyCollection.item(i).numericKey > dummyCollection.item(i - 1).numericKey;
+        every = dummyCollection[i].numericKey > dummyCollection[i - 1].numericKey;
         if (!every) break;
     }
 
     ok(every, 'keyframes are sorted by unique numeric key value');
 
-    strictEqual(dummyCollection.item(dummyCollection.indexOf(randomProgress)).numericKey, randomProgress, 'test indexOf with known progress');
+    strictEqual(dummyCollection[ dummyCollection.indexOf(randomProgress) ].numericKey, randomProgress, 'test indexOf with known progress');
     deepEqual(dummyCollection.indexOf(+new Date), -1, 'test indexOf with unknown progress. Must return unknown value');
 
-    ok(dummyCollection.item(dummyCollection.indexOfLeft(randomProgress)).numericKey <= randomProgress, 'indexOfLeft must return index of left keyframe (key <= progress)');
+    dummyCollection.moveIndexTo(randomProgress);
+
+    ok(dummyCollection.getLeft().numericKey <= randomProgress, 'indexOfLeft must return index of left keyframe (key <= progress)');
 
 });
 

diff --git a/tests/tests/hooks.js b/tests/tests/hooks.js
@@ -33,8 +33,8 @@ test('toStringValueHooks["color"]', function () {
         propertyName = 'color',
         vendorizedPropName = 'color';
 
-    strictEqual(toStringValueHooks['color'](dummyElement, propertyName, [255, 255, 0], vendorizedPropName), 'rgb(255, 255, 0)', 'rgb color conversion (yellow)');
-    strictEqual(toStringValueHooks['color'](dummyElement, propertyName, [255, 255, 0, 0.5], vendorizedPropName), 'rgba(255, 255, 0, 0.5)', 'rgb with alpha channel color conversion (yellow, opacity 50%)');
+    strictEqual(toStringValueHooks['color'](dummyElement, [255, 255, 0]), 'rgb(255, 255, 0)', 'rgb color conversion (yellow)');
+    strictEqual(toStringValueHooks['color'](dummyElement, [255, 255, 0, 0.5]), 'rgba(255, 255, 0, 0.5)', 'rgb with alpha channel color conversion (yellow, opacity 50%)');
 });
 
 // Transform