diff options
Diffstat (limited to 'js/vendor/jquery/src/css')
| -rw-r--r-- | js/vendor/jquery/src/css/addGetHookIf.js | 6 | ||||
| -rw-r--r-- | js/vendor/jquery/src/css/curCSS.js | 2 | ||||
| -rw-r--r-- | js/vendor/jquery/src/css/defaultDisplay.js | 2 | ||||
| -rw-r--r-- | js/vendor/jquery/src/css/support.js | 5 | ||||
| -rw-r--r-- | js/vendor/jquery/src/css/var/getStyles.js | 9 |
5 files changed, 17 insertions, 7 deletions
diff --git a/js/vendor/jquery/src/css/addGetHookIf.js b/js/vendor/jquery/src/css/addGetHookIf.js index 81d694cb0..e12f3598d 100644 --- a/js/vendor/jquery/src/css/addGetHookIf.js +++ b/js/vendor/jquery/src/css/addGetHookIf.js @@ -5,15 +5,13 @@ function addGetHookIf( conditionFn, hookFn ) { return { get: function() { if ( conditionFn() ) { - // Hook not needed (or it's not possible to use it due to missing dependency), - // remove it. - // Since there are no other hooks for marginRight, remove the whole object. + // Hook not needed (or it's not possible to use it due + // to missing dependency), remove it. delete this.get; return; } // Hook needed; redefine it so that the support test is not executed again. - return (this.get = hookFn).apply( this, arguments ); } }; diff --git a/js/vendor/jquery/src/css/curCSS.js b/js/vendor/jquery/src/css/curCSS.js index abcc8cb7f..90e508cb8 100644 --- a/js/vendor/jquery/src/css/curCSS.js +++ b/js/vendor/jquery/src/css/curCSS.js @@ -13,7 +13,7 @@ function curCSS( elem, name, computed ) { computed = computed || getStyles( elem ); // Support: IE9 - // getPropertyValue is only needed for .css('filter') in IE9, see #12537 + // getPropertyValue is only needed for .css('filter') (#12537) if ( computed ) { ret = computed.getPropertyValue( name ) || computed[ name ]; } diff --git a/js/vendor/jquery/src/css/defaultDisplay.js b/js/vendor/jquery/src/css/defaultDisplay.js index 631b9ba8a..046ae91b9 100644 --- a/js/vendor/jquery/src/css/defaultDisplay.js +++ b/js/vendor/jquery/src/css/defaultDisplay.js @@ -19,7 +19,7 @@ function actualDisplay( name, doc ) { // getDefaultComputedStyle might be reliably used only on attached element display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? - // Use of this method is a temporary fix (more like optmization) until something better comes along, + // Use of this method is a temporary fix (more like optimization) until something better comes along, // since it was removed from specification and supported only in FF style.display : jQuery.css( elem[ 0 ], "display" ); diff --git a/js/vendor/jquery/src/css/support.js b/js/vendor/jquery/src/css/support.js index 4a4d75c44..b9eaf1402 100644 --- a/js/vendor/jquery/src/css/support.js +++ b/js/vendor/jquery/src/css/support.js @@ -13,6 +13,8 @@ define([ return; } + // Support: IE9-11+ + // Style of cloned element affects source element cloned (#8908) div.style.backgroundClip = "content-box"; div.cloneNode( true ).style.backgroundClip = ""; support.clearCloneStyle = div.style.backgroundClip === "content-box"; @@ -45,6 +47,7 @@ define([ if ( window.getComputedStyle ) { jQuery.extend( support, { pixelPosition: function() { + // This test is executed only once but we still do memoizing // since we can use the boxSizingReliable pre-computing. // No need to check if the test was already performed, though. @@ -58,6 +61,7 @@ define([ return boxSizingReliableVal; }, reliableMarginRight: function() { + // Support: Android 2.3 // Check if div with explicit width and no margin-right incorrectly // gets computed margin-right based on width of container. (#3333) @@ -79,6 +83,7 @@ define([ ret = !parseFloat( window.getComputedStyle( marginDiv, null ).marginRight ); docElem.removeChild( container ); + div.removeChild( marginDiv ); return ret; } diff --git a/js/vendor/jquery/src/css/var/getStyles.js b/js/vendor/jquery/src/css/var/getStyles.js index 26cc0a25e..413acd04a 100644 --- a/js/vendor/jquery/src/css/var/getStyles.js +++ b/js/vendor/jquery/src/css/var/getStyles.js @@ -1,5 +1,12 @@ define(function() { return function( elem ) { - return elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + // Support: IE<=11+, Firefox<=30+ (#15098, #14150) + // IE throws on elements created in popups + // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" + if ( elem.ownerDocument.defaultView.opener ) { + return elem.ownerDocument.defaultView.getComputedStyle( elem, null ); + } + + return window.getComputedStyle( elem, null ); }; }); |