aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/Timeline/Style.reel/Style.js
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.js')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js30
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
21var LayerStyle = exports.LayerStyle = Montage.create(Component, { 21var 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