diff options
Diffstat (limited to 'js/vendor/jquery/src/css')
| -rw-r--r-- | js/vendor/jquery/src/css/curCSS.js | 13 | ||||
| -rw-r--r-- | js/vendor/jquery/src/css/var/getStyles.js | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/js/vendor/jquery/src/css/curCSS.js b/js/vendor/jquery/src/css/curCSS.js index be643ab54..084f8c7bd 100644 --- a/js/vendor/jquery/src/css/curCSS.js +++ b/js/vendor/jquery/src/css/curCSS.js @@ -12,15 +12,18 @@ function curCSS( elem, name, computed ) { style = elem.style; computed = computed || getStyles( elem ); + ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined; + + // Support: Opera 12.1x only + // Fall back to style even without computed + // computed is undefined for elems on document fragments + if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) { + ret = jQuery.style( elem, name ); + } // Support: IE9 // getPropertyValue is only needed for .css('filter') (#12537) if ( computed ) { - ret = computed.getPropertyValue( name ) || computed[ name ]; - - if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { - ret = jQuery.style( elem, name ); - } // A tribute to the "awesome hack by Dean Edwards" // Android Browser returns percentage for some values, diff --git a/js/vendor/jquery/src/css/var/getStyles.js b/js/vendor/jquery/src/css/var/getStyles.js index 1fa915d58..02a4b8194 100644 --- a/js/vendor/jquery/src/css/var/getStyles.js +++ b/js/vendor/jquery/src/css/var/getStyles.js @@ -6,7 +6,7 @@ define( function() { // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" var view = elem.ownerDocument.defaultView; - if ( !view.opener ) { + if ( !view || !view.opener ) { view = window; } |