aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Timeline/Style.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Timeline/Style.reel')
-rw-r--r--js/panels/Timeline/Style.reel/Style.html26
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
2 files changed, 11 insertions, 21 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index 48714432..5be159c3 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/Style.reel", 14 "prototype": "js/panels/Timeline/Style.reel",
15 "name": "Style",
16 "properties": { 15 "properties": {
17 "element": {"#": "style-container"}, 16 "element": {"#": "style-container"},
18 "styleContainer" : {"#" : "style-container"}, 17 "styleContainer" : {"#" : "style-container"},
@@ -24,8 +23,7 @@
24 } 23 }
25 }, 24 },
26 "dtext1" : { 25 "dtext1" : {
27 "module" : "montage/ui/dynamic-text.reel", 26 "prototype" : "montage/ui/dynamic-text.reel",
28 "name" : "DynamicText",
29 "properties" : { 27 "properties" : {
30 "element" : {"#" : "container-property"} 28 "element" : {"#" : "container-property"}
31 }, 29 },
@@ -38,8 +36,7 @@
38 } 36 }
39 }, 37 },
40 "hottextunit" : { 38 "hottextunit" : {
41 "module" : "js/components/hottextunit.reel", 39 "prototype" : "js/components/hottextunit.reel[HotTextUnit]",
42 "name" : "HotTextUnit",
43 "properties" : { 40 "properties" : {
44 "element" : {"#":"value-editor-hottext"} 41 "element" : {"#":"value-editor-hottext"}
45 }, 42 },
@@ -52,8 +49,7 @@
52 } 49 }
53 }, 50 },
54 "hintable" : { 51 "hintable" : {
55 "module" : "js/components/hintable.reel", 52 "prototype" : "js/components/hintable.reel",
56 "name" : "Hintable",
57 "properties" : { 53 "properties" : {
58 "element" : {"#":"style-hintable"} 54 "element" : {"#":"style-hintable"}
59 }, 55 },
@@ -69,23 +65,23 @@
69 </script> 65 </script>
70 </head> 66 </head>
71 <body> 67 <body>
72 <div id="style-container"> 68 <div data-montage-id="style-container">
73 <div class="style-padding"> 69 <div class="style-padding">
74 <div class="row-hintable hidden"> 70 <div class="row-hintable hidden">
75 <div id="style-hintable"></div> 71 <div data-montage-id="style-hintable"></div>
76 </div> 72 </div>
77 <div class="container-propvals hidden"> 73 <div class="container-propvals hidden">
78 <div class="cell-property"> 74 <div class="cell-property">
79 <div id="container-property">property</div> 75 <div data-montage-id="container-property">property</div>
80 </div> 76 </div>
81 <div class="cell-value value-editor editor-hottext hidden"> 77 <div class="cell-value value-editor editor-hottext hidden">
82 <div id="value-editor-hottext"></div> 78 <div data-montage-id="value-editor-hottext"></div>
83 </div> 79 </div>
84 <div class="cell-value value-editor editor-color hidden"> 80 <div class="cell-value value-editor editor-color hidden">
85 <div id="value-editor-color">[&nbsp;]</div> 81 <div data-montage-id="value-editor-color">[&nbsp;]</div>
86 </div> 82 </div>
87 <div class="cell-value value-editor editor-input hidden"> 83 <div class="cell-value value-editor editor-input hidden">
88 <!-- <div id="value-editor-input"></div> --> 84 <!-- <div data-montage-id="value-editor-input"></div> -->
89 <input type="text" class="nj-skinned" value="" /> 85 <input type="text" class="nj-skinned" value="" />
90 </div> 86 </div>
91 </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: {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 16:20:19 +0000