6 files changed, 103 insertions, 64 deletions

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 5818eca8..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
@@ -11,7 +11,7 @@
     font-size: 11px;
     box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61);
     border-radius: 6px;
-    padding: 3px 8px;
+    padding: 3px;
     text-shadow: 1px 1px 0px #000;
 }
 
@@ -29,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;
 }
 
@@ -38,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;
@@ -94,8 +99,13 @@
 }
 .splitter.scrollArea:hover:not(.disabled) {
     background-color: #303030;
+    border-bottom: 1px solid #252525;
+    box-shadow: 0 1px 0 0 #3F3F3F;
+}
+.splitter.scrollAreaBottom:hover:not(.disabled) {
+    border-bottom: 1px solid #3F3F3F;
+    box-shadow: 0 1px 0 0 #252525;
 }
-
 
 .hudRepetition {
     overflow: hidden;
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
index 7bb888d5..f7e1a1d2 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
@@ -36,7 +36,8 @@
                     "element": {"#" : "hudOption"}
                 },
                 "bindings": {
-                    "title": {"<-": "@repeater.objectAtCurrentIteration"}
+                    "title": {"<-": "@repeater.objectAtCurrentIteration.property"},
+                    "promoted": {"<-": "@repeater.objectAtCurrentIteration.promoted"}
                 }
             },
             "resizer1": {
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index 6b802cb0..1b0af09d 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -10,6 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 */
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
+var ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.BindingHud = Montage.create(Component, {
     scrollUp: {
@@ -49,10 +50,10 @@ exports.BindingHud = Montage.create(Component, {
         value: null,
         serializable: true
     },
-    _userComponent: { value: null  },
-    userComponent: {
+    _userElement: { value: null  },
+    userElement: {
         get: function() {
-            return this._userComponent;
+            return this._userElement;
         },
         set: function(val) {
             if(!val) { return; }
@@ -61,14 +62,14 @@ exports.BindingHud = Montage.create(Component, {
                 bindingView = this.parentComponent.parentComponent,
                 isOffStage, icon, iconOffsets;
 
-            this._userComponent = val;
-            this.properties = this.getPropertyList(val); //controller.getPropertiesFromObject(val, true);
+            this._userElement = val;
+            this.properties = this.getPropertyList(val.controller); //controller.getPropertiesFromObject(val, true);
 
-            controller.getObjectBindings(this.userComponent).forEach(function(obj) {
+            controller.getObjectBindings(this._userElement.controller).forEach(function(obj) {
                 this.boundProperties.push(obj.sourceObjectPropertyPath);
             }, this);
 
-            isOffStage = controller.isOffStageObject(val);
+            isOffStage = controller.isOffStageObject(val.controller);
 
             if(isOffStage) {
                 icon = bindingView.getOffStageIcon(val);
@@ -76,20 +77,33 @@ exports.BindingHud = Montage.create(Component, {
                 this.title = icon.name;
                 this.x = iconOffsets.x;
                 this.y = iconOffsets.y - 80;
+            } else {
+                this.title = this._userElement.controller.identifier;
+                this.x = this._userElement.offsetLeft;
+                this.y = this._userElement.offsetTop;
+//                this.x = parseInt(ElementsMediator.getProperty(val, "left"));
+//                this.y = parseInt(ElementsMediator.getProperty(val, "top"));
             }
             this.needsDraw = true;
-
         }
     },
 
     getPropertyList : {
         value: function(component) {
-            var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true);
-
-            var objectName, promotedProperties;
+            var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true),
+                promotedProperties = [],
+                objectName;
+
+            ///// Mapper - property to property object
+            function