From 8c1fda5e59b9d88b69e0b4a2bd57590ef451643c Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 1 May 2012 15:28:05 -0700
Subject: Timeline: Expand/collapse state of layers now mantained across
 document switching.

---
 js/panels/Timeline/Collapser.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'js/panels/Timeline/Collapser.js')

diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 88314c8b..9c8d4434 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -151,7 +151,6 @@ var Montage = require("montage/core/core").Montage,
 
 	// isToggling: Bindable property. Set this (to anything) to trigger a toggle.
 	_isToggling: {
-		serializable: true,
 		value: true
 	},
 	isToggling: {
@@ -179,7 +178,6 @@ var Montage = require("montage/core/core").Montage,
 	
 	prepareForDraw: {
 		value: function() {
-
 			// Get the original value of the overflow property:
 			this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow");
 			if (this.isCollapsed === false) {
-- 
cgit v1.2.3


From 03478f396977973f95977cf21c98bf6a2fa26721 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Tue, 12 Jun 2012 11:18:43 -0700
Subject: montage v10 serialization updates for timeline

Signed-off-by: Jonathan Duran <jduran@motorola.com>

Conflicts:

	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Collapser.js | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'js/panels/Timeline/Collapser.js')

diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index 9c8d4434..42bbbb86 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -41,6 +41,7 @@ var Montage = require("montage/core/core").Montage,
 		value: 0
 	},
 	contentHeight: {
+        serializable: true,
 		get: function() {
 			return this._contentHeight;
 		},
@@ -59,6 +60,7 @@ var Montage = require("montage/core/core").Montage,
 		value: false
 	},
 	isAnimated: {
+        serializable: true,
 		get: function() {
 			return this._isAnimated;
 		},
@@ -71,6 +73,7 @@ var Montage = require("montage/core/core").Montage,
 		value: true
 	},
 	bypassAnimation: {
+        serializable: true,
 		get: function() {
 			return this._bypassAnimation;
 		},
@@ -102,6 +105,7 @@ var Montage = require("montage/core/core").Montage,
 		value: ""
 	},
 	isCollapsed : {
+        serializable: true,
 		get: function() {
 			return this._isCollapsed;
 		},
@@ -110,7 +114,6 @@ var Montage = require("montage/core/core").Montage,
 				this._isCollapsed = newVal;
 				//this.needsDraw = true;
 			}
-			
 		}
 	},
 	
@@ -141,6 +144,7 @@ var Montage = require("montage/core/core").Montage,
 		value: true
 	},
 	isLabelClickable : {
+        serializable: true,
 		get: function() {
 			return this._isLabelClickable;
 		},
@@ -149,6 +153,34 @@ var Montage = require("montage/core/core").Montage,
 		}
 	},
 
+    _myContent:{
+        value:null
+    },
+
+    myContent:{
+            serializable:true,
+            get:function () {
+                return this._myContent;
+            },
+            set:function (newVal) {
+                this._myContent = newVal;
+            }
+        },
+
+        _clicker:{
+            value:null
+        },
+
+        clicker:{
+            serializable:true,
+            get:function () {
+                return this._clicker;
+            },
+            set:function (newVal) {
+                this._clicker = newVal;
+            }
+        },
+
 	// isToggling: Bindable property. Set this (to anything) to trigger a toggle.
 	_isToggling: {
 		value: true
-- 
cgit v1.2.3