diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/Layer.reel/Layer.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 1280 |
1 files changed, 640 insertions, 640 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 3be766c4..48596703 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -69,50 +69,50 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
69 | value: null, | 69 | value: null, |
70 | serializable: true | 70 | serializable: true |
71 | }, | 71 | }, |
72 | 72 | ||
73 | /* Begin: Models */ | 73 | /* Begin: Models */ |
74 | 74 | ||
75 | /* Main collapser model: the main collapser for the layer */ | 75 | /* Main collapser model: the main collapser for the layer */ |
76 | _mainCollapser : { | 76 | _mainCollapser : { |
77 | value: false | 77 | value: false |
78 | }, | 78 | }, |
79 | mainCollapser: { | 79 | mainCollapser: { |
80 | get: function() { | 80 | get: function() { |
81 | return this._mainCollapser; | 81 | return this._mainCollapser; |
82 | }, | 82 | }, |
83 | set: function(newVal) { | 83 | set: function(newVal) { |
84 | this._mainCollapser = newVal; | 84 | this._mainCollapser = newVal; |
85 | }, | 85 | }, |
86 | serializable: true | 86 | serializable: true |
87 | }, | 87 | }, |
88 | 88 | ||
89 | /* Style models: the array of styles, and the repetition that uses them */ | 89 | /* Style models: the array of styles, and the repetition that uses them */ |
90 | _arrLayerStyles : { | 90 | _arrLayerStyles : { |
91 | value: [] | 91 | value: [] |
92 | }, | 92 | }, |
93 | arrLayerStyles : { | 93 | arrLayerStyles : { |
94 | serializable: true, | 94 | serializable: true, |
95 | get: function() { | 95 | get: function() { |
96 | return this._arrLayerStyles; | 96 | return this._arrLayerStyles; |
97 | }, | 97 | }, |
98 | set: function(newVal) { | 98 | set: function(newVal) { |
99 | this._arrLayerStyles = newVal; | 99 | this._arrLayerStyles = newVal; |
100 | } | 100 | } |
101 | }, | 101 | }, |
102 | _styleRepetition : { | 102 | _styleRepetition : { |
103 | value: false | 103 | value: false |
104 | }, | 104 | }, |
105 | styleRepetition : { | 105 | styleRepetition : { |
106 | serializable: true, | 106 | serializable: true, |
107 | get: function() { | 107 | get: function() { |
108 | return this._styleRepetition; | 108 | return this._styleRepetition; |
109 | }, | 109 | }, |
110 | set: function(newVal) { | 110 | set: function(newVal) { |
111 | this._styleRepetition = newVal; | 111 | this._styleRepetition = newVal; |
112 | } | 112 | } |
113 | }, | 113 | }, |
114 | _styleCounter : { | 114 | _styleCounter : { |
115 | value: 0 | 115 | value: 0 |
116 | }, | 116 | }, |
117 | styleCounter:{ | 117 | styleCounter:{ |
118 | serializable:true, | 118 | serializable:true, |
@@ -124,21 +124,21 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
124 | } | 124 | } |
125 | }, | 125 | }, |
126 | _selectedStyleIndex: { | 126 | _selectedStyleIndex: { |
127 | value: false | 127 | value: false |
128 | }, | 128 | }, |
129 | selectedStyleIndex: { | 129 | selectedStyleIndex: { |
130 | get: function() { | 130 | get: function() { |
131 | return this._selectedStyleIndex; | 131 | return this._selectedStyleIndex; |
132 | }, | 132 | }, |
133 | set: function(newVal) { | 133 | set: function(newVal) { |
134 | if (typeof(newVal) === "undefined") { | 134 | if (typeof(newVal) === "undefined") { |
135 | return; | 135 | return; |
136 | } | 136 | } |
137 | if (newVal !== this._selectedStyleIndex) { | 137 | if (newVal !== this._selectedStyleIndex) { |
138 | this._selectedStyleIndex = newVal; | 138 | this._selectedStyleIndex = newVal; |
139 | this.layerData.selectedStyleIndex = newVal; | 139 | this.layerData.selectedStyleIndex = newVal; |
140 | } | 140 | } |
141 | } | 141 | } |
142 | }, | 142 | }, |
143 | _storedStyleIndex : { | 143 | _storedStyleIndex : { |
144 | value: false | 144 | value: false |
@@ -146,39 +146,39 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
146 | 146 | ||
147 | /* Layer models: the name, ID, and selected and animation booleans for the layer */ | 147 | /* Layer models: the name, ID, and selected and animation booleans for the layer */ |
148 | _layerName:{ | 148 | _layerName:{ |
149 | value: "" | 149 | value: "" |
150 | }, | 150 | }, |
151 | 151 | ||
152 | layerName:{ | 152 | layerName:{ |
153 | serializable: true, | 153 | serializable: true, |
154 | get:function(){ | 154 | get:function(){ |
155 | return this._layerName; | 155 | return this._layerName; |
156 | }, | 156 | }, |
157 | set:function(newVal){ | 157 | set:function(newVal){ |
158 | if (this._layerEditable.value !== newVal) { | 158 | if (this._layerEditable.value !== newVal) { |
159 | this._layerEditable.value = newVal; | 159 | this._layerEditable.value = newVal; |
160 | } | 160 | } |
161 | if (this._layerName !== newVal) { | 161 | if (this._layerName !== newVal) { |
162 | this._layerName = newVal; | 162 | this._layerName = newVal; |
163 | } | 163 | } |
164 | if (this.layerData.layerName !== newVal) { | 164 | if (this.layerData.layerName !== newVal) { |
165 | this.layerData.layerName = newVal; | 165 | this.layerData.layerName = newVal; |
166 | } | 166 | } |
167 | 167 | ||
168 | if (typeof(this.dynamicLayerName) !== "undefined") { | 168 | if (typeof(this.dynamicLayerName) !== "undefined") { |
169 | if (this.dynamicLayerName.value !== newVal) { | 169 | if (this.dynamicLayerName.value !== newVal) { |
170 | this.dynamicLayerName.value = newVal; | 170 | this.dynamicLayerName.value = newVal; |
171 | } | 171 | } |
172 | } | 172 | } |
173 | this.needsDraw = true; | 173 | this.needsDraw = true; |
174 | } | 174 | } |
175 | }, | 175 | }, |
176 | _layerID:{ | 176 | _layerID:{ |
177 | value: "Default Layer ID" | 177 | value: "Default Layer ID" |
178 | }, | 178 | }, |
179 | 179 | ||
180 | layerID:{ | 180 | layerID:{ |
181 | serializable: true, | 181 | serializable: true, |
182 | get:function(){ | 182 | get:function(){ |
183 | return this._layerID; | 183 | return this._layerID; |
184 | }, | 184 | }, |
@@ -188,132 +188,132 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
188 | } | 188 | } |
189 | }, | 189 | }, |
190 | _layerTag:{ | 190 | _layerTag:{ |
191 | value: "tag" | 191 | value: "tag" |
192 | }, | 192 | }, |
193 | 193 | ||
194 | layerTag:{ | 194 | layerTag:{ |
195 | serializable: true, | 195 | serializable: true, |
196 | get:function(){ | 196 | get:function(){ |
197 | return this._layerTag; | 197 | return this._layerTag; |
198 | }, | 198 | }, |
199 | set:function(newVal){ | 199 | set:function(newVal){ |
200 | this._layerTag = newVal; | 200 | this._layerTag = newVal; |
201 | this.layerData.layerTag = newVal; | 201 | this.layerData.layerTag = newVal; |
202 | } | 202 | } |
203 | }, | 203 | }, |
204 | _docUUID : { | 204 | _docUUID : { |
205 | value: null | 205 | value: null |
206 | }, | 206 | }, |
207 | docUUID : { | 207 | docUUID : { |
208 | serializable: true, | 208 | serializable: true, |
209 | get: function() { | 209 | get: function() { |
210 | return this._docUUID; | 210 | return this._docUUID; |
211 | }, | 211 | }, |
212 | set: function(newVal) { | 212 | set: function(newVal) { |
213 | this._docUUID = newVal; | 213 | this._docUUID = newVal; |
214 | } | 214 | } |
215 | }, | 215 | }, |
216 | 216 | ||
217 | _stageElement: { | 217 | _stageElement: { |
218 | value: null | 218 | value: null |