diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Timeline/Tween.reel/Tween.js | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index b13a037f..8b6826ed 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -14,12 +14,10 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
14 | }, | 14 | }, |
15 | 15 | ||
16 | _tweenData:{ | 16 | _tweenData:{ |
17 | serializable: true, | ||
18 | value:{} | 17 | value:{} |
19 | }, | 18 | }, |
20 | 19 | ||
21 | tweenData:{ | 20 | tweenData:{ |
22 | serializable: true, | ||
23 | get:function(){ | 21 | get:function(){ |
24 | return this._tweenData; | 22 | return this._tweenData; |
25 | }, | 23 | }, |
@@ -32,7 +30,6 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
32 | }, | 30 | }, |
33 | 31 | ||
34 | _spanWidth: { | 32 | _spanWidth: { |
35 | serializable: true, | ||
36 | value: 0 | 33 | value: 0 |
37 | }, | 34 | }, |
38 | 35 | ||
@@ -109,7 +106,6 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
109 | }, | 106 | }, |
110 | 107 | ||
111 | _tweenedProperties:{ | 108 | _tweenedProperties:{ |
112 | serializable: true, | ||
113 | value:[] | 109 | value:[] |
114 | }, | 110 | }, |
115 | 111 | ||
@@ -124,7 +120,6 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
124 | }, | 120 | }, |
125 | 121 | ||
126 | _isTweenAnimated:{ | 122 | _isTweenAnimated:{ |
127 | serializable:true, | ||
128 | value:false | 123 | value:false |
129 | }, | 124 | }, |
130 | 125 | ||