diff options
author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/panels/css-panel/rule-list-container.reel | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/css-panel/rule-list-container.reel')
-rw-r--r-- | js/panels/css-panel/rule-list-container.reel/rule-list-container.js | 8 |
1 files changed, 1 insertions, 7 deletions
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 e2e269ba..c7766d08 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 | |||
@@ -45,7 +45,7 @@ exports.RuleListContainer = Montage.create(Component, { | |||
45 | for(i = 0; i<this.ruleLists.length; i++) { | 45 | for(i = 0; i<this.ruleLists.length; i++) { |
46 | list = this.ruleLists[i]; | 46 | list = this.ruleLists[i]; |
47 | 47 | ||
48 | if(selection.length > 1) { | 48 | if(selection.length === list.selection.length) { |
49 | matchesAll = selection.every(function(element, index, array) { | 49 | matchesAll = selection.every(function(element, index, array) { |
50 | return list.selection.indexOf(element) !== -1; | 50 | return list.selection.indexOf(element) !== -1; |
51 | }); | 51 | }); |
@@ -53,12 +53,6 @@ exports.RuleListContainer = Montage.create(Component, { | |||
53 | if(matchesAll) { | 53 | if(matchesAll) { |
54 | break; | 54 | break; |
55 | } | 55 | } |
56 | } else { | ||
57 | ///// Selection (single element or stylesheet) is the same, | ||
58 | ///// Use the existing rule list | ||
59 | if(list.selection[0] === selection[0]) { | ||
60 | break; | ||
61 | } | ||
62 | } | 56 | } |
63 | 57 | ||
64 | list = null; | 58 | list = null; |