Skip to content

Commit 24375b6

Browse files
goffrievendethiel
authored andcommitted
Update to 1.10.1
1 parent 7f83939 commit 24375b6

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
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.10.0",
3+
"version": "1.10.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.10.0",
4+
"version": "1.10.1",
55
"description": "jQuery component",
66
"keywords": [
77
"jquery",

jquery.js

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v1.10.0
2+
* jQuery JavaScript Library v1.10.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: 2013-05-24T18:39Z
12+
* Date: 2013-05-30T21:49Z
1313
*/
1414
(function( window, undefined ) {
1515

@@ -46,7 +46,7 @@ var
4646
// List of deleted data cache ids, so we can reuse them
4747
core_deletedIds = [],
4848

49-
core_version = "1.10.0",
49+
core_version = "1.10.1",
5050

5151
// Save a reference to some core methods
5252
core_concat = core_deletedIds.concat,
@@ -1007,7 +1007,7 @@ rootjQuery = jQuery(document);
10071007
* Released under the MIT license
10081008
* http://jquery.org/license
10091009
*
1010-
* Date: 2013-05-15
1010+
* Date: 2013-05-27
10111011
*/
10121012
(function( window, undefined ) {
10131013

@@ -1492,7 +1492,8 @@ support = Sizzle.support = {};
14921492
* @returns {Object} Returns the current document
14931493
*/
14941494
setDocument = Sizzle.setDocument = function( node ) {
1495-
var doc = node ? node.ownerDocument || node : preferredDoc;
1495+
var doc = node ? node.ownerDocument || node : preferredDoc,
1496+
parent = doc.parentWindow;
14961497

14971498
// If no document and documentElement is available, return
14981499
if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
@@ -1506,6 +1507,15 @@ setDocument = Sizzle.setDocument = function( node ) {
15061507
// Support tests
15071508
documentIsHTML = !isXML( doc );
15081509

1510+
// Support: IE>8
1511+
// If iframe document is assigned to "document" variable and if iframe has been reloaded,
1512+
// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
1513+
if ( parent && parent.frameElement ) {
1514+
parent.attachEvent( "onbeforeunload", function() {
1515+
setDocument();
1516+
});
1517+
}
1518+
15091519
/* Attributes
15101520
---------------------------------------------------------------------- */
15111521

@@ -3951,7 +3961,6 @@ jQuery.extend({
39513961
startLength--;
39523962
}
39533963

3954-
hooks.cur = fn;
39553964
if ( fn ) {
39563965

39573966
// Add a progress sentinel to prevent the fx queue from being
@@ -8864,8 +8873,8 @@ var fxNow, timerId,
88648873

88658874
// Update tween properties
88668875
if ( parts ) {
8876+
start = tween.start = +start || +target || 0;
88678877
tween.unit = unit;
8868-
tween.start = +start || +target || 0;
88698878
// If a +=/-= token was provided, we're doing a relative animation
88708879
tween.end = parts[ 1 ] ?
88718880
start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
@@ -9312,9 +9321,7 @@ jQuery.fn.extend({
93129321
doAnimation = function() {
93139322
// Operate on a copy of prop so per-property easing won't be lost
93149323
var anim = Animation( this, jQuery.extend( {}, prop ), optall );
9315-
doAnimation.finish = function() {
9316-
anim.stop( true );
9317-
};
9324+
93189325
// Empty animations, or finishing resolves immediately
93199326
if ( empty || jQuery._data( this, "finish" ) ) {
93209327
anim.stop( true );
@@ -9394,8 +9401,8 @@ jQuery.fn.extend({
93949401
// empty the queue first
93959402
jQuery.queue( this, type, [] );
93969403

9397-
if ( hooks && hooks.cur && hooks.cur.finish ) {
9398-
hooks.cur.finish.call( this );
9404+
if ( hooks && hooks.stop ) {
9405+
hooks.stop.call( this, true );
93999406
}
94009407

94019408
// look for any active animations, and finish them
@@ -9775,7 +9782,7 @@ jQuery.fn.size = function() {
97759782
jQuery.fn.andSelf = jQuery.fn.addBack;
97769783

97779784
// })();
9778-
if ( typeof module === "object" && typeof module.exports === "object" ) {
9785+
if ( typeof module === "object" && module && typeof module.exports === "object" ) {
97799786
// Expose jQuery as module.exports in loaders that implement the Node
97809787
// module pattern (including browserify). Do not create the global, since
97819788
// the user will be storing it themselves locally, and globals are frowned
@@ -9797,4 +9804,4 @@ if ( typeof module === "object" && typeof module.exports === "object" ) {
97979804
}
97989805
}
97999806

9800-
})( window );
9807+
})( window );

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.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "components-jquery",
3-
"version": "1.10.0",
3+
"version": "1.10.1",
44
"description": "jQuery component",
55
"keywords": ["jquery"],
66
"main": "./jquery.js"

0 commit comments

Comments
 (0)