Repository: tapestry-5 Updated Branches: refs/heads/master 1c2a1ed14 -> 10f1f8d0f
TAP5-2527: Upgrade jQuery to 1.12.1 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/10f1f8d0 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/10f1f8d0 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/10f1f8d0 Branch: refs/heads/master Commit: 10f1f8d0f527036af95eb90e794252289c7a40b8 Parents: 1c2a1ed Author: Jochen Kemnade <[email protected]> Authored: Wed Feb 24 15:33:17 2016 +0100 Committer: Jochen Kemnade <[email protected]> Committed: Wed Feb 24 15:33:17 2016 +0100 ---------------------------------------------------------------------- .../META-INF/assets/tapestry5/jquery.js | 35 ++++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/10f1f8d0/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery.js index 4855adc..d888910 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/jquery.js @@ -1,5 +1,5 @@ /*! - * jQuery JavaScript Library v1.12.0 + * jQuery JavaScript Library v1.12.1 * http://jquery.com/ * * Includes Sizzle.js @@ -9,7 +9,7 @@ * Released under the MIT license * http://jquery.org/license * - * Date: 2016-01-08T19:56Z + * Date: 2016-02-22T19:07Z */ (function( global, factory ) { @@ -65,7 +65,7 @@ var support = {}; var - version = "1.12.0", + version = "1.12.1", // Define a local copy of jQuery jQuery = function( selector, context ) { @@ -3625,11 +3625,10 @@ jQuery.ready.promise = function( obj ) { // Catch cases where $(document).ready() is called // after the browser event has already occurred. - // we once tried to use readyState "interactive" here, - // but it caused issues like the one - // discovered by ChrisS here: - // http://bugs.jquery.com/ticket/12282#comment:15 - if ( document.readyState === "complete" ) { + // Support: IE6-10 + // Older IE sometimes signals "interactive" too soon + if ( document.readyState === "complete" || + ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { // Handle it asynchronously to allow scripts the opportunity to delay ready window.setTimeout( jQuery.ready ); @@ -6701,7 +6700,7 @@ if ( window.getComputedStyle ) { // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" var view = elem.ownerDocument.defaultView; - if ( !view.opener ) { + if ( !view || !view.opener ) { view = window; } @@ -6717,11 +6716,14 @@ if ( window.getComputedStyle ) { // getPropertyValue is only needed for .css('filter') in IE9, see #12537 ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined; - if ( computed ) { + // 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 ); + } - if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { - ret = jQuery.style( elem, name ); - } + if ( computed ) { // A tribute to the "awesome hack by Dean Edwards" // Chrome < 17 and Safari 5.0 uses "computed value" @@ -10818,11 +10820,8 @@ jQuery.fn.extend( { } // Add offsetParent borders - // Subtract offsetParent scroll positions - parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ) - - offsetParent.scrollTop(); - parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ) - - offsetParent.scrollLeft(); + parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ); + parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ); } // Subtract parent offsets and element margins
