Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 28 insertions, 2 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 {