diff options
author | Ananya Sen | 2012-02-10 16:03:52 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-10 16:03:52 -0800 |
commit | c48eeb01bd726895dc577d8b843b2a75883eee07 (patch) | |
tree | 5945556f80723285396059aaecb523e27b1cbb0d /js/controllers/styles-controller.js | |
parent | c627ebb5735d55218813b073c655dae6cded6040 (diff) | |
download | ninja-c48eeb01bd726895dc577d8b843b2a75883eee07.tar.gz |
Merge from /joseeight/ninja-internal/tree/FileIO
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-x | js/controllers/styles-controller.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 011caec5..44e0e798 100755 --- 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 |