Merge pull request #52 from knoxHuang/master

cc.AnimationComponent Renamed cc.Animation
cocos · Dec 16, 2015 · 740c77b · 740c77b
2 parents 7598176 + 334011d
commit 740c77b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cocos2d/core/components/CCAnimation.js b/cocos2d/core/components/CCAnimation.js
@@ -34,11 +34,11 @@ function equalClips (clip1, clip2) {
 }
 
 /**
- * @class AnimationComponent
+ * @class Animation
  * @extends CCComponent
  */
-var AnimationComponent = cc.Class({
-    name: 'cc.AnimationComponent',
+var Animation = cc.Class({
+    name: 'cc.Animation',
     extends: require('./CCComponent'),
 
     editor: CC_EDITOR && {
@@ -439,4 +439,4 @@ var AnimationComponent = cc.Class({
 });
 
 
-cc.AnimationComponent = module.exports = AnimationComponent;
+cc.Animation = module.exports = Animation;
diff --git a/jsb_polyfill.js b/jsb_polyfill.js
@@ -378,6 +378,8 @@ cc.Label.Overflow = cc.Enum({
     RESIZE: 2
 });
 
+cc.spriteFrameAnimationCache = cc.animationCache;
+cc.SpriteFrameAnimation = cc.Animation;
 
 // Assets
 cc.js.setClassName('cc.SpriteFrame', cc.SpriteFrame);

diff --git a/test/qunit/unit/test-animation.js b/test/qunit/unit/test-animation.js
@@ -459,7 +459,7 @@ test('initClipData', function () {
 
 test('Animation Component', function () {
     var entity = new cc.Node();
-    var animation = entity.addComponent(cc.AnimationComponent);
+    var animation = entity.addComponent(cc.Animation);
 
     entity.x = 400;
 
@@ -503,7 +503,7 @@ test('Animation Component', function () {
 
 test('CCAnimation._updateClip', function () {
     var entity = new cc.Node();
-    var animation = entity.addComponent(cc.AnimationComponent);
+    var animation = entity.addComponent(cc.Animation);
 
     entity.x = 400;