Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 1071 insertions, 1071 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 3dc2e514..c2dcd5ff 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -29,9 +29,9 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component,
-        nj = require("js/lib/NJUtils").NJUtils,
-        EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu;
+    Component = require("montage/ui/component").Component,
+    nj = require("js/lib/NJUtils").NJUtils,
+    EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu;
 
 var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
@@ -142,22 +142,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 return;
             }
             this._currentDocument = value;
-            
+
             var boolDoc = false,
-                boolView = false;
-                
-                        // Should we enable the panel? 
-                        // Only if we have both a document and we're in design view.
-                        if (typeof(value) !== "undefined") {
-                                if (value.currentView === "design") {
-                                        // We are in design view.
-                                        boolView = true;
-                                }
-                        }
-                        if (typeof(this._currentDocument) !== "undefined") {
-                                // We have a document, or at least we have initialized the panel.  
-                                boolDoc = true;
-                        }
+                boolView = false;
+
+            // Should we enable the panel?
+            // Only if we have both a document and we're in design view.
+            if (typeof(value) !== "undefined") {
+                if (value.currentView === "design") {
+                    // We are in design view.
+                    boolView = true;
+                }
+            }
+            if (typeof(this._currentDocument) !== "undefined") {
+                // We have a document, or at least we have initialized the panel.
+                boolDoc = true;
+            }
 
             if(boolDoc === false) {
                 this._boolCacheArrays = false;
@@ -165,18 +165,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this._boolCacheArrays = true;
                 this.enablePanel(false);
             } else {
-                if(boolView === true) {
-                        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();
-                        this.enablePanel(true);
-                                }
+                if(boolView === true) {
+                    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();
+                    this.enablePanel(true);
+                }
             }
         }
     },
@@ -188,7 +188,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             }
         }
     },
-    
+
     _currentSelectedContainer: {
         value: null
     },
@@ -204,15 +204,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     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();
                 }
@@ -262,25 +262,25 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._layerRepetition = newVal;
         }
     },
-    
+
     _areTracksScrolling: {
-        value: false
+        value: false
     },
-    
+
     _areTracksCollapsing: {
-        value: false
+        value: false
     },
-    
+
     _currentOpenSpanMenu: {
-        value: false
+        value: false
     },
     currentOpenSpanMenu: {
-        get: function() {
-                return this._currentOpenSpanMenu;
-        },
-        set: function(newVal) {
-                this._currentOpenSpanMenu = newVal;
-        }
+        get: function() {
+            return this._currentOpenSpanMenu;
+        },
+        set: function(newVal) {
+            this._currentOpenSpanMenu = newVal;
+        }
     },
 
     // Set to false to skip array caching array sets in currentDocument
@@ -288,7 +288,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:true
     },
 
-        // Current layer number: iterated and used to assign layer IDs.
+    // Current layer number: iterated and used to assign layer IDs.
     _currentLayerNumber:{
         value:0
     },
@@ -318,16 +318,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
     _currentElementsSelected: {
-        value: []
+        value: []
     },
     currentElementsSelected: {
-        get: function() {
-                return this._currentElementsSelected;
-        },
-        set: function(newVal) {
-                this._currentElementsSelected = newVal;
-                this.cacheTimeline();
-        }
+        get: function() {
+            return this._currentElementsSelected;
+        },
+        set: function(newVal) {
+            this._currentElementsSelected = newVal;
+            this.cacheTimeline();
+        }
     },
 
     _currentLayersSelected:{
@@ -342,33 +342,33 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.cacheTimeline();
         }
     },
-    
+
     _easingMenu: {
-        value: null
+        value: null
     },
     easingMenu: {