aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/Timeline/Layer.reel
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js47
1 files changed, 44 insertions, 3 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 16fb0303..a2d6444d 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -15,8 +15,34 @@ var nj = require("js/lib/NJUtils").NJUtils;
15 15
16var Layer = exports.Layer = Montage.create(Component, { 16var Layer = exports.Layer = Montage.create(Component, {
17 17
18 hasTemplate:{ 18 dynamicLayerTag: {
19 value: true 19 value: null,
20 serializable: true
21 },
22
23 positionCollapser: {
24 value: null,
25 serializable: true
26 },
27
28 transformCollapser: {
29 value: null,
30 serializable: true
31 },
32
33 styleCollapser: {
34 value: null,
35 serializable: true
36 },
37
38 clickerMain: {
39 value: null,
40 serializable: true
41 },
42
43 myLabel: {
44 value: null,
45 serializable: true
20 }, 46 },
21 47
22 /* Begin: Models */ 48 /* Begin: Models */
@@ -31,7 +57,8 @@ var Layer = exports.Layer = Montage.create(Component, {
31 }, 57 },
32 set: function(newVal) { 58 set: function(newVal) {
33 this._mainCollapser = newVal; 59 this._mainCollapser = newVal;
34 } 60 },
61 serializable: true
35 }, 62 },
36 63
37 /* Style models: the array of styles, and the repetition that uses them */ 64 /* Style models: the array of styles, and the repetition that uses them */
@@ -345,6 +372,19 @@ var Layer = exports.Layer = Montage.create(Component, {
345 _layerEditable : { 372 _layerEditable : {
346 value: false 373 value: false
347 }, 374 },
375
376 _dynamicLayerName:{
377 value:true
378 },
379 dynamicLayerName:{
380 serializable:true,
381 get:function () {
382 return this._dynamicLayerName;
383 },
384 set:function (newVal) {
385 this._dynamicLayerName = newVal;
386 }
387 },
348 388
349 // Are the various collapsers collapsed or not 389 // Are the various collapsers collapsed or not
350 _isMainCollapsed : { 390 _isMainCollapsed : {
@@ -429,6 +469,7 @@ var Layer = exports.Layer = Montage.create(Component, {
429 }, 469 },
430 470
431 layerData:{ 471 layerData:{
472 serializable: true,
432 get:function(){ 473 get:function(){
433 return this._layerData; 474 return this._layerData;
434 }, 475 },