Skip to content

J
jquery
Commit ac48a19b authored by jaubourg's avatar jaubourg
Browse files
Options

Some work to modularize ajax later on.

parent 5f35b3d9
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 84 deletions
src/manipulation.js
View file @ ac48a19b
...@@ -340,14 +340,14 @@ jQuery.fn.extend({ ...@@ -340,14 +340,14 @@ jQuery.fn.extend({
if ( scripts.length ) { if ( scripts.length ) {
jQuery.each( scripts, function( i, elem ) { jQuery.each( scripts, function( i, elem ) {
if ( elem.src ) { if ( elem.src ) {
jQuery.ajax({ jQuery.ajax ? jQuery.ajax({
url: elem.src, url: elem.src,
type: "GET", type: "GET",
dataType: "script", dataType: "script",
async: false, async: false,
global: false, global: false,
throws: true throws: true
}); }) : jQuery.error( "no ajax" );
} else { } else {
jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) ); jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) );
} }
......
test/data/testinit.js
View file @ ac48a19b
...@@ -132,7 +132,7 @@ function url( value ) { ...@@ -132,7 +132,7 @@ function url( value ) {
var oldCacheLength = 0, var oldCacheLength = 0,
oldFragmentsLength = 0, oldFragmentsLength = 0,
oldTimersLength = 0, oldTimersLength = 0,
oldActive = 0; oldActive = jQuery.active;
/** /**
* Ensures that tests have cleaned up properly after themselves. Should be passed as the * Ensures that tests have cleaned up properly after themselves. Should be passed as the
......
test/unit/ajax.js
View file @ ac48a19b
module("ajax", { teardown: moduleTeardown }); module("ajax", { teardown: moduleTeardown });
if ( !isLocal || hasPHP) { if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
test("jQuery.ajax() - success callbacks", function() { test("jQuery.ajax() - success callbacks", function() {
expect( 8 ); expect( 8 );
......
test/unit/attributes.js
View file @ ac48a19b
...@@ -683,7 +683,7 @@ test("removeProp(String)", function() { ...@@ -683,7 +683,7 @@ test("removeProp(String)", function() {
}); });
test("val()", function() { test("val()", function() {
expect(26); expect( 20 + ( jQuery.fn.serialize ? 6 : 0 ) );
document.getElementById("text1").value = "bla"; document.getElementById("text1").value = "bla";
equal( jQuery("#text1").val(), "bla", "Check for modified value of input element" ); equal( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
...@@ -726,25 +726,27 @@ test("val()", function() { ...@@ -726,25 +726,27 @@ test("val()", function() {
jQuery("#select5").val(3); jQuery("#select5").val(3);
equal( jQuery("#select5").val(), "3", "Check value on ambiguous select." ); equal( jQuery("#select5").val(), "3", "Check value on ambiguous select." );
var checks = jQuery("<input type='checkbox' name='test' value='1'/><input type='checkbox' name='test' value='2'/><input type='checkbox' name='test' value=''/><input type='checkbox' name='test'/>").appendTo("#form"); if ( jQuery.fn.serialize ) {
var checks = jQuery("<input type='checkbox' name='test' value='1'/><input type='checkbox' name='test' value='2'/><input type='checkbox' name='test' value=''/><input type='checkbox' name='test'/>").appendTo("#form");
deepEqual( checks.serialize(), "", "Get unchecked values." ); deepEqual( checks.serialize(), "", "Get unchecked values." );
equal( checks.eq(3).val(), "on", "Make sure a value of 'on' is provided if none is specified." ); equal( checks.eq(3).val(), "on", "Make sure a value of 'on' is provided if none is specified." );
checks.val([ "2" ]); checks.val([ "2" ]);
deepEqual( checks.serialize(), "test=2", "Get a single checked value." ); deepEqual( checks.serialize(), "test=2", "Get a single checked value." );
checks.val([ "1", "" ]); checks.val([ "1", "" ]);
deepEqual( checks.serialize(), "test=1&test=", "Get multiple checked values." ); deepEqual( checks.serialize(), "test=1&test=", "Get multiple checked values." );
checks.val([ "", "2" ]); checks.val([ "", "2" ]);
deepEqual( checks.serialize(), "test=2&test=", "Get multiple checked values." ); deepEqual( checks.serialize(), "test=2&test=", "Get multiple checked values." );
checks.val([ "1", "on" ]); checks.val([ "1", "on" ]);
deepEqual( checks.serialize(), "test=1&test=on", "Get multiple checked values." ); deepEqual( checks.serialize(), "test=1&test=on", "Get multiple checked values." );
checks.remove(); checks.remove();
}
var $button = jQuery("<button value='foobar'>text</button>").insertAfter("#button"); var $button = jQuery("<button value='foobar'>text</button>").insertAfter("#button");
equal( $button.val(), "foobar", "Value retrieval on a button does not return innerHTML" ); equal( $button.val(), "foobar", "Value retrieval on a button does not return innerHTML" );
......
test/unit/core.js
View file @ ac48a19b
...@@ -236,26 +236,26 @@ test( "globalEval", function() { ...@@ -236,26 +236,26 @@ test( "globalEval", function() {
window.globalEvalTest = undefined; window.globalEvalTest = undefined;
}); });
if ( !isLocal ) { if ( jQuery.get && !isLocal ) {
test("browser", function() { test("browser", function() {
stop(); stop();
jQuery.get("data/ua.txt", function(data){
var uas = data.split("\n");
expect( (uas.length - 1) * 2 );
jQuery.each(uas, function(){
var parts = this.split("\t");
if ( parts[2] ) {
var ua = jQuery.uaMatch( parts[2] );
equal( ua.browser, parts[0], "Checking browser for " + parts[2] );
equal( ua.version, parts[1], "Checking version string for " + parts[2] );
}
});
jQuery.get("data/ua.txt", function(data){ start();
var uas = data.split("\n");
expect( (uas.length - 1) * 2 );
jQuery.each(uas, function(){
var parts = this.split("\t");
if ( parts[2] ) {
var ua = jQuery.uaMatch( parts[2] );
equal( ua.browser, parts[0], "Checking browser for " + parts[2] );
equal( ua.version, parts[1], "Checking version string for " + parts[2] );
}
}); });
start();
}); });
});
} }
test("noConflict", function() { test("noConflict", function() {
......
test/unit/manipulation.js
View file @ ac48a19b
...@@ -626,7 +626,7 @@ test("append(xml)", function() { ...@@ -626,7 +626,7 @@ test("append(xml)", function() {
}); });
test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() { test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
expect(17); expect( 16 + ( jQuery.getScript ? 1 : 0 ) );
var defaultText = "Try them out:" var defaultText = "Try them out:"
jQuery("<b>buga</b>").appendTo("#first"); jQuery("<b>buga</b>").appendTo("#first");
...@@ -699,11 +699,13 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() { ...@@ -699,11 +699,13 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
QUnit.reset(); QUnit.reset();
stop(); if ( jQuery.getScript ) {
jQuery.getScript('data/test.js', function() { stop();
jQuery('script[src*="data\\/test\\.js"]').remove(); jQuery.getScript('data/test.js', function() {
start(); jQuery('script[src*="data\\/test\\.js"]').remove();
}); start();
});
}
}); });
var testPrepend = function(val) { var testPrepend = function(val) {
......
test/unit/support.js
View file @ ac48a19b
...@@ -38,13 +38,14 @@ testIframeWithCallback( "A background on the testElement does not cause IE8 to c ...@@ -38,13 +38,14 @@ testIframeWithCallback( "A background on the testElement does not cause IE8 to c
ok( true, "IE8 does not crash" ); ok( true, "IE8 does not crash" );
}); });
var userAgent = window.navigator.userAgent; (function() {
// These tests do not have to stay var userAgent = window.navigator.userAgent,
// They are here to help with upcoming support changes for 1.8 expected;
if ( /chrome\/19\.0/i.test(userAgent) ) {
test("Verify that the support tests resolve as expected per browser", function() { // These tests do not have to stay
var i, // They are here to help with upcoming support changes for 1.8
if ( /chrome\/19\.0/i.test(userAgent) ) {
expected = { expected = {
"leadingWhitespace":true, "leadingWhitespace":true,
"tbody":true, "tbody":true,
...@@ -77,13 +78,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) { ...@@ -77,13 +78,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) {
"cors":true, "cors":true,
"doesNotIncludeMarginInBodyOffset":true "doesNotIncludeMarginInBodyOffset":true
}; };
for ( i in expected ) { } else if ( /msie 8\.0/i.test(userAgent) ) {
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
}
});
} else if ( /msie 8\.0/i.test(userAgent) ) {
test("Verify that the support tests resolve as expected per browser", function() {
var i,
expected = { expected = {
"leadingWhitespace":false, "leadingWhitespace":false,
"tbody":true, "tbody":true,
...@@ -116,13 +111,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) { ...@@ -116,13 +111,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) {
"cors":false, "cors":false,
"doesNotIncludeMarginInBodyOffset":true "doesNotIncludeMarginInBodyOffset":true
}; };
for ( i in expected ) { } else if ( /msie 7\.0/i.test(userAgent) ) {
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
}
});
} else if ( /msie 7\.0/i.test(userAgent) ) {
test("Verify that the support tests resolve as expected per browser", function() {
var i,
expected = { expected = {
"ajax": true, "ajax": true,
"appendChecked": false, "appendChecked": false,
...@@ -155,13 +144,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) { ...@@ -155,13 +144,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) {
"tbody": false, "tbody": false,
"style": false "style": false
}; };
for ( i in expected ) { } else if ( /msie 6\.0/i.test(userAgent) ) {
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
}
});
} else if ( /msie 6\.0/i.test(userAgent) ) {
test("Verify that the support tests resolve as expected per browser", function() {
var i,
expected = { expected = {
"leadingWhitespace":false, "leadingWhitespace":false,
"tbody":false, "tbody":false,
...@@ -194,13 +177,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) { ...@@ -194,13 +177,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) {
"cors":false, "cors":false,
"doesNotIncludeMarginInBodyOffset":true "doesNotIncludeMarginInBodyOffset":true
}; };
for ( i in expected ) { } else if ( /5\.1\.1 safari/i.test(userAgent) ) {
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
}
});
} else if ( /5\.1\.1 safari/i.test(userAgent) ) {
test("Verify that the support tests resolve as expected per browser", function() {
var i,
expected = { expected = {
"leadingWhitespace":true, "leadingWhitespace":true,
"tbody":true, "tbody":true,
...@@ -233,13 +210,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) { ...@@ -233,13 +210,7 @@ if ( /chrome\/19\.0/i.test(userAgent) ) {
"cors":true, "cors":true,
"doesNotIncludeMarginInBodyOffset":true "doesNotIncludeMarginInBodyOffset":true
}; };
for ( i in expected ) { } else if ( /firefox\/3\.6/i.test(userAgent) ) {
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
}
});
} else if ( /firefox\/3\.6/i.test(userAgent) ) {
test("Verify that the support tests resolve as expected per browser", function() {
var i,
expected = { expected = {
"leadingWhitespace":true, "leadingWhitespace":true,
"tbody":true, "tbody":true,
...@@ -272,8 +243,16 @@ if ( /chrome\/19\.0/i.test(userAgent) ) { ...@@ -272,8 +243,16 @@ if ( /chrome\/19\.0/i.test(userAgent) ) {
"cors":true, "cors":true,
"doesNotIncludeMarginInBodyOffset":true "doesNotIncludeMarginInBodyOffset":true
}; };
for ( i in expected ) { }
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
test("Verify that the support tests resolve as expected per browser", function() {
for ( var i in expected ) {
if ( jQuery.isAjax || i !== "ajax" && i !== "cors" ) {
equal( jQuery.support[i], expected[i], "jQuery.support['" + i + "']: " + jQuery.support[i] + ", expected['" + i + "']: " + expected[i]);
}
} }
}); });
}
})();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment