diff options
author | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
commit | ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch) | |
tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /js/panels/css-panel | |
parent | ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff) | |
parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
download | ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels/css-panel')
-rw-r--r-- | js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js | 5 | ||||
-rw-r--r-- | js/panels/css-panel/rule-list-container.reel/rule-list-container.js | 8 |
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 | ||