diff options
author | hwc487 | 2012-05-08 15:54:15 -0700 |
---|---|---|
committer | hwc487 | 2012-05-08 15:54:15 -0700 |
commit | 7af54816bb6311421f976661d07b7776d5cd37c9 (patch) | |
tree | fd5b734778b01a9c938b0094b8dd7291f6648d3d /js/controllers/styles-controller.js | |
parent | 91a9e02bff0397ec9b1f55fdf61cef72eb0d8a0f (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-7af54816bb6311421f976661d07b7776d5cd37c9.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
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 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; |