aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOleg Gaidarenko <markelog@gmail.com>2015-11-13 16:27:18 +0300
committerOleg Gaidarenko <markelog@gmail.com>2015-11-13 20:04:19 +0300
commitc7e372b9fdf6c510ee0f9fb7cd78b892cbee27c9 (patch)
tree017caedb6310b41de67450bf70ed783c77c0d445 /src
parent7a7801975128839775fe4fce7785fa2b73fc2a70 (diff)
downloadjquery-c7e372b9fdf6c510ee0f9fb7cd78b892cbee27c9.tar.gz
jquery-c7e372b9fdf6c510ee0f9fb7cd78b892cbee27c9.zip
Revert "Core: Remove deprecated context and selector properties"
This reverts commit 0ea8c32863af31fb5cfc184e8d513bbae35583e8.
Diffstat (limited to 'src')
-rw-r--r--src/core.js4
-rw-r--r--src/core/init.js12
-rw-r--r--src/traversing/findFilter.js5
3 files changed, 18 insertions, 3 deletions
diff --git a/src/core.js b/src/core.js
index 771a30f80..72f4de2a0 100644
--- a/src/core.js
+++ b/src/core.js
@@ -42,6 +42,9 @@ jQuery.fn = jQuery.prototype = {
constructor: jQuery,
+ // Start with an empty selector
+ selector: "",
+
// The default length of a jQuery object is 0
length: 0,
@@ -70,6 +73,7 @@ jQuery.fn = jQuery.prototype = {
// Add the old object onto the stack (as a reference)
ret.prevObject = this;
+ ret.context = this.context;
// Return the newly-formed element set
return ret;
diff --git a/src/core/init.js b/src/core/init.js
index a00d58791..915d992b3 100644
--- a/src/core/init.js
+++ b/src/core/init.js
@@ -79,9 +79,12 @@ var rootjQuery,
if ( elem ) {
// Inject the element directly into the jQuery object
- this[ 0 ] = elem;
this.length = 1;
+ this[0] = elem;
}
+
+ this.context = document;
+ this.selector = selector;
return this;
}
@@ -97,7 +100,7 @@ var rootjQuery,
// HANDLE: $(DOMElement)
} else if ( selector.nodeType ) {
- this[ 0 ] = selector;
+ this.context = this[0] = selector;
this.length = 1;
return this;
@@ -111,6 +114,11 @@ var rootjQuery,
selector( jQuery );
}
+ if ( selector.selector !== undefined ) {
+ this.selector = selector.selector;
+ this.context = selector.context;
+ }
+
return jQuery.makeArray( selector, this );
};
diff --git a/src/traversing/findFilter.js b/src/traversing/findFilter.js
index ee76a57a7..7d4b2cab9 100644
--- a/src/traversing/findFilter.js
+++ b/src/traversing/findFilter.js
@@ -72,7 +72,10 @@ jQuery.fn.extend( {
jQuery.find( selector, self[ i ], ret );
}
- return this.pushStack( len > 1 ? jQuery.uniqueSort( ret ) : ret );
+ // Needed because $( selector, context ) becomes $( context ).find( selector )
+ ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+ ret.selector = this.selector ? this.selector + " " + selector : selector;
+ return ret;
},
filter: function( selector ) {
return this.pushStack( winnow( this, selector || [], false ) );