Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index e0ffb1a8..54181bf3 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -88,6 +88,14 @@ exports.CssStyleRule = Montage.create(Component, {
             }
         }
     },
+    handleStop : {
+        value: function(e) {
+            if(this.focusDelegate) {
+                e._event.detail.preventDefault();
+                this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this);
+            }
+        }
+    },
     handleMouseover: {
         value: function(e) {
             if(this.focusDelegate) {
@@ -125,6 +133,7 @@ exports.CssStyleRule = Montage.create(Component, {
                 this.declarationComponent.type = 'inline';
             } else {
                 this.selectorField.addEventListener('change', this, false);
+                this.selectorField.addEventListener('stop', this, false);
                 this.selectorField.element.addEventListener('mouseover', this, false);
                 this.selectorField.element.addEventListener('mouseout', this, false);
             }