aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-04-04 17:57:13 -0700
committerEric Guzman2012-04-04 17:57:13 -0700
commit313e0336cc72a1dc773bfa0e3d41b2993339f9af (patch)
tree1f691b5245dda9a45149fd70b072a972c4cffef5 /js
parent72697c2a48480509cd89ac506d8a4873f2853fd4 (diff)
downloadninja-313e0336cc72a1dc773bfa0e3d41b2993339f9af.tar.gz
Rule List - Update selection to not use "_element" property.
Diffstat (limited to 'js')
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js2
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js6
2 files changed, 3 insertions, 5 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 03c609d7..04689602 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
@@ -59,7 +59,7 @@ exports.RuleListContainer = Montage.create(Component, {
59 listInstance = Montage.create(this.ruleListComponent), 59 listInstance = Montage.create(this.ruleListComponent),
60 container = document.createElement('div'), 60 container = document.createElement('div'),
61 rules; 61 rules;
62//debugger; 62
63 if(type === 'ELEMENT') { 63 if(type === 'ELEMENT') {
64 rules = stylesController.getMatchingRules(selection); 64 rules = stylesController.getMatchingRules(selection);
65 } 65 }
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
index 5967345a..7df39d39 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
@@ -46,12 +46,10 @@ exports.StylesViewContainer = Montage.create(Component, {
46 return false; 46 return false;
47 } else if(elements.length > 1) { 47 } else if(elements.length > 1) {
48 type = 'ELEMENTS'; 48 type = 'ELEMENTS';
49 selection = elements.map(function(obj) { 49 selection = elements;
50 return obj._element;
51 });
52 } else { 50 } else {
53 type = 'ELEMENT'; 51 type = 'ELEMENT';
54 selection = elements[0]._element; 52 selection = elements[0];
55 } 53 }
56 54
57 ruleList = this.ruleListContainer._getRuleList({ 55 ruleList = this.ruleListContainer._getRuleList({