aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-08 11:09:27 -0700
committerValerio Virgillito2012-05-08 11:09:27 -0700
commit53747ce689ddcdc19e586b30d6f356b3b0539731 (patch)
treef3692860db5938bc70a3c980652e176c4a13b65d /js/controllers/styles-controller.js
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
parent157632ce32b4e71e1f08278cf712ff4f2c835226 (diff)
downloadninja-53747ce689ddcdc19e586b30d6f356b3b0539731.tar.gz
Merge pull request #197 from ananyasen/code-editor-patch
Patch to fix code editor issue with latest montage
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-xjs/controllers/styles-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index ec4314f9..647c0870 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -1102,7 +1102,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
1102 ///// The dominant rule might not have the style property defined - why? 1102 ///// The dominant rule might not have the style property defined - why?
1103 ///// If no rules have the property defined, we can use the 1103 ///// If no rules have the property defined, we can use the
1104 ///// most-specific single-target rule as the dominant rule (for setting styles) 1104 ///// most-specific single-target rule as the dominant rule (for setting styles)
1105 return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property); 1105 return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null);
1106 } 1106 }
1107 1107
1108 return value; 1108 return value;