aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel
diff options
context:
space:
mode:
authorKruti Shah2012-06-28 09:24:03 -0700
committerKruti Shah2012-06-28 09:24:03 -0700
commit8aef94d26e172785463161899dfcc877b4233bdb (patch)
treea9d5ff91681aa06bf26cb62994461a58d3f80005 /js/panels/css-panel
parentdeefd070e5e6e793eef2c3d937e7b1a97b0f6830 (diff)
parent299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
downloadninja-8aef94d26e172785463161899dfcc877b4233bdb.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/panels/css-panel')
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js8
2 files changed, 9 insertions, 4 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 5361e5cc..d86c8d55 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
@@ -96,7 +96,10 @@ exports.CssStyleRule = Montage.create(Component, {
96 handleStop : { 96 handleStop : {
97 value: function(e) { 97 value: function(e) {
98 if(this.focusDelegate) { 98 if(this.focusDelegate) {
99 e._event.detail.preventDefault(); 99 if(e._event.detail.preventDefault) {
100 e._event.detail.preventDefault();
101 }
102
100 this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this); 103 this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this);
101 } 104 }
102 } 105 }
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
index 509ca565..f53937e6 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js
@@ -39,11 +39,13 @@ exports.RuleListContainer = Montage.create(Component, {
39 value: function(selection) { 39 value: function(selection) {
40 var list = this._getListForSelection(selection); 40 var list = this._getListForSelection(selection);
41 41
42 if(!list) { 42 if(list) {
43 this.displayedList = list;
44 this.update();
45 } else {
43 list = this.add(selection); 46 list = this.add(selection);
47 this.displayedList = list;
44 } 48 }
45
46 this.displayedList = list;
47 } 49 }
48 }, 50 },
49 51