Merge branch 'refs/heads/master' into dom-architecture

1 files changed, 5 insertions, 14 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 66ef1b97..d1cab096 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:{
@@ -663,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?
@@ -724,7 +715,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;