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

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

3 files changed, 1926 insertions, 1926 deletions

diff --git a/js/panels/Project/ProjectPanel.js b/js/panels/Project/ProjectPanel.js
index 5dcba3e7..35ba0a2f 100755
--- a/js/panels/Project/ProjectPanel.js
+++ b/js/panels/Project/ProjectPanel.js
@@ -29,12 +29,12 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-        PanelBase =             require("js/panels/PanelBase").PanelBase,
-        ProjectPanelBase =      require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase;
+    PanelBase =         require("js/panels/PanelBase").PanelBase,
+    ProjectPanelBase =  require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase;
 
 exports.ProjectPanel = Montage.create(PanelBase, {
-   
-        id: {value: "projectPanel", writable: true, enumerable: true, configurable: true},
+
+    id: {value: "projectPanel", writable: true, enumerable: true, configurable: true},
     panelName: {value: "Project/Assets", writable: true, enumerable: true, configurable: true},
     panelHeaderID: {value: "projectPanelHeader", writable: true, enumerable: true, configurable: true},
     disclosureIconID: {value: "projectPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
@@ -42,9 +42,9 @@ exports.ProjectPanel = Montage.create(PanelBase, {
     panelContentID: {value: "projectPanelContent", writable: true, enumerable: true, configurable: true},
 
     init: {
-        enumerable: true,
-        value: function() {
-                        //Creating panel container and panel
+        enumerable: true,
+        value: function() {
+            //Creating panel container and panel
             this.minHeight = 350;
             this.defaultHeight = 350;
             this.contentHeight = 395;
@@ -57,7 +57,7 @@ exports.ProjectPanel = Montage.create(PanelBase, {
             this._projectPanelBase.element = ppContainer;
             //Adding container to the parent
             this.content = this._projectPanelBase;
-                //Drawing panel
+            //Drawing panel
             this._projectPanelBase.needsDraw = true;
             */
 
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;
-                }
-        },
+    _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;
+        }
+    },