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

5 files changed, 95 insertions, 22 deletions

diff --git a/css/ninja.css b/css/ninja.css
index f139c3b9..8213ec26 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -655,6 +655,8 @@ body section .dragging { opacity: 0.4; }
 
 body .main .dragOver:not(.dragging) { background-color: #917B56; }
 
+.panelDisabled { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 6000; color: white; text-align: center; line-height: 100px; box-shadow: inset 0 0 14px #111111; background: rgba(30, 30, 30, 0.8); }
+
 .menuBar { width: 100%; border-style: solid; border-width: 1px; height: 22px; color: white; background: #474747; border-color: black; }
 
 .menuBar ul { list-style: none; margin: 0; padding: 0; float: left; cursor: default; }
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 04e2930a..43b87940 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -113,6 +113,21 @@
                 }
             },
 
+            "disabledCondition": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
+
             "owner": {
                 "module": "js/panels/Panel.reel",
                 "name": "Panel",
@@ -136,9 +151,8 @@
     </div>
     <div class="panelBody">
         <div class="panelBodyContent">
-            <div id="panelObject" class="panelObjects">
-
-            </div>
+            <div id="disabledCondition" class="panelDisabled"></div>
+            <div id="panelObject" class="panelObjects"></div>
         </div>
     </div>
     <div id="resizeBar" class="resizeBar"></div>
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 2b308258..33f9b3a7 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -57,6 +57,10 @@ exports.Panel = Montage.create(Component, {
         value: null
     },
 
+    disabled: {
+        value:false
+    },
+
     collapsed: {
         get: function() {
             return this._collapsed;
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index dd720bd3..c40bbc21 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -47,6 +47,7 @@ exports.PanelContainer = Montage.create(Component, {
                 this['panel_'+i].flexible = p.flexible;
                 this['panel_'+i].modulePath = p.modulePath;
                 this['panel_'+i].moduleName = p.moduleName;
+                this['panel_'+i].disabled = true;
 
                 this.currentPanelState[p.name] = {};
                 this.currentPanelState.version = "1.0";
@@ -64,6 +65,8 @@ exports.PanelContainer = Montage.create(Component, {
             this.application.localStorage.setItem("panels", this.currentPanelState);
 
 
+            this.eventManager.addEventListener( "onOpenDocument", this, false);
+            this.eventManager.addEventListener( "closeDocument", this, false);
         }
     },
  
@@ -81,7 +84,25 @@ exports.PanelContainer = Montage.create(Component, {
      
     handleResize: {
          value: function(e) {
-            this._setPanelsSizes(null);
+            this._redrawPanels(null, true);
+        }
+    },
+
+    handleOnOpenDocument: {
+        value: function(){
+            this.panels.forEach(function(obj) {
+                obj.disabled = false;
+            });
+        }
+    },
+
+    handleCloseDocument: {
+        value: function(){
+            if(!this.application.ninja.documentController.activeDocument) {
+                this.panels.forEach(function(obj) {
+                    obj.disabled = true;
+                });
+            }
         }
     },
  
@@ -102,10 +123,21 @@ exports.PanelContainer = Montage.create(Component, {
 
             if(draggedIndex !== droppedIndex) {
                 // switch panels
-                this.panels[droppedIndex].element.parentNode.insertBefore(this.panels[draggedIndex].element, this.panels[droppedIndex].element);
+                if (droppedIndex === draggedIndex +1) {
+                    if(this.panels[droppedIndex].element.nextSibling) {
+                        this.panels[droppedIndex].element.parentNode.insertBefore(this.panels[draggedIndex].element, this.panels[droppedIndex].element.nextSibling);
+                    } else {
+                        return this.appendChild(this.panels[draggedIndex].element);
+                    }
+                } else {
+
+                    this.panels[droppedIndex].element.parentNode.insertBefore(this.panels[draggedIndex].element, this.panels[droppedIndex].element);
+                }
+                var panelRemoved = this.panels.splice(draggedIndex, 1);
+                this.panels.splice(droppedIndex, 0, panelRemoved[0]);
+
             }
 
-            this._setPanelsSizes(null);
         }
     },
  
@@ -114,12 +146,12 @@ exports.PanelContainer = Montage.create(Component, {
             var len = this.panels.length, setLocked = true;
 
             for(var i = 0; i < len; i++) {
-                if(this['panel_'+i] === panelActivated || panelActivated === null) {
+                if(this.panels[i] === panelActivated || panelActivated === null) {
                     setLocked = false;
                 }
 
-                this['panel_'+i].locked = setLocked;
-                this['panel_'+i].needsDraw = true;
+                this.panels[i].locked = setLocked;
+                this.panels[i].needsDraw = true;
             }
         }
     },
@@ -133,7 +165,12 @@ exports.PanelContainer = Montage.create(Component, {
                 setLocked = false;
             }
 
-            var childrensMinHeights = ((len - 1) * 26) + panelActivated.minHeight;
+            var childrensMinHeights = (len * 26);
+            if (panelActivated) {
+                if (!panelActivated.collapsed) {
+                    childrensMinHeights+= panelActivated.minHeight -26;
+                }
+            }
 
             for(var i = 0; i < len; i++) {
                 var obj = this['panel_'+i];
@@ -169,25 +206,27 @@ exports.PanelContainer = Montage.create(Component, {
             var unlockPanels = true;
             var afterPanel = false;
             var panelName = e.target.parentComponent.name;
+
+            this.panels.forEach(function(obj) {
+                if(afterPanel) {
+                    if(obj.flexible && obj.collapsed === false) {
+                        unlockPanels = false;
+                    }
+                }
+                if (obj.name === panelName) {
+                    afterPanel = true;
+                }
+            });
+
             switch(e.target.identifier) {
                 case "btnCollapse":
                     this.currentPanelState[e.target.parentComponent.name].collapsed = e.target.parentComponent.collapsed;
                     this.application.localStorage.setItem("panels", this.currentPanelState);
-                    this._setPanelsSizes(e.target.parentComponent);
+                    //this._setPanelsSizes(e.target.parentComponent);
                     this._redrawPanels(e.target.parentComponent, unlockPanels);
                     break;
                 case "btnClose":