Skip to content
Permalink
Browse files

Removed all deprecated functionality for jQuery 1.2. A full list of w…

  • Loading branch information
jeresig committed Sep 4, 2007
1 parent 139393f commit 53dc6afc310aa0e5df094304996ef605d4dbbd58
Showing with 85 additions and 180 deletions.
  1. +5 −27 src/ajax/ajax.js
  2. +10 −17 src/ajax/ajaxTest.js
  3. +18 −25 src/jquery/coreTest.js
  4. +9 −19 src/jquery/jquery.js
  5. +20 −46 src/selector/selector.js
  6. +23 −46 src/selector/selectorTest.js
@@ -1,10 +1,5 @@
jQuery.fn.extend({
// DEPRECATED
loadIfModified: function( url, params, callback ) {
this.load( url, params, callback, 1 );
},

load: function( url, params, callback, ifModified ) {
load: function( url, params, callback ) {
if ( jQuery.isFunction( url ) )
return this.bind("load", url);

@@ -40,10 +35,9 @@ jQuery.fn.extend({
url: url,
type: type,
data: params,
ifModified: ifModified,
complete: function(res, status){
// If successful, inject the HTML into all the matched elements
if ( status == "success" || !ifModified && status == "notmodified" )
if ( status == "success" || status == "notmodified" )
// See if a selector was specified
self.html( selector ?
// Create a dummy div to hold the results
@@ -69,12 +63,7 @@ jQuery.fn.extend({

serialize: function() {
return jQuery.param( this );
},

// DEPRECATED
// This method no longer does anything - all script evaluation is
// taken care of within the HTML injection methods.
evalScripts: function(){}
}

});

@@ -88,7 +77,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
var jsc = (new Date).getTime();

jQuery.extend({
get: function( url, data, callback, type, ifModified ) {
get: function( url, data, callback, type ) {
// shift arguments if data argument was ommited
if ( jQuery.isFunction( data ) ) {
callback = data;
@@ -100,16 +89,10 @@ jQuery.extend({
url: url,
data: data,
success: callback,
dataType: type,
ifModified: ifModified
dataType: type
});
},

// DEPRECATED
getIfModified: function( url, data, callback, type ) {
return jQuery.get(url, data, callback, type, 1);
},

getScript: function( url, callback ) {
return jQuery.get(url, null, callback, "script");
},
@@ -133,11 +116,6 @@ jQuery.extend({
});
},

// DEPRECATED
ajaxTimeout: function( timeout ) {
jQuery.ajaxSettings.timeout = timeout;
},

ajaxSetup: function( settings ) {
jQuery.extend( jQuery.ajaxSettings, settings );
},
@@ -144,7 +144,7 @@ test("$.ajax - dataType html", function() {

foobar = null;
testFoo = undefined;

var verifyEvaluation = function() {
ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
ok( foobar == "bar", 'Check if script src was evaluated for datatype html' );
@@ -211,7 +211,6 @@ test("pass-through request object", function() {

/* Test disabled, too many simultaneous requests
ok( $.get(url(target), success), "get" );
ok( $.getIfModified(url(target), success), "getIfModified" );
ok( $.post(url(target), success), "post" );
ok( $.getScript(url("data/test.js"), success), "script" );
ok( $.getJSON(url("data/json_obj.js"), success), "json" );
@@ -312,15 +311,6 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
});
});

test("$.getIfModified(String, Hash, Function)", function() {
expect(1);
stop();
$.getIfModified(url("data/name.html"), function(msg) {
ok( /^ERROR/.test(msg), 'Check ifModified' );
start();
});
});

test("$.getScript(String, Function) - with callback", function() {
expect(2);
stop();
@@ -517,12 +507,12 @@ test("$.post(String, Hash, Function) - simple with xml", function() {
});
});

test("$.ajaxTimeout(Number) - with global timeout", function() {
test("$.ajaxSetup({timeout: Number}) - with global timeout", function() {
stop();

var passed = 0;

$.ajaxTimeout(1000);
$.ajaxSetup({timeout: 1000});

var pass = function() {
passed++;
@@ -548,11 +538,13 @@ test("$.ajaxTimeout(Number) - with global timeout", function() {
});

// reset timeout
$.ajaxTimeout(0);
$.ajaxSetup({timeout: 0});
});

test("$.ajaxTimeout(Number) with localtimeout", function() {
stop(); $.ajaxTimeout(50);
test("$.ajaxSetup({timeout: Number}) with localtimeout", function() {
stop();
$.ajaxSetup({timeout: 50});

$.ajax({
type: "GET",
timeout: 5000,
@@ -566,8 +558,9 @@ test("$.ajaxTimeout(Number) with localtimeout", function() {
start();
}
});

// reset timeout
$.ajaxTimeout(0);
$.ajaxSetup({timeout: 0});
});

test("$.ajax - simple get", function() {
@@ -713,28 +713,28 @@ test("is(String)", function() {
ok( !$('#mark').is('.link'), 'Check for class: Did not expect class "link"' );
ok( $('#simon').is('.blog.link'), 'Check for multiple classes: Expected classes "blog" and "link"' );
ok( !$('#simon').is('.blogTest'), 'Check for multiple classes: Expected classes "blog" and "link", but not "blogTest"' );
ok( $('#en').is('[@lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' );
ok( !$('#en').is('[@lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' );
ok( $('#text1').is('[@type="text"]'), 'Check for attribute: Expected attribute type to be "text"' );
ok( !$('#text1').is('[@type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' );
ok( $('#en').is('[lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' );
ok( !$('#en').is('[lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' );
ok( $('#text1').is('[type="text"]'), 'Check for attribute: Expected attribute type to be "text"' );
ok( !$('#text1').is('[type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' );
ok( $('#text2').is(':disabled'), 'Check for pseudoclass: Expected to be disabled' );
ok( !$('#text1').is(':disabled'), 'Check for pseudoclass: Expected not disabled' );
ok( $('#radio2').is(':checked'), 'Check for pseudoclass: Expected to be checked' );
ok( !$('#radio1').is(':checked'), 'Check for pseudoclass: Expected not checked' );
ok( $('#foo').is('[p]'), 'Check for child: Expected a child "p" element' );
ok( !$('#foo').is('[ul]'), 'Check for child: Did not expect "ul" element' );
ok( $('#foo').is('[p][a][code]'), 'Check for childs: Expected "p", "a" and "code" child elements' );
ok( !$('#foo').is('[p][a][code][ol]'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' );
ok( $('#foo').is(':has(p)'), 'Check for child: Expected a child "p" element' );
ok( !$('#foo').is(':has(ul)'), 'Check for child: Did not expect "ul" element' );
ok( $('#foo').is(':has(p):has(a):has(code)'), 'Check for childs: Expected "p", "a" and "code" child elements' );
ok( !$('#foo').is(':has(p):has(a):has(code):has(ol)'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' );
ok( !$('#foo').is(0), 'Expected false for an invalid expression - 0' );
ok( !$('#foo').is(null), 'Expected false for an invalid expression - null' );
ok( !$('#foo').is(''), 'Expected false for an invalid expression - ""' );
ok( !$('#foo').is(undefined), 'Expected false for an invalid expression - undefined' );

// test is() with comma-seperated expressions
ok( $('#en').is('[@lang="en"],[@lang="de"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[@lang="de"],[@lang="en"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[@lang="en"] , [@lang="de"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[@lang="de"] , [@lang="en"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[lang="en"],[lang="de"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[lang="de"],[lang="en"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[lang="en"] , [lang="de"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
ok( $('#en').is('[lang="de"] , [lang="en"]'), 'Comma-seperated; Check for lang attribute: Expect en or de' );
});

test("$.extend(Object, Object)", function() {
@@ -823,16 +823,16 @@ test("not()", function() {
test("siblings([String])", function() {
expect(5);
isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" );
isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
isSet( $("#sndp").siblings(":has(code)").get(), q("sap"), "Check for filtered siblings (has code child element)" );
isSet( $("#sndp").siblings(":has(a)").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
isSet( $("#foo").siblings("form, b").get(), q("form", "lengthtest", "floatTest"), "Check for multiple filters" );
isSet( $("#en, #sndp").siblings().get(), q("sndp", "sap", "en"), "Check for unique results from siblings" );
});

test("children([String])", function() {
expect(3);
isSet( $("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" );
isSet( $("#foo").children("[code]").get(), q("sndp", "sap"), "Check for filtered children" );
isSet( $("#foo").children(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" );
isSet( $("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" );
});

@@ -991,14 +991,6 @@ test("empty()", function() {
ok( $("#ap").children().length == 4, "Check elements are not removed" );
});

test("eq(), gt(), lt(), contains()", function() {
expect(4);
ok( $("#ap a").eq(1)[0].id == "groups", "eq()" );
isSet( $("#ap a").gt(0).get(), q("groups", "anchor1", "mark"), "gt()" );
isSet( $("#ap a").lt(3).get(), q("google", "groups", "anchor1"), "lt()" );
isSet( $("#foo a").contains("log").get(), q("anchor2", "simon"), "contains()" );
});

test("slice()", function() {
expect(4);
isSet( $("#ap a").slice(1,2), q("groups"), "slice(1,2)" );
@@ -1028,8 +1020,9 @@ test("map()", function() {
});

test("contents()", function() {
expect(3);
expect(2);
equals( $("#ap").contents().length, 9, "Check element contents" );
ok( $("#iframe").contents()[0], "Check existance of IFrame document" );
ok( $("#iframe").contents()[0].body, "Check existance of IFrame body" );
// Disabled, randomly fails
//ok( $("#iframe").contents()[0].body, "Check existance of IFrame body" );
});
@@ -228,8 +228,7 @@ jQuery.fn = jQuery.prototype = {
jQuery.unique( data ) : data );
},

clone: function(deep) {
deep = deep != undefined ? deep : true;
clone: function() {
var $this = this.add(this.find("*"));
if (jQuery.browser.msie) {
// Need to remove events on the element and its descendants
@@ -242,7 +241,7 @@ jQuery.fn = jQuery.prototype = {

// Do the clone
var r = this.pushStack( jQuery.map( this, function(a){
return a.cloneNode( deep );
return a.cloneNode( true );
}) );

if (jQuery.browser.msie) {
@@ -257,15 +256,13 @@ jQuery.fn = jQuery.prototype = {
}

// copy form values over
if (deep) {
var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]');
$this.filter('select,input[@type=checkbox]').each(function(i) {
if (this.selectedIndex)
inputs[i].selectedIndex = this.selectedIndex;
if (this.checked)
inputs[i].checked = true;
});
}
var inputs = r.add(r.find('*')).filter('select,input[@type=checkbox]');
$this.filter('select,input[@type=checkbox]').each(function(i) {
if (this.selectedIndex)
inputs[i].selectedIndex = this.selectedIndex;
if (this.checked)
inputs[i].checked = true;
});

// Return the cloned set
return r;
@@ -955,13 +952,6 @@ jQuery.each( {
};
});

// DEPRECATED
jQuery.each( [ "eq", "lt", "gt", "contains" ], function(i,n){
jQuery.fn[ n ] = function(num,fn) {
return this.filter( ":" + n + "(" + num + ")", fn );
};
});

jQuery.each( [ "height", "width" ], function(i,n){
jQuery.fn[ n ] = function(h) {
return h == undefined ?

0 comments on commit 53dc6af

Please sign in to comment.
You can’t perform that action at this time.