Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding

3 files changed, 17 insertions, 8 deletions

diff --git a/js/stage/binding-view.reel/binding-view.css b/js/stage/binding-view.reel/binding-view.css
index b6673da1..0365f52d 100755
--- a/js/stage/binding-view.reel/binding-view.css
+++ b/js/stage/binding-view.reel/binding-view.css
@@ -27,7 +27,7 @@
 }
 
 .objects-tray-container {
-    bottom: 11px;
+    bottom: 10px;
     position: absolute;
     width: 100%;
     display: -webkit-box;
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 5532d61a..01bc3ff7 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -28,6 +28,12 @@
                     "objects": {"<-": "@owner.bindables"}
                 }
             },
+            "objectsTray" : {
+                "prototype": "js/stage/objects-tray.reel",
+                "properties": {
+                    "element": {"#": "objects-tray" }
+                }
+            },
             "hud": {
                 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
                 "properties": {
@@ -42,12 +48,6 @@
                         "listener": {"@": "owner"}
                     }
                 ]
-            },
-            "objectsTray" : {
-                "prototype": "js/stage/objects-tray.reel",
-                "properties": {
-                    "element": {"#": "objects-tray" }
-                }
             }
         }
     </script>
@@ -57,6 +57,7 @@
 
 
     <section data-montage-id="bindingView" class="bindingView">
+
         <div data-montage-id="hudRepeater" class="hudRepeater">
             <div data-montage-id="hud">
 
@@ -66,6 +67,7 @@
         <div class="objects-tray-container">
             <div data-montage-id="objects-tray" ></div>
         </div>
+
     </section>
 
 </body>
diff --git a/js/stage/objects-tray.reel/objects-tray.js b/js/stage/objects-tray.reel/objects-tray.js
index c046a3bb..190abf57 100644
--- a/js/stage/objects-tray.reel/objects-tray.js
+++ b/js/stage/objects-tray.reel/objects-tray.js
@@ -13,6 +13,7 @@ var Montage = require("montage/core/core").Montage,
 
 exports.ObjectsTray = Montage.create(Component, {
     hideClass : { value: 'hide-objects-tray'},
+    _empty : { value: null },
     _workspaceMode : { value: null },
     workspaceMode : {
         get : function() { return this._workspaceMode; },
@@ -76,11 +77,17 @@ exports.ObjectsTray = Montage.create(Component, {
                 "oneway": true
             });
 
+            if(this.objects) {
+                this.empty = !this.objects.length;
+            } else {
+                this.empty = true;
+            }
+
         }
     },
     draw : {
         value: function() {
-            if(this.hide) {
+            if(this.hide || this._empty) {
                 this.element.classList.add(this.hideClass);
             } else {
                 this.element.classList.remove(this.hideClass);