aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-10 15:14:35 -0800
committerNivesh Rajbhandari2012-02-10 15:14:35 -0800
commitde65f73c0f129a26aa9007b69e8fce31d0e92d00 (patch)
treee0fd4bbc44b96909d7619593b29d9b063209a7ce /js/controllers
parent9e40945a5bf4330d1088b56b8011ee625b1adab9 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-de65f73c0f129a26aa9007b69e8fce31d0e92d00.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/controllers')
-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