aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-09 13:23:32 -0700
committerValerio Virgillito2012-05-09 13:23:32 -0700
commit632a53278826a33506b302b573ee0681840f2d6c (patch)
tree079de6c5f3342f96b04685f59a436cd625f9b374 /js/controllers
parent622ce143d92988aa613a0a5b6399efb54facafba (diff)
parentd1daa169fde0647e4e4c2c65b7b01acaa842b199 (diff)
downloadninja-632a53278826a33506b302b573ee0681840f2d6c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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);