aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-10 15:48:51 -0700
committerNivesh Rajbhandari2012-05-10 15:48:51 -0700
commit0467a1cf331c067b21bf5d6acfe47ec9edc2e41c (patch)
treeae6122570b41879b5fa434c970592fe1deb23a2e /js/controllers
parent78b3363a1ef802e95a158b5a3584305f84def09c (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-0467a1cf331c067b21bf5d6acfe47ec9edc2e41c.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/styles-controller.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 647c0870..2ff3e235 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -795,7 +795,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
795 ///// method to apply/test the new value 795 ///// method to apply/test the new value
796 dec.setProperty(property, value, priority); 796 dec.setProperty(property, value, priority);
797 797
798 this.styleSheetModified(rule.parentStyleSheet); 798 if(rule.parentStyleSheet) {
799 this.styleSheetModified(rule.parentStyleSheet);
800 }
799 801
800 ///// Return browser value for value we just set 802 ///// Return browser value for value we just set
801 return dec.getPropertyValue(property); 803 return dec.getPropertyValue(property);