aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-09 13:15:48 -0700
committerValerio Virgillito2012-05-09 13:15:48 -0700
commitd1daa169fde0647e4e4c2c65b7b01acaa842b199 (patch)
tree4fe0a98352e669edf878cb3f34833b8278264190 /js/controllers
parent4d9832acbd78f82a63fba59187bd82a5afad8240 (diff)
parentc23e9b12c42c180cdeda76be67ae3a27833efc36 (diff)
downloadninja-d1daa169fde0647e4e4c2c65b7b01acaa842b199.tar.gz
Merge pull request #185 from ericguzman/StylesControllerPatch
Styles Controller - Fix error when trying dispatch stylesheet change eve...
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);