aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJonathan Duran2012-06-27 09:55:55 -0700
committerJonathan Duran2012-06-27 09:55:55 -0700
commitdda617d86a8ff17cad8a97ae96435b7de6ab69b4 (patch)
treea1be28e0c2966df74893dc043ebe934ea3eb21a0 /js/panels
parent18231c8342e7dac7547842c8a2007ac7ecd046df (diff)
parent2ebf3e3ea24d0d580575dfa13d31588dac1de445 (diff)
downloadninja-dda617d86a8ff17cad8a97ae96435b7de6ab69b4.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.js b/js/panels/css-panel/rule-list.reel/rule-list.js
index 27d74b2f..b4cd9e97 100644
--- a/js/panels/css-panel/rule-list.reel/rule-list.js
+++ b/js/panels/css-panel/rule-list.reel/rule-list.js
@@ -81,7 +81,7 @@ exports.RuleList = Montage.create(Component, {
81 // found rule in our component list, or it's the inline rule 81 // found rule in our component list, or it's the inline rule
82 ruleComponent.update(); 82 ruleComponent.update();
83 foundIndices.push(index); 83 foundIndices.push(index);
84 } else if(!rule.applied) { /// remove rule (unless unapplied) 84 } else if(!ruleComponent.applied) { /// remove rule (unless unapplied)
85 this.rulesToRemove.push(ruleComponent); 85 this.rulesToRemove.push(ruleComponent);
86 } 86 }
87 }, this); 87 }, this);