deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
Brandon Aaron 2010-03-23 22:40:38 -05:00
commit efea0f23f9
24 changed files with 222 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/unit/ajax.js
View file

@ -774,7 +774,7 @@ test("jQuery.ajax() - JSONP, Remote", function() {
var count = 0;
function plus(){ if ( ++count == 4 ) start(); }
var base = window.location.href.replace(/\?.*$/, "");
var base = window.location.href.replace(/[^\/]*$/, "");
stop();
@ -836,7 +836,7 @@ test("jQuery.ajax() - JSONP, Remote", function() {
test("jQuery.ajax() - script, Remote", function() {
expect(2);
var base = window.location.href.replace(/\?.*$/, "");
var base = window.location.href.replace(/[^\/]*$/, "");
stop();
@ -853,7 +853,7 @@ test("jQuery.ajax() - script, Remote", function() {
test("jQuery.ajax() - script, Remote with POST", function() {
expect(3);
var base = window.location.href.replace(/\?.*$/, "");
var base = window.location.href.replace(/[^\/]*$/, "");
stop();
@ -876,7 +876,7 @@ test("jQuery.ajax() - script, Remote with POST", function() {
test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
expect(2);
var base = window.location.href.replace(/\?.*$/, "");
var base = window.location.href.replace(/[^\/]*$/, "");
base = base.replace(/^.*?\/\//, "//");
stop();
@ -991,7 +991,7 @@ test("jQuery.getJSON - Using Native JSON", function() {
test("jQuery.getJSON(String, Function) - JSON object with absolute url to local content", function() {
expect(2);
var base = window.location.href.replace(/\?.*$/, "");
var base = window.location.href.replace(/[^\/]*$/, "");
stop();
jQuery.getJSON(url(base + "data/json.php"), function(json) {

12
test/unit/attributes.js
View file

@ -482,8 +482,10 @@ test("addClass(Function) with incoming value", function() {
});
div.addClass(function(i, val) {
equals( val, old[i], "Make sure the incoming value is correct." );
return "test";
if ( this.id !== "_firebugConsole" ) {
equals( val, old[i], "Make sure the incoming value is correct." );
return "test";
}
});
var pass = true;
@ -553,8 +555,10 @@ test("removeClass(Function) with incoming value", function() {
});
$divs.removeClass(function(i, val) {
equals( val, old[i], "Make sure the incoming value is correct." );
return "test";
if ( this.id !== "_firebugConsole" ) {
equals( val, old[i], "Make sure the incoming value is correct." );
return "test";
}
});
ok( !$divs.is('.test'), "Remove Class" );

2
test/unit/dimensions.js
View file

@ -26,7 +26,7 @@ function testWidth( val ) {
$div.css({ display: "", border: "", padding: "" });
jQuery("#nothiddendivchild").css({ padding: "3px", border: "2px solid #fff" });
jQuery("#nothiddendivchild").css({ width: 20, padding: "3px", border: "2px solid #fff" });
equals(jQuery("#nothiddendivchild").width(), 20, "Test child width with border and padding");
jQuery("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", width: "" });