Merge branch 'refs/heads/NINJAmaster' into TimelineUber

3 files changed, 34 insertions, 2 deletions

diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 2a147964..f3e5de07 100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -4,8 +4,6 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 .documentBar {
-    height: 25px;
-    width: 1000px;
     position: relative;
     overflow: hidden;
     color: white;
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index 48f1423c..bd13f231 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -32,6 +32,20 @@
                 }
             },
 
+            "disable": {
+                "prototype": "montage/ui/condition.reel",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
+            },
+
             "owner": {
                 "module": "js/components/layout/document-bar.reel",
                 "name": "DocumentBar",
@@ -53,6 +67,7 @@
         <input class="zoomHotText label" id="zoomControlHT"/>
         <span class="design-view disable" id="design">Design View</span>
         <span class="code-view disable" id="code">Code View</span>
+        <div id="disabledCondition" class="panelDisabled"></div>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index ea5e3280..4dc39fd6 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -13,6 +13,9 @@ exports.DocumentBar = Montage.create(Component, {
     codeView: { value: null, enumerable: false},
     zoomControl: { value: null, enumerable: false },
     _type: { enumerable: false, value: null },
+    disabled: { value: true },
+
+
 
     type: {
         enumerable: false,
@@ -84,6 +87,8 @@ exports.DocumentBar = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            this.eventManager.addEventListener( "openDocument", this, false);
+            this.eventManager.addEventListener( "closeDocument", this, false);
             this.designView.addEventListener("click", this, false);
             this.codeView.addEventListener("click", this, false);
 
@@ -99,6 +104,20 @@ exports.DocumentBar = Montage.create(Component, {
         }
     },
 
+    handleOpenDocument: {
+        value: function() {
+            this.disabled = false;
+        }
+    },
+
+    handleCloseDocument: {
+        value: function() {
+            if(!this.application.ninja.documentController.activeDocument) {
+                this.disabled = true;
+            }
+        }
+    },
+
     handleOnDocumentChanged:{
         value:function(event){