Merge branch 'refs/heads/master' into montage-v10-integration

Conflicts:
	js/components/tools-properties/fill-properties.reel/fill-properties.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 56 insertions, 40 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 7af88662..22991a82 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -112,6 +112,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             return this._currentDocument;
         },
         set : function(value) {
+            // If it's the same document, do nothing.
             if (value === this._currentDocument) {
                 return;
             }
@@ -123,6 +124,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._currentDocument = value;
 
             if(!value) {
+                this._boolCacheArrays = false;
+                this.clearTimelinePanel();
+                this._boolCacheArrays = true;
                 this.enablePanel(false);
             } else if(this._currentDocument.currentView === "design") {
                 this._boolCacheArrays = false;
@@ -131,9 +135,40 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
                 // Rebind the document events for the new document context
                 this._bindDocumentEvents();
-
-                // TODO: Fix the init function so that it can be called here instead of when container changes
-                // this.initTimelineForDocument();
+                
+                // Initialize the timeline for the document.
+                this.initTimelineForDocument();
+            }
+        }
+    },
+    
+    _currentSelectedContainer: {
+        value: null
+    },
+    currentSelectedContainer: {
+        get: function() {
+            return this._currentSelectedContainer;
+        },
+        set: function(newVal) {
+            if(this._currentSelectedContainer !== newVal) {
+                this._currentSelectedContainer = newVal;
+                if (this._ignoreNextContainerChange === true) {
+                    this._ignoreNextContainerChange = false;
+                    return;
+                }
+                this.application.ninja.currentDocument.setLevel = true;
+                
+                if(this._currentDocument.currentView === "design") {
+                    this._boolCacheArrays = false;
+                    this.clearTimelinePanel();
+                    this._boolCacheArrays = true;
+    
+                    // Rebind the document events for the new document context
+                    this._bindDocumentEvents();
+                    
+                    // Initialize the timeline for the document.
+                    this.initTimelineForDocument();
+                }
             }
         }
     },
@@ -259,27 +294,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.cacheTimeline();
         }
     },
-    
-    _currentSelectedContainer: {
-        value: null
-    },
-    currentSelectedContainer: {
-        get: function() {
-                return this._currentSelectedContainer;
-        },
-        set: function(newVal) {
-            if(this._currentSelectedContainer !== newVal) {
-                    this._currentSelectedContainer = newVal;
 
-                this._boolCacheArrays = false;
-                this.clearTimelinePanel();
-                this._boolCacheArrays = true;
-
-                // TODO: Fix the function so that we can remove this call here.
-                this.initTimelineForDocument();
-            }
-        }
-    },
 
     _millisecondsOffset:{
         value:1000
@@ -480,6 +495,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false);
             document.addEventListener("click", this.handleDocumentClick.bind(this), false);
 
+
+            // Bind some bindings
+            Object.defineBinding(this, "currentSelectedContainer", {
+                boundObject:this.application.ninja,
+                boundObjectPropertyPath:"currentSelectedContainer",
+                oneway:true
+            });
+
         }
     },
 
@@ -688,14 +711,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.playhead.addEventListener("mousedown", this.startPlayheadTracking.bind(this), false);
             this.playhead.addEventListener("mouseup", this.stopPlayheadTracking.bind(this), false);
             this.time_markers.addEventListener("click", this.updatePlayhead.bind(this), false);
-            
-            // Bind some bindings
-            Object.defineBinding(this, "currentSelectedContainer", {
-                boundObject:this.application.ninja,
-                boundObjectPropertyPath:"currentSelectedContainer",
-                oneway:true
-            });
-            
+ 
                         // Start the panel out in disabled mode by default
                         // (Will be switched on later, if appropriate).
             this.enablePanel(false);
@@ -705,17 +721,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     // Initialize the timeline for a document.
     // Called when a document is opened (new or existing), or when documents are switched.
+    _ignoreNextContainerChange: {
+        value: true
+    },
     initTimelineForDocument:{
         value:function () {
-
-
-            var myIndex,
-                boolAlreadyInitialized = false;
+            var myIndex;
             this.drawTimeMarkers();
             // Document switching
             // Check to see if we have saved timeline information in the currentDocument.
             if ((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined")) {
-                //console.log('TimelinePanel.initTimelineForDocument: new Document');
+            //  console.log('TimelinePanel.initTimelineForDocument: new Document');
                 // No, we have no information stored.
                 // This could mean we are creating a new file, OR are opening an existing file.
                 
@@ -739,10 +755,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 // Draw the repetition.
                 this.arrLayers = this.temparrLayers;
                 this.currentLayerNumber = this.arrLayers.length;
-                boolAlreadyInitialized = true;
+                this._ignoreNextContainerChange = true;
                 
                         } else if (this.application.ninja.currentDocument.setLevel) {
-                //console.log('TimelinePanel.initTimelineForDocument: breadCrumbClick');
+                // console.log('TimelinePanel.initTimelineForDocument: breadCrumbClick');
                                 // Information stored, but we're moving up or down in the breadcrumb.
                                 // Get the current selection and restore timeline info for its children.
                 var parentNode = this.application.ninja.currentSelectedContainer,
@@ -757,12 +773,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 // Draw the repetition.
                 this.arrLayers = this.temparrLayers;
                 this.currentLayerNumber = storedCurrentLayerNumber;
-                boolAlreadyInitialized = true;
                 this.application.ninja.currentDocument.setLevel = false;
 
 
+
             } else {
-                //console.log('TimelinePanel.initTimelineForDocument: else fallback');
+            //  console.log('TimelinePanel.initTimelineForDocument: else fallback');
                 // we do have information stored.  Use it.