From 5e010900b91d8634ba6caed0c97ccc1ccdec1ff7 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 12 Jun 2012 00:13:28 -0700
Subject: adding more missing properties to the timeline

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 38 +++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 16fb0303..474190b9 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -15,8 +15,39 @@ var nj = require("js/lib/NJUtils").NJUtils;
 
 var Layer = exports.Layer = Montage.create(Component, {
 
-    hasTemplate:{
-        value: true
+    dynamicLayerName: {
+        value: null,
+        serializable: true
+    },
+
+    dynamicLayerTag: {
+        value: null,
+        serializable: true
+    },
+
+    positionCollapser: {
+        value: null,
+        serializable: true
+    },
+
+    transformCollapser: {
+        value: null,
+        serializable: true
+    },
+
+    styleCollapser: {
+        value: null,
+        serializable: true
+    },
+
+    clickerMain: {
+        value: null,
+        serializable: true
+    },
+
+    myLabel: {
+        value: null,
+        serializable: true
     },
     
     /* Begin: Models */
@@ -31,7 +62,8 @@ var Layer = exports.Layer = Montage.create(Component, {
     	},
     	set: function(newVal) {
     		this._mainCollapser = newVal;
-    	}
+    	},
+        serializable: true
     },
     
     /* Style models: the array of styles, and the repetition that uses them */
-- 
cgit v1.2.3


From 8e5536bddb9f9f991e1d5ed363d253879a159a28 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 12 Jun 2012 00:20:47 -0700
Subject: fixing a timeline issue

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 474190b9..ed0200ae 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -15,11 +15,6 @@ var nj = require("js/lib/NJUtils").NJUtils;
 
 var Layer = exports.Layer = Montage.create(Component, {
 
-    dynamicLayerName: {
-        value: null,
-        serializable: true
-    },
-
     dynamicLayerTag: {
         value: null,
         serializable: true
-- 
cgit v1.2.3


From 0a5ce26ee62b74261e1b00877b7e43af0e681856 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 12 Jun 2012 10:10:11 -0700
Subject: Timeline: Fix document switching under Montage v.10

---
 js/panels/Timeline/Layer.reel/Layer.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index ed0200ae..6b64261e 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -456,6 +456,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     },
 
     layerData:{
+    	serializable: true,
         get:function(){
             return this._layerData;
         },
-- 
cgit v1.2.3


From 55e392b4ac5e45e8bf468399b3c0ddde669a15fd Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Tue, 12 Jun 2012 11:10:38 -0700
Subject: montage v10 serialization updates for timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 6b64261e..a2d6444d 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -372,6 +372,19 @@ var Layer = exports.Layer = Montage.create(Component, {
     _layerEditable : {
     	value: false
     },
+
+    _dynamicLayerName:{
+        value:true
+    },
+    dynamicLayerName:{
+        serializable:true,
+        get:function () {
+            return this._dynamicLayerName;
+        },
+        set:function (newVal) {
+            this._dynamicLayerName = newVal;
+        }
+    },
     
     // Are the various collapsers collapsed or not
     _isMainCollapsed : {
-- 
cgit v1.2.3