From 8bc7bdebefb23ef31247dda50012ee19ce9f58af Mon Sep 17 00:00:00 2001 From: Nguyen Phuc Lam Date: Tue, 26 Feb 2013 22:55:36 -0500 Subject: [PATCH] Ref #13283, move .andSelf() to deprecated.js. Close gh-1170. --- AUTHORS.txt | 1 + src/deprecated.js | 2 ++ src/traversing.js | 2 -- test/unit/effects.js | 2 +- test/unit/event.js | 2 +- test/unit/queue.js | 2 +- test/unit/traversing.js | 4 ++-- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index cdd78792d..bf0db66da 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -161,3 +161,4 @@ Danil Somsikov Jean Boussier Adam Coulombe Andrew Plummer +Nguyen Phuc Lam diff --git a/src/deprecated.js b/src/deprecated.js index 423385a91..722edb006 100644 --- a/src/deprecated.js +++ b/src/deprecated.js @@ -1,4 +1,6 @@ // Limit scope pollution from any deprecated API // (function() { +jQuery.fn.andSelf = jQuery.fn.addBack; + // })(); diff --git a/src/traversing.js b/src/traversing.js index 615de1f8a..f279dabf4 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -136,8 +136,6 @@ jQuery.fn.extend({ } }); -jQuery.fn.andSelf = jQuery.fn.addBack; - function sibling( cur, dir ) { while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} diff --git a/test/unit/effects.js b/test/unit/effects.js index 791e28bcf..e6c416198 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1557,7 +1557,7 @@ asyncTest( "hide, fadeOut and slideUp called on element width height and width = }); asyncTest( "Handle queue:false promises", 10, function() { - var foo = jQuery( "#foo" ).clone().andSelf(), + var foo = jQuery( "#foo" ).clone().addBack(), step = 1; foo.animate({ diff --git a/test/unit/event.js b/test/unit/event.js index 97c29ffef..e2aa6f93c 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -43,7 +43,7 @@ test("Handler changes and .trigger() order", function() { path = ""; markup - .find( "*" ).andSelf().on( "click", function( e ) { + .find( "*" ).addBack().on( "click", function( e ) { path += this.nodeName.toLowerCase() + " "; }) .filter( "b" ).on( "click", function( e ) { diff --git a/test/unit/queue.js b/test/unit/queue.js index 9cecad7a5..e19274039 100644 --- a/test/unit/queue.js +++ b/test/unit/queue.js @@ -184,7 +184,7 @@ test("clearQueue() clears the fx queue", function() { }); asyncTest( "fn.promise() - called when fx queue is empty", 3, function() { - var foo = jQuery( "#foo" ).clone().andSelf(), + var foo = jQuery( "#foo" ).clone().addBack(), promised = false; foo.queue( function( next ) { diff --git a/test/unit/traversing.js b/test/unit/traversing.js index 48560dbf6..9d8c0d20d 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -10,7 +10,7 @@ test( "find(String) under non-elements", function() { var j = jQuery("#nonnodes").contents(); equal( j.find("div").length, 0, "Check node,textnode,comment to find zero divs" ); - equal( j.find("div").andSelf().length, 3, "Check node,textnode,comment to find zero divs, but preserves pushStack" ); + equal( j.find("div").addBack().length, 3, "Check node,textnode,comment to find zero divs, but preserves pushStack" ); }); test( "find(leading combinator)", function() { @@ -45,7 +45,7 @@ test( "find(node|jQuery object)", function() { equal( $two.find( $first ).length, 0, "first is in the collection and not within two" ); equal( $two.find( $first ).length, 0, "first is in the collection and not within two(node)" ); - equal( $two.find( $foo[ 0 ] ).andSelf().length, 2, "find preserves the pushStack, see #12009" ); + equal( $two.find( $foo[ 0 ] ).addBack().length, 2, "find preserves the pushStack, see #12009" ); }); test("is(String|undefined)", function() { -- 2.39.5