Merge pull request #355 from dhg637/GIO_binding-view

Gio binding view bugs and fixes

9 files changed, 165 insertions, 85 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 6557c14e..6ca869ba 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -27,7 +27,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
             setTimeout(function() {
                 this.bindToModelObjects();
             }.bind(this), 1000);
-
+            this.currentObjectBindings = [];
             this._currentDocument = doc;
         },
         enumerable : false
@@ -150,9 +150,9 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
             var properties = [];
 
             for(var key in object) {
-                if(object.hasOwnProperty(key)) {
+                //if(object.hasOwnProperty(key)) {
                         properties.push(key);
-                }
+                //}
             }
 
             if(excludeUnderscoreProperties) {
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index e325316b..94f69ed8 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -516,8 +516,10 @@ exports.Ninja = Montage.create(Component, {
 
             if(this.appModel.livePreview) {
                 transitionStopRule = "nj-css-garbage-selector";
+                this.stage.bindingView.hide = true;
             } else {
                 transitionStopRule = "*"
+                this.stage.bindingView.hide = false;
             }
 
             this.application.ninja.stylesController._stageStylesheet.rules[0].selectorText = transitionStopRule;
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
index fb0fd57e..a7fbb297 100755
--- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
+++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
@@ -26,8 +26,28 @@ exports.BindingHudOption = Montage.create(Component, {
         }
     },
 
-    bound: {
-        value: false
+    _promoted : { value: null },
+    promoted : {
+        get : function() { return this._promoted; },
+        set : function(value) {
+            if(value === this._promoted) { return; }
+
+            this._promoted = value;
+
+            this.needsDraw = true;
+        }
+    },
+
+    _bound : { value: null },
+    bound : {
+        get : function() { return this._bound; },
+        set : function(value) {
+            if(value === this._bound) { return; }
+
+            this._bound = value;
+
+            this.needsDraw = true;
+        }
     },
 
     prepareForDraw: {
@@ -47,6 +67,12 @@ exports.BindingHudOption = Montage.create(Component, {
             } else {
                 this.element.classList.remove("bound");
             }
+
+            if(this.promoted || this.bound) {
+                this.element.classList.add("promoted");
+            } else {
+                this.element.classList.remove("promoted");
+            }
 //            if(this.bindings.length > 0) {
 //                this.element.classList.add("bound");
 //            } else {
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
index 680f9183..1536c706 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
@@ -6,14 +6,12 @@
 
 .bindingHud {
     position: absolute;
-    background: rgba(0, 0, 0, 0.85);
-    /*padding: 0px;*/
+    background: rgba(24, 24, 24, 0.85);
     color: #C4C4C4;
     font-size: 11px;
-    box-shadow: inset 0px 0px 0px 0px #CCC;
+    box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61);
     border-radius: 6px;
-    padding: 3px 1px 1px;
-    border:1px solid #000;
+    padding: 3px;
     text-shadow: 1px 1px 0px #000;
 }
 
@@ -31,6 +29,8 @@
     /*background: rgba(0, 0, 0, 0.3);*/
     line-height:16px;
     /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/
+    padding-top: 4px;
+    margin: 0 5px;
     min-width: 80px;
 }
 
@@ -40,7 +40,10 @@
     line-height:16px;
     padding:1px 25px 1px 8px;
 }
-
+.bindingHud .hudOption.promoted {
+    color: #FFF;
+    font-weight: bold;
+}
 .bindingHud .hudOption .connectorBubble:hover {
     background-color: #1B52A7;
     box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747;
@@ -58,35 +61,35 @@
 
 .bindingHud .hudOption .connectorBubble {
     position: absolute;
-    right: 5px;
+    right: 2px;
     top: 3px;
     border-radius: 50%;
     width: 10px;
     height: 10px;
     border-left: 0px;
     display: block;
-    background-color: #313131;
-    box-shadow: inset 0px 2px 7px 1px #0F0F0F, 0 1px #424242;
+    background-color: #353535;
+    box-shadow: inset 0px 2px 3px 1px #222, 0 1px #666;
 
 }
 
 .splitter.scrollArea {
     background-color: transparent;
-    background-size: 12%;
+    background-size: 10%;
     background-position-y: 2px;
     display: none;
     height:11px;
     text-align: center;
 }
 .splitter.scrollAreaTop {
-    border-top: 1px solid #353535;
-    box-shadow: 0 -1px 0 0 #141414;
+    border-bottom: 1px solid #141414;
+    box-shadow: 0 1px 0 0 #525252;
 }
 .splitter.scrollAreaBottom {
     -webkit-transform: rotate(180deg);
     border-top-left-radius: 6px;
     border-top-right-radius: 6px;
-    border-bottom: 1px solid #353535;
+    border-bottom: 1px solid #525252;
     box-shadow: 0 1px 0 0 #141414;
     margin-top: 4px;
 }
@@ -95,9 +98,14 @@
     opacity: 0.5;
 }