Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch

Conflicts:
	js/helper-classes/RDGE/Materials/FlatMaterial.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

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, {
             rule = stylesheet.rules[index];
             
             ///// attach specificity to rule object
+            // if rule is css keyframes, return rule and don't attach specificity
+            if (rule instanceof WebKitCSSKeyframesRule) {
+                return rule;
+            }
             rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
             
             ///// return the rule we just inserted