From a8ad82e6595b75838305eb4fa83385a42053ffd6 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 30 Apr 2012 16:00:41 -0700
Subject: Timeline: Change serialization parameters for some component
 properties.

---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 70e04b4c..64303cef 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -16,7 +16,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     /* === BEGIN: Models === */
     _arrLayers:{
-        serializable:true,
         value:[]
     },
 
@@ -47,12 +46,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
 
     _layerRepetition:{
-        serializable:true,
         value:null
     },
 
     layerRepetition:{
-        serializable:true,
         get:function () {
             return this._layerRepetition;
         },
@@ -170,7 +167,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _masterDuration:{
-        serializable:true,
         value:0
     },
 
@@ -186,12 +182,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _trackRepetition:{
-        serializable:true,
         value:null
     },
 
     trackRepetition:{
-        serializable:true,
         get:function () {
             return this._trackRepetition;
         },
@@ -249,18 +243,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _firstTimeLoaded:{
-        value:true,
-        writable:true
+        value:true
     },
 
     _captureSelection:{
-        value:false,
-        writable:true
+        value:false
     },
 
     _openDoc:{
-        value:false,
-        writable:true
+        value:false
     },
 
     timeMarkerHolder:{
-- 
cgit v1.2.3


From d917e865cbc7fd8929e068aeba967af1bd64c5e7 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 30 Apr 2012 17:34:11 -0700
Subject: Timeline: bug fix: disable bread crumb setlevel.

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

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 64303cef..6e64cde0 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -705,7 +705,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 				// there is a currentDocument.  We don't do anything at that time.
 				return;
 			}
-            this.application.ninja.currentDocument.setLevel = true;
+            // this.application.ninja.currentDocument.setLevel = true;
             this._boolCacheArrays = false;
             this.clearTimelinePanel();
             this._boolCacheArrays = true;
-- 
cgit v1.2.3


From 22af7613f36f3a30653060284e144830f9164c45 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 4 May 2012 00:18:33 -0700
Subject: temporary commenting a timeline bug preventing nested selection

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 48818e44..d1cab096 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -654,7 +654,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
                 //debugger;
                 if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") {
-                	this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
+//                	this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
                 }
                 
                 // Are we only showing animated layers?
-- 
cgit v1.2.3