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

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

2 files changed, 1918 insertions, 1918 deletions

diff --git a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
index 51aebc31..84b24022 100755
--- a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
+++ b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
@@ -29,1868 +29,1868 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var TreeControl = require("js/components/tree.reel").Tree,
-        ResizerControl = require("js/panels/Resizer").Resizer,
-        nj = require("js/lib/NJUtils").NJUtils;
+    ResizerControl = require("js/panels/Resizer").Resizer,
+    nj = require("js/lib/NJUtils").NJUtils;
 
 exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
-        hasTemplate: {
-                value: true
-        },
+    hasTemplate: {
+        value: true
+    },
     _hasFocus: {
-        numerable: false,
-        value: false
+        numerable: false,
+        value: false
     },
-    
+
     /* The current project that we have in memory */
-        _activeProject: {
-                value: false
-        },
-        activeProject: {
-                get: function() {
-                        return this._activeProject;
-                },
-                set: function(objNewProject) {
-                        this._activeProject = objNewProject;
-                }
-        },
-    
+    _activeProject: {
+        value: false
+    },
+    activeProject: {
+        get: function() {
+            return this._activeProject;
+        },
+        set: function(objNewProject) {
+            this._activeProject = objNewProject;
+        }
+    },
+
     /* Is the panel initialized? Helps keep us from re-initializing things when a project switches */
     _isPanelInitialized: {
-        value: false
+        value: false
     },
     isPanelInitialized: {
-        get: function() {
-                return this._isPanelInitialized;
-        },
-        set: function(boolValue) {
-                this._isPanelInitialized = boolValue;
-        }
-    },
-    
+        get: function() {
+            return this._isPanelInitialized;
+        },
+        set: function(boolValue) {
+            this._isPanelInitialized = boolValue;
+        }
+    },
+
     /* Project models: is there an active project, did the user just swap the project, etc. */
-        _swapProject: {
-                value: false
-        },
-        swapProject: {
-                get: function() {
-                        return this._swapProject;
-                },
-                set: function(boolValue) {
-                        this._swapProject = boolValue;
-                }
-        },
-        _updateTree: {
-                value: false
-        },
-        updateTree: {
-                get: function() {
-                        return this._updateTree;
-                },
-                set: function(boolValue) {
-                        this._updateTree = boolValue;
-                }
-        },
-        _updateAssets: {
-                value: false
-        },
-        _updateAssets : {
-                get: function() {
-                        return this._updateAssets;
-                },
-                set: function(boolValue) {
-                        this._updateAssets = boolValue;
-                }
-        },
-        _hasActiveProject: {
-                value: false
-        },
-        hasActiveProject: {
-                get: function() {
-                        return this._hasActiveProject;
-                },
-                set: function(boolValue) {
-                        if (this.hasActiveProject !== boolValue) {
-                                this._hasActiveProject = boolValue;
-                                this.needsDraw = true;
-                                this.swapProject = true;
-                                this.loadPanelState();
-                        }
-                }
-        },
-        setActiveProject: {
-                value: function(myVal) {
-                        this.hasActiveProject = myVal;
-                }
-        },
-        
-        /* Focus monitor: needed to modify keyboard navigation through panels. */
-        _hasFocus: {
-                value: false
-        },
-        hasFocus: {
-                get: function() {
-                        return this._hasFocus;
-                },
-                set: function(newVal) {
-                        if (this._hasFocus !== newVal) {
-                                this._hasFocus = newVal;
-                        }
-                }
-        },
+    _swapProject: {
+        value: false
+    },
+    swapProject: {
+        get: function() {
+            return this._swapProject;
+        },
+        set: function(boolValue) {
+            this._swapProject = boolValue;
+        }
+    },
+    _updateTree: {
+        value: false
+    },
+    updateTree: {
+        get: function() {
+            return this._updateTree;
+        },
+        set: function(boolValue) {
+            this._updateTree = boolValue;
+        }
+    },
+    _updateAssets: {
+        value: false
+    },
+    _updateAssets : {
+        get: function() {
+            return this._updateAssets;
+        },
+        set: function(boolValue) {
+            this._updateAssets = boolValue;
+        }
+    },
+    _hasActiveProject: {
+        value: false
+    },
+    hasActiveProject: {
+        get: function() {
+            return this._hasActiveProject;
+        },
+        set: function(boolValue) {
+            if (this.hasActiveProject !== boolValue) {
+                this._hasActiveProject = boolValue;
+                this.needsDraw = true;
+                this.swapProject = true;
+                this.loadPanelState();
+            }
+        }
+    },
+    setActiveProject: {
+        value: function(myVal) {
+            this.hasActiveProject = myVal;
+        }
+    },
+
+    /* Focus monitor: needed to modify keyboard navigation through panels. */
+    _hasFocus: {
+        value: false
+    },
+    hasFocus: {
+        get: function() {
+            return this._hasFocus;
+        },
+        set: function(newVal) {
+            if (this._hasFocus !== newVal) {
+                this._hasFocus = newVal;
+            }
+        }
+    },
 
     /* Active column models: Used to store the state of the columns as a resize is happening */
     _activeColumn: {
-        enumerable: false,
-        value: false
+        enumerable: false,
+        value: false
     },
     activeColumn: {
-        get: function() {
-                return this._activeColumn;
-        },
-        set: function(intActiveColumn) {
-                this._activeColumn = intActiveColumn;
-        }
+        get: function() {
+            return this._activeColumn;
+        },
+        set: function(intActiveColumn) {
+            this._activeColumn = intActiveColumn;
+        }
     },