aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.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/Style.reel/Style.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/Style.reel/Style.js')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
1 files changed, 0 insertions, 6 deletions
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: {