aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-11 22:33:26 -0800
committerJose Antonio Marquez2012-02-11 22:33:26 -0800
commitc6ed3331e88eb01a52ac533e5449df3af2fb5965 (patch)
tree2b660dc94a98bad02b46ba44a28424d692435fb3 /js/controllers/styles-controller.js
parent5d38e575b2bafeae9bd676247fce15ec5f78fa32 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-c6ed3331e88eb01a52ac533e5449df3af2fb5965.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/controllers/styles-controller.js')
-rw-r--r--js/controllers/styles-controller.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 011caec5..44e0e798 100644
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -181,6 +181,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
181 rule = stylesheet.rules[index]; 181 rule = stylesheet.rules[index];
182 182
183 ///// attach specificity to rule object 183 ///// attach specificity to rule object
184 // if rule is css keyframes, return rule and don't attach specificity
185 if (rule instanceof WebKitCSSKeyframesRule) {
186 return rule;
187 }
184 rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText); 188 rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
185 189
186 ///// return the rule we just inserted 190 ///// return the rule we just inserted