aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Timeline/Style.reel
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-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/Style.reel')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html12
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
2 files changed, 6 insertions, 12 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 9fb098de..5be159c3 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -65,23 +65,23 @@
65 </script> 65 </script>
66 </head> 66 </head>
67 <body> 67 <body>
68 <div id="style-container"> 68 <div data-montage-id="style-container">
69 <div class="style-padding"> 69 <div class="style-padding">
70 <div class="row-hintable hidden"> 70 <div class="row-hintable hidden">
71 <div id="style-hintable"></div> 71 <div data-montage-id="style-hintable"></div>
72 </div> 72 </div>
73 <div class="container-propvals hidden"> 73 <div class="container-propvals hidden">
74 <div class="cell-property"> 74 <div class="cell-property">
75 <div id="container-property">property</div> 75 <div data-montage-id="container-property">property</div>
76 </div> 76 </div>
77 <div class="cell-value value-editor editor-hottext hidden"> 77 <div class="cell-value value-editor editor-hottext hidden">
78 <div id="value-editor-hottext"></div> 78 <div data-montage-id="value-editor-hottext"></div>
79 </div> 79 </div>
80 <div class="cell-value value-editor editor-color hidden"> 80 <div class="cell-value value-editor editor-color hidden">
81 <div id="value-editor-color">[&nbsp;]</div> 81 <div data-montage-id="value-editor-color">[&nbsp;]</div>
82 </div> 82 </div>
83 <div class="cell-value value-editor editor-input hidden"> 83 <div class="cell-value value-editor editor-input hidden">
84 <!-- <div id="value-editor-input"></div> --> 84 <!-- <div data-montage-id="value-editor-input"></div> -->
85 <input type="text" class="nj-skinned" value="" /> 85 <input type="text" class="nj-skinned" value="" />
86 </div> 86 </div>
87 </div> 87 </div>
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 027f3a40..c39f3a56 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -27,7 +27,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
27 /* === BEGIN: Models === */ 27 /* === BEGIN: Models === */
28 // isSelected: whether or not the style is selected 28 // isSelected: whether or not the style is selected
29 _isSelected: { 29 _isSelected: {
30 serializable: true,
31 value: false 30 value: false
32 }, 31 },
33 isSelected: { 32 isSelected: {
@@ -60,7 +59,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
60 59
61 // Property for this editor 60 // Property for this editor
62 _editorProperty: { 61 _editorProperty: {
63 serializable: true,
64 value: "" 62 value: ""
65 }, 63 },
66 editorProperty: { 64 editorProperty: {
@@ -76,7 +74,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
76 74
77 // Value for the property for this editor. 75 // Value for the property for this editor.
78 _editorValue: { 76 _editorValue: {
79 serializable: true,
80 value: "" 77 value: ""
81 }, 78 },
82 editorValue: { 79 editorValue: {
@@ -92,7 +89,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
92 89
93 // The tweener used to change the value for this property. 90 // The tweener used to change the value for this property.
94 _ruleTweener: { 91 _ruleTweener: {
95 serializable: true,
96 value: false 92 value: false
97 }, 93 },
98 ruleTweener: { 94 ruleTweener: {
@@ -137,7 +133,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
137 133
138 // whichView: which view should we show: hintable or propval 134 // whichView: which view should we show: hintable or propval
139 _whichView : { 135 _whichView : {
140 serializable: true,
141 value: "hintable" 136 value: "hintable"
142 }, 137 },
143 whichView: { 138 whichView: {
@@ -161,7 +156,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
161 // styleID: the id for this style; 156 // styleID: the id for this style;
162 // Used to publish events 157 // Used to publish events
163 _styleID : { 158 _styleID : {
164 serializable: true,
165 value: null 159 value: null
166 }, 160 },
167 styleID: { 161 styleID: {