1 files changed, 244 insertions, 94 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 5206ae16..f2e20d41 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, {
 
         /* Layer models: the name, ID, and selected and animation booleans for the layer */
     _layerName:{
-        serializable: true,
-        value:null,
-        writable:true,
-        enumerable:true
+        value: "Default Layer Name"
     },
     
     layerName:{
@@ -79,20 +76,17 @@ var Layer = exports.Layer = Montage.create(Component, {
             return this._layerName;
         },
         set:function(newVal){
-                if (newVal !== this._layerName) {
-                        this._layerEditable.value = newVal;
-                        this._layerName = newVal;
-                        this.layerData.layerName = newVal;
-                        this.log('layerName setter: ' + newVal)
-                }
-                
+
+                        this._layerEditable.value = newVal;
+                this._layerName = newVal;
+                this.layerData.layerName = newVal;
+                if (typeof(this.dynamicLayerName) !== "undefined") {
+                        this.dynamicLayerName.value = newVal;
+                }
         }
     },
     _layerID:{
-        value:null,
-        writable:true,
-        serializable: true,
-        enumerable:true
+        value: "Default Layer ID"
     },
 
     layerID:{
@@ -102,8 +96,49 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         set:function(value){
             this._layerID = value;
+            this.layerData.layerID = value;
+        }
+    },
+    _layerTag:{
+        value: "tag"
+    },
+    
+    layerTag:{
+        serializable: true,
+        get:function(){
+            return this._layerTag;
+        },
+        set:function(newVal){
+                this._layerTag = newVal;
+                this.layerData.layerTag = newVal;
         }
     },
+    _docUUID : {
+        value: null
+    },
+    docUUID : {
+        serializable: true,
+        get: function() {
+                return this._docUUID;
+        },
+        set: function(newVal) {
+                this._docUUID = newVal;
+        }
+    },
+    
+    
+    _elementsList : {
+        value: []
+    },
+    elementsList : {
+        serializable: true,
+        get: function() {
+                return this._elementsList;
+        },
+        set: function(newVal) {
+                this._elementsList = newVal;
+        }
+    },
     
     /* Position and Transform hottext values */
     _dtextPositionX : {
@@ -119,7 +154,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextPositionX !== value) {
                         this._dtextPositionX = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextPositionX = value;
                 }
             
         }
@@ -138,7 +173,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextPositionY !== value) {
                         this._dtextPositionY = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextPositionY = value;
                 }
             
         }
@@ -157,7 +192,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextScaleX !== value) {
                         this._dtextScaleX = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextScaleX = value;
                 }
             
         }
@@ -176,7 +211,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextScaleY !== value) {
                         this._dtextScaleY = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextScaleY = value;
                 }
             
         }
@@ -195,7 +230,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextSkewX !== value) {
                         this._dtextSkewX = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextSkewX = value;
                 }
             
         }
@@ -214,7 +249,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextSkewY !== value) {
                         this._dtextSkewY = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextSkewY = value;
                 }
             
         }
@@ -233,7 +268,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextRotate !== value) {
                         this._dtextRotate = value;
-                        //this.needsDraw = true;
+                        this.layerData.dtextRotate = value;
                 }
             
         }
@@ -278,6 +313,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         set: function(newVal) {
                 this._isActive = newVal;
+                this.layerData.isActive = newVal;
         }
     },
     
@@ -294,8 +330,30 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         set:function(value){
             this._isAnimated = value;
+            this.layerData.isAnimated = value;
         }
     },
+    _isVisible:{
+        value: true
+    },
+
+    isVisible:{
+        get:function(){
+            return this._isVisible;
+        },
+        set:function(value){
+                if (this._isVisible !== value) {
+                        this._isVisible = value;
+                        if (value === true) {
+                                this.element.classList.remove("layer-hidden");
+                        } else {
+                                this.element.classList.add("layer-hidden");
+                        }
+                }
+                this.layerData.isVisible = value;
+        }
+    },
+    
     _justAdded: {
         value: false
     },
@@ -314,10 +372,9 @@ var Layer = exports.Layer = Montage.create(Component, {
                 return this._isMainCollapsed;
         },
         set: function(newVal) {
-                this.log('layer.js: isMainCollapsed: ' + newVal);
+                        this._isMainCollapsed = newVal;