Merge pull request phaserjs#56 from cocoademon/master

photonstorm · photonstorm · commit 68f45709d898 · 2013-09-20T08:56:49.000-07:00
Some small animation fixes
diff --git a/src/animation/FrameData.js b/src/animation/FrameData.js
@@ -164,12 +164,12 @@ Phaser.Animation.FrameData.prototype = {
                 if (useNumericIndex)
                 {
                     //  The actual frame
-                    output.push(this.getFrame(input[i]));
+                    output.push(this.getFrame(frames[i]));
                 }
                 else
                 {
                     //  The actual frame
-                    output.push(this.getFrameByName(input[i]));
+                    output.push(this.getFrameByName(frames[i]));
                 }
             }
         }
@@ -209,7 +209,7 @@ Phaser.Animation.FrameData.prototype = {
                 //  Does the frames array contain names or indexes?
                 if (useNumericIndex)
                 {
-                    output.push(frames[i].index);
+                    output.push(frames[i]);
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -164,12 +164,12 @@ Phaser.Animation.FrameData.prototype = {`
`164`	`164`	`if (useNumericIndex)`
`165`	`165`	`{`
`166`	`166`	`// The actual frame`
`167`		`- output.push(this.getFrame(input[i]));`
	`167`	`+ output.push(this.getFrame(frames[i]));`
`168`	`168`	`}`
`169`	`169`	`else`
`170`	`170`	`{`
`171`	`171`	`// The actual frame`
`172`		`- output.push(this.getFrameByName(input[i]));`
	`172`	`+ output.push(this.getFrameByName(frames[i]));`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`	`}`
`@@ -209,7 +209,7 @@ Phaser.Animation.FrameData.prototype = {`
`209`	`209`	`// Does the frames array contain names or indexes?`
`210`	`210`	`if (useNumericIndex)`
`211`	`211`	`{`
`212`		`- output.push(frames[i].index);`
	`212`	`+ output.push(frames[i]);`
`213`	`213`	`}`
`214`	`214`	`else`
`215`	`215`	`{`