aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html54
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js237
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css76
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss34
4 files changed, 285 insertions, 116 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 79b522ee..eb9ff3a9 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -22,7 +22,9 @@
22 "positionCollapser" : {"@" : "positionCollapser"}, 22 "positionCollapser" : {"@" : "positionCollapser"},
23 "transformCollapser" : {"@" : "transformCollapser"}, 23 "transformCollapser" : {"@" : "transformCollapser"},
24 "styleCollapser" : {"@" : "styleCollapser"}, 24 "styleCollapser" : {"@" : "styleCollapser"},
25 "clickerMain" : {"#" : "clicker-main"} 25 "clickerMain" : {"#" : "clicker-main"},
26 "myLabel" : {"#" : "myLabel"},
27 "dragDrop" : {"@" : "DragDrop"}
26 } 28 }
27 }, 29 },
28 "dtext1" : { 30 "dtext1" : {
@@ -301,7 +303,7 @@
301 "properties" : { 303 "properties" : {
302 "element" : {"#" : "content-style"}, 304 "element" : {"#" : "content-style"},
303 "myContent" : {"#":"content-style"}, 305 "myContent" : {"#":"content-style"},
304 "contentHeight" : 60, 306 "contentHeight" : 0,
305 "isLabelClickable" : true, 307 "isLabelClickable" : true,
306 "clicker" : {"#" : "clicker-style"}, 308 "clicker" : {"#" : "clicker-style"},
307 "isCollapsed" : true, 309 "isCollapsed" : true,
@@ -323,7 +325,7 @@
323 <body> 325 <body>
324 326
325 <div data-montage-id="layer" class="container-layer"> 327 <div data-montage-id="layer" class="container-layer">
326 <div class="label-layer"> 328 <div class="label-layer" data-montage-id="myLabel">
327 <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span> 329 <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span>
328 <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span> 330 <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span>
329 <div class="cssbutton button-lock"></div> 331 <div class="cssbutton button-lock"></div>
@@ -335,14 +337,14 @@
335 <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span> 337 <span class="collapsible-clicker clicker-position collapsible-collapsed" data-montage-id="clicker-position"></span>
336 </div> 338 </div>
337 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position"> 339 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position">
338 <div class="layout-table"> 340 <div class="layout-tablew">
339 <div class="layout-row"> 341 <div class="container-row">
340 <div class="layout-cell">X</div> 342 <div class="cell-property">X</div>
341 <div class="layout-cell"><div data-montage-id="position-x"></div></div> 343 <div class="cell-value"><div data-montage-id="position-x"></div></div>
342 </div> 344 </div>
343 <div class="layout-row"> 345 <div class="container-row">
344 <div class="layout-cell">Y</div> 346 <div class="cell-property">Y</div>
345 <div class="layout-cell"><div data-montage-id="position-y"></div></div> 347 <div class="cell-value"><div data-montage-id="position-y"></div></div>
346 </div> 348 </div>
347 </div> 349 </div>
348 </div> 350 </div>
@@ -351,26 +353,26 @@
351 <span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span> 353 <span class="clicker-transform collapsible-clicker collapsible-collapsed" data-montage-id="clicker-transform"></span>
352 </div> 354 </div>
353 <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform"> 355 <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform">
354 <div class="layout-table"> 356 <div class="layout-tablew">
355 <div class="layout-row"> 357 <div class="container-row">
356 <div class="layout-cell">Scale X</div> 358 <div class="cell-property">Scale X</div>
357 <div class="layout-cell"><div data-montage-id="scale-x"></div></div> 359 <div class="cell-value"><div data-montage-id="scale-x"></div></div>
358 </div> 360 </div>
359 <div class="layout-row"> 361 <div class="container-row">
360 <div class="layout-cell">Scale Y</div> 362 <div class="cell-property">Scale Y</div>
361 <div class="layout-cell"><div data-montage-id="scale-y"></div></div> 363 <div class="cell-value"><div data-montage-id="scale-y"></div></div>
362 </div> 364 </div>
363 <div class="layout-row"> 365 <div class="container-row">
364 <div class="layout-cell">Skew X</div> 366 <div class="cell-property">Skew X</div>
365 <div class="layout-cell"><div data-montage-id="skew-x"></div></div> 367 <div class="cell-value"><div data-montage-id="skew-x"></div></div>
366 </div> 368 </div>
367 <div class="layout-row"> 369 <div class="container-row">
368 <div class="layout-cell">Skew Y</div> 370 <div class="cell-property">Skew Y</div>
369 <div class="layout-cell"><div data-montage-id="skew-y"></div></div> 371 <div class="cell-value"><div data-montage-id="skew-y"></div></div>
370 </div> 372 </div>
371 <div class="layout-row"> 373 <div class="container-row">
372 <div class="layout-cell">Rotation</div> 374 <div class="cell-property">Rotation</div>
373 <div class="layout-cell"><div data-montage-id="rotation"></div></div> 375 <div class="cell-value"><div data-montage-id="rotation"></div></div>
374 </div> 376 </div>
375 </div> 377 </div>
376 378
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 5206ae16..3bcc1401 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -67,10 +67,7 @@ var Layer = exports.Layer = Montage.create(Component, {
67 67
68 /* Layer models: the name, ID, and selected and animation booleans for the layer */ 68 /* Layer models: the name, ID, and selected and animation booleans for the layer */
69 _layerName:{ 69 _layerName:{
70 serializable: true, 70 value: "Default Layer Name"
71 value:null,
72 writable:true,
73 enumerable:true
74 }, 71 },
75 72
76 layerName:{ 73 layerName:{
@@ -79,20 +76,17 @@ var Layer = exports.Layer = Montage.create(Component, {
79 return this._layerName; 76 return this._layerName;
80 }, 77 },
81 set:function(newVal){ 78 set:function(newVal){
82 if (newVal !== this._layerName) { 79
83 this._layerEditable.value = newVal; 80 this._layerEditable.value = newVal;
84 this._layerName = newVal; 81 this._layerName = newVal;
85 this.layerData.layerName = newVal; 82 this.layerData.layerName = newVal;
86 this.log('layerName setter: ' + newVal) 83 if (typeof(this.dynamicLayerName) !== "undefined") {
87 } 84 this.dynamicLayerName.value = newVal;
88 85 }
89 } 86 }
90 }, 87 },
91 _layerID:{ 88 _layerID:{
92 value:null, 89 value: "Default Layer ID"
93 writable:true,
94 serializable: true,
95 enumerable:true
96 }, 90 },
97 91
98 layerID:{ 92 layerID:{
@@ -102,6 +96,7 @@ var Layer = exports.Layer = Montage.create(Component, {
102 }, 96 },
103 set:function(value){ 97 set:function(value){
104 this._layerID = value; 98 this._layerID = value;
99 this.layerData.layerID = value;
105 } 100 }
106 }, 101 },
107 102
@@ -119,7 +114,7 @@ var Layer = exports.Layer = Montage.create(Component, {
119 set:function(value){ 114 set:function(value){
120 if (this._dtextPositionX !== value) { 115 if (this._dtextPositionX !== value) {
121 this._dtextPositionX = value; 116 this._dtextPositionX = value;
122 //this.needsDraw = true; 117 this.layerData.dtextPositionX = value;
123 } 118 }
124 119
125 } 120 }
@@ -138,7 +133,7 @@ var Layer = exports.Layer = Montage.create(Component, {
138 set:function(value){ 133 set:function(value){
139 if (this._dtextPositionY !== value) { 134 if (this._dtextPositionY !== value) {
140 this._dtextPositionY = value; 135 this._dtextPositionY = value;
141 //this.needsDraw = true; 136 this.layerData.dtextPositionY = value;
142 } 137 }
143 138
144 } 139 }
@@ -157,7 +152,7 @@ var Layer = exports.Layer = Montage.create(Component, {
157 set:function(value){ 152 set:function(value){
158 if (this._dtextScaleX !== value) { 153 if (this._dtextScaleX !== value) {
159 this._dtextScaleX = value; 154 this._dtextScaleX = value;
160 //this.needsDraw = true; 155 this.layerData.dtextScaleX = value;
161