diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/Timeline/Style.reel | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index c39f3a56..eed58a65 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
@@ -20,10 +20,31 @@ var Component = require("montage/ui/component").Component; | |||
20 | 20 | ||
21 | var LayerStyle = exports.LayerStyle = Montage.create(Component, { | 21 | var LayerStyle = exports.LayerStyle = Montage.create(Component, { |
22 | 22 | ||
23 | hasTemplate:{ | 23 | styleContainer: { |
24 | value: true | 24 | value: null, |
25 | serializable: true | ||
25 | }, | 26 | }, |
26 | 27 | ||
28 | styleHintable: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
33 | styleProperty: { | ||
34 | value: null, | ||
35 | serializable: true | ||
36 | }, | ||
37 | |||
38 | valueEditorHottext: { | ||
39 | value: null, | ||
40 | serializable: true | ||
41 | }, | ||
42 | |||
43 | dtextProperty: { | ||
44 | value: null, | ||
45 | serializable: true | ||
46 | }, | ||
47 | |||
27 | /* === BEGIN: Models === */ | 48 | /* === BEGIN: Models === */ |
28 | // isSelected: whether or not the style is selected | 49 | // isSelected: whether or not the style is selected |
29 | _isSelected: { | 50 | _isSelected: { |
@@ -112,7 +133,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
112 | }, | 133 | }, |
113 | set: function(newVal) { | 134 | set: function(newVal) { |
114 | this._myHintable = newVal; | 135 | this._myHintable = newVal; |
115 | } | 136 | }, |
137 | serializable: true | ||
116 | }, | 138 | }, |
117 | _myHintableValue : { | 139 | _myHintableValue : { |
118 | value: null | 140 | value: null |