aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel
diff options
context:
space:
mode:
authorhwc4872012-05-11 13:52:55 -0700
committerhwc4872012-05-11 13:52:55 -0700
commit137bfc9d4c41cc918d969565bec28a834fe10472 (patch)
treee9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Timeline/Tween.reel
parentd21aaca3d7093b6af968b7f9f764ab54e004f02b (diff)
parent27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff)
downloadninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
Diffstat (limited to 'js/panels/Timeline/Tween.reel')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html6
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
2 files changed, 3 insertions, 8 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index c161b3f8..aba42436 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -37,9 +37,9 @@
37 </head> 37 </head>
38 <body> 38 <body>
39 39
40 <div id="tweenspace" class="tween_container"> 40 <div data-montage-id="tweenspace" class="tween_container">
41 <div id="span_container"></div> 41 <div data-montage-id="span_container"></div>
42 <div id="keyframe_container"></div> 42 <div data-montage-id="keyframe_container"></div>
43 </div> 43 </div>
44 44
45 </body> 45 </body>
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