Skip to content

Commit b387979

Browse files
committed
Update to 1.12.1
1 parent 8bb8fbe commit b387979

File tree

6 files changed

+26
-27
lines changed

6 files changed

+26
-27
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery",
3-
"version": "1.12.0",
3+
"version": "1.12.1",
44
"description": "jQuery component",
55
"keywords": [
66
"jquery",

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery",
33
"repo": "components/jquery",
4-
"version": "1.12.0",
4+
"version": "1.12.1",
55
"description": "jQuery component",
66
"keywords": [
77
"jquery",

jquery.js

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v1.12.0
2+
* jQuery JavaScript Library v1.12.1
33
* http://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* http://jquery.org/license
1111
*
12-
* Date: 2016-01-08T19:56Z
12+
* Date: 2016-02-22T19:07Z
1313
*/
1414

1515
(function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
6565

6666

6767
var
68-
version = "1.12.0",
68+
version = "1.12.1",
6969

7070
// Define a local copy of jQuery
7171
jQuery = function( selector, context ) {
@@ -3625,11 +3625,10 @@ jQuery.ready.promise = function( obj ) {
36253625

36263626
// Catch cases where $(document).ready() is called
36273627
// after the browser event has already occurred.
3628-
// we once tried to use readyState "interactive" here,
3629-
// but it caused issues like the one
3630-
// discovered by ChrisS here:
3631-
// http://bugs.jquery.com/ticket/12282#comment:15
3632-
if ( document.readyState === "complete" ) {
3628+
// Support: IE6-10
3629+
// Older IE sometimes signals "interactive" too soon
3630+
if ( document.readyState === "complete" ||
3631+
( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
36333632

36343633
// Handle it asynchronously to allow scripts the opportunity to delay ready
36353634
window.setTimeout( jQuery.ready );
@@ -6701,7 +6700,7 @@ if ( window.getComputedStyle ) {
67016700
// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
67026701
var view = elem.ownerDocument.defaultView;
67036702

6704-
if ( !view.opener ) {
6703+
if ( !view || !view.opener ) {
67056704
view = window;
67066705
}
67076706

@@ -6717,11 +6716,14 @@ if ( window.getComputedStyle ) {
67176716
// getPropertyValue is only needed for .css('filter') in IE9, see #12537
67186717
ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
67196718

6720-
if ( computed ) {
6719+
// Support: Opera 12.1x only
6720+
// Fall back to style even without computed
6721+
// computed is undefined for elems on document fragments
6722+
if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) {
6723+
ret = jQuery.style( elem, name );
6724+
}
67216725

6722-
if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
6723-
ret = jQuery.style( elem, name );
6724-
}
6726+
if ( computed ) {
67256727

67266728
// A tribute to the "awesome hack by Dean Edwards"
67276729
// Chrome < 17 and Safari 5.0 uses "computed value"
@@ -10818,11 +10820,8 @@ jQuery.fn.extend( {
1081810820
}
1081910821

1082010822
// Add offsetParent borders
10821-
// Subtract offsetParent scroll positions
10822-
parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true ) -
10823-
offsetParent.scrollTop();
10824-
parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true ) -
10825-
offsetParent.scrollLeft();
10823+
parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
10824+
parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
1082610825
}
1082710826

1082810827
// Subtract parent offsets and element margins

jquery.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jquery.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery",
33
"description": "JavaScript library for DOM operations",
4-
"version": "1.12.0",
4+
"version": "1.12.1",
55
"homepage": "http://jquery.com",
66
"author": {
77
"name": "jQuery Foundation and other contributors",

0 commit comments

Comments
 (0)