aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/Timeline/Tween.reel/Tween.js
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
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