diff options
author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
tree | c702d67585f72cddf55932411e7100133bc58452 /js/controllers/styles-controller.js | |
parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-x | js/controllers/styles-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 02c3dad9..cbc00676 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -1131,7 +1131,7 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1131 | ///// The dominant rule might not have the style property defined - why? | 1131 | ///// The dominant rule might not have the style property defined - why? |
1132 | ///// If no rules have the property defined, we can use the | 1132 | ///// If no rules have the property defined, we can use the |
1133 | ///// most-specific single-target rule as the dominant rule (for setting styles) | 1133 | ///// most-specific single-target rule as the dominant rule (for setting styles) |
1134 | return element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property); | 1134 | return (element.ownerDocument.defaultView ? element.ownerDocument.defaultView.getComputedStyle(element).getPropertyValue(property) : null); |
1135 | } | 1135 | } |
1136 | 1136 | ||
1137 | return value; | 1137 | return value; |