aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorEric Guzman2012-03-13 13:12:43 -0700
committerEric Guzman2012-03-13 13:12:43 -0700
commit61fd46cad105f0a52afa028e5301b96120f00ab4 (patch)
treed8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/panels
parent7e3161153b87b891875ac65368a19aed12909fa3 (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/colorpanelpopup.js2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js88
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html169
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js725
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css14
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html39
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js161
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js45
-rwxr-xr-xjs/panels/properties.reel/properties.js4
9 files changed, 601 insertions, 646 deletions
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 3eae3ea3..b957d495 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -405,7 +405,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
405 // 405 //
406 defaultGradient: { 406 defaultGradient: {
407 enumerable: true, 407 enumerable: true,
408 value: {mode: 'linear', stops: [{mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}, position: 0}, {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}, position: 100}]} 408 value: {mode: 'linear', gradientMode: 'linear', stops: [{mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}, position: 0}, {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}, position: 100}]}
409 }, 409 },
410 //////////////////////////////////////////////////////////////////// 410 ////////////////////////////////////////////////////////////////////
411 // 411 //
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 81bd1867..b41680be 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -38,13 +38,11 @@ var Layer = exports.Layer = Montage.create(Component, {
38 _arrLayerStyles : { 38 _arrLayerStyles : {
39 serializable: true, 39 serializable: true,
40 enumerable: true, 40 enumerable: true,
41 serializable: true,
42 value: [] 41 value: []
43 }, 42 },
44 arrLayerStyles : { 43 arrLayerStyles : {
45 serializable: true, 44 serializable: true,
46 enumerable: true, 45 enumerable: true,
47 serializable: true,
48 get: function() { 46 get: function() {
49 return this._arrLayerStyles; 47 return this._arrLayerStyles;
50 }, 48 },
@@ -84,8 +82,8 @@ var Layer = exports.Layer = Montage.create(Component, {
84 if (newVal !== this._layerName) { 82 if (newVal !== this._layerName) {
85 this._layerEditable.value = newVal; 83 this._layerEditable.value = newVal;
86 this._layerName = newVal; 84 this._layerName = newVal;
87 this._layerEditable.needsDraw = true; 85 this.layerData.layerName = newVal;
88 this.needsDraw = true; 86 this.log('layerName setter: ' + newVal)
89 } 87 }
90 88
91 } 89 }
@@ -110,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
110 /* Position and Transform hottext values */ 108 /* Position and Transform hottext values */
111 _dtextPositionX : { 109 _dtextPositionX : {
112 value:null, 110 value:null,
113 serializable: true, 111 serializable: true
114 }, 112 },
115 113
116 dtextPositionX:{ 114 dtextPositionX:{
@@ -121,7 +119,7 @@ var Layer = exports.Layer = Montage.create(Component, {
121 set:function(value){ 119 set:function(value){
122 if (this._dtextPositionX !== value) { 120 if (this._dtextPositionX !== value) {
123 this._dtextPositionX = value; 121 this._dtextPositionX = value;
124 this.needsDraw = true; 122 //this.needsDraw = true;
125 } 123 }
126 124
127 } 125 }
@@ -129,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
129 127
130 _dtextPositionY : { 128 _dtextPositionY : {
131 value:null, 129 value:null,
132 serializable: true, 130 serializable: true
133 }, 131 },
134 132
135 dtextPositionY:{ 133 dtextPositionY:{
@@ -140,7 +138,7 @@ var Layer = exports.Layer = Montage.create(Component, {
140 set:function(value){ 138 set:function(value){
141 if (this._dtextPositionY !== value) { 139 if (this._dtextPositionY !== value) {
142 this._dtextPositionY = value; 140 this._dtextPositionY = value;
143 this.needsDraw = true; 141 //this.needsDraw = true;
144 } 142 }
145 143
146 } 144 }
@@ -148,7 +146,7 @@ var Layer = exports.Layer = Montage.create(Component, {
148 146
149 _dtextScaleX : { 147 _dtextScaleX : {
150 value:null, 148 value:null,
151 serializable: true, 149 serializable: true
152 }, 150 },
153 151
154 dtextScaleX:{ 152 dtextScaleX:{
@@ -159,7 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, {
159 set:function(value){ 157 set:function(value){
160 if (this._dtextScaleX !== value) { 158 if (this._dtextScaleX !== value) {
161 this._dtextScaleX = value; 159 this._dtextScaleX = value;
162 this.needsDraw = true; 160 //this.needsDraw = true;
163 } 161 }
164 162
165 } 163 }
@@ -167,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, {
167 165
168 _dtextScaleY : { 166 _dtextScaleY : {
169 value:null, 167 value:null,
170 serializable: true, 168 serializable: true
171 }, 169 },
172 170
173 dtextScaleY:{ 171 dtextScaleY:{
@@ -178,7 +176,7 @@ var Layer = exports.Layer = Montage.create(Component, {
178 set:function(value){ 176 set:function(value){
179 if (this._dtextScaleY !== value) { 177 if (this._dtextScaleY !== value) {
180 this._dtextScaleY = value; 178 this._dtextScaleY = value;
181 this.needsDraw = true; 179 //this.needsDraw = true;
182 } 180 }
183 181
184 } 182 }
@@ -186,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, {
186 184
187 _dtextSkewX : { 185 _dtextSkewX : {
188 value:null, 186 value:null,
189 serializable: true, 187 serializable: true
190 }, 188 },
191 189
192 dtextSkewX:{ 190 dtextSkewX:{
@@ -197,7 +195,7 @@ var Layer = exports.Layer = Montage.create(Component, {
197 set:function(value){ 195 set:function(value){
198 if (this._dtextSkewX !== value) { 196 if (this._dtextSkewX !== value) {
199 this._dtextSkewX = value; 197 this._dtextSkewX = value;
200 this.needsDraw = true; 198 //this.needsDraw = true;
201 } 199 }
202 200
203 } 201 }
@@ -205,7 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
205 203
206 _dtextSkewY : { 204 _dtextSkewY : {
207 value:null, 205 value:null,
208 serializable: true, 206 serializable: true
209 }, 207 },
210 208
211 dtextSkewY:{ 209 dtextSkewY:{
@@ -216,7 +214,7 @@ var Layer = exports.Layer = Montage.create(Component, {
216 set:function(value){ 214 set:function(value){
217 if (this._dtextSkewY !== value) { 215 if (this._dtextSkewY !== value) {
218 this._dtextSkewY = value; 216 this._dtextSkewY = value;
219 this.needsDraw = true; 217 //this.needsDraw = true;
220 } 218 }
221 219
222 } 220 }
@@ -224,7 +222,7 @@ var Layer = exports.Layer = Montage.create(Component, {
224 222
225 _dtextRotate : { 223 _dtextRotate : {
226 value:null, 224 value:null,
227 serializable: true, 225 serializable: true
228 }, 226 },
229 227
230 dtextRotate:{ 228 dtextRotate:{
@@ -235,7 +233,7 @@ var Layer = exports.Layer = Montage.create(Component, {
235 set:function(value){ 233 set:function(value){
236 if (this._dtextRotate !== value) { 234 if (this._dtextRotate !== value) {
237 this._dtextRotate = value; 235 this._dtextRotate = value;
238 this.needsDraw = true; 236 //this.needsDraw = true;
239 } 237 }
240 238
241 } 239 }
@@ -261,7 +259,8 @@ var Layer = exports.Layer = Montage.create(Component, {
261 this.selectStyle(false); 259 this.selectStyle(false);
262 } 260 }
263 this._isSelected = value; 261 this._isSelected = value;
264 this.needsDraw = true; 262 this.layerData.isSelected = value;