Fixing endlines.
This commit is contained in:
Mark Gibson
John Resig
parent
0bb3998a6a
commit
ef819c91b9
8 changed files with 590 additions and 590 deletions
340
src/data.js
340
src/data.js
|
|
@ -1,170 +1,170 @@
|
||||||
var expando = "jQuery" + now(), uuid = 0, windowData = {};
|
var expando = "jQuery" + now(), uuid = 0, windowData = {};
|
||||||
var emptyObject = {};
|
var emptyObject = {};
|
||||||
|
|
||||||
jQuery.extend({
|
jQuery.extend({
|
||||||
cache: {},
|
cache: {},
|
||||||
|
|
||||||
expando:expando,
|
expando:expando,
|
||||||
|
|
||||||
data: function( elem, name, data ) {
|
data: function( elem, name, data ) {
|
||||||
elem = elem == window ?
|
elem = elem == window ?
|
||||||
windowData :
|
windowData :
|
||||||
elem;
|
elem;
|
||||||
|
|
||||||
var id = elem[ expando ], cache = jQuery.cache, thisCache;
|
var id = elem[ expando ], cache = jQuery.cache, thisCache;
|
||||||
|
|
||||||
// Handle the case where there's no name immediately
|
// Handle the case where there's no name immediately
|
||||||
if ( !name && !id ) {
|
if ( !name && !id ) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compute a unique ID for the element
|
// Compute a unique ID for the element
|
||||||
if ( !id ) {
|
if ( !id ) {
|
||||||
id = ++uuid;
|
id = ++uuid;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Avoid generating a new cache unless none exists and we
|
// Avoid generating a new cache unless none exists and we
|
||||||
// want to manipulate it.
|
// want to manipulate it.
|
||||||
if ( cache[ id ] ) {
|
if ( cache[ id ] ) {
|
||||||
thisCache = cache[ id ];
|
thisCache = cache[ id ];
|
||||||
} else if ( typeof data === "undefined" ) {
|
} else if ( typeof data === "undefined" ) {
|
||||||
thisCache = emptyObject;
|
thisCache = emptyObject;
|
||||||
} else {
|
} else {
|
||||||
thisCache = cache[ id ] = {};
|
thisCache = cache[ id ] = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prevent overriding the named cache with undefined values
|
// Prevent overriding the named cache with undefined values
|
||||||
if ( data !== undefined ) {
|
if ( data !== undefined ) {
|
||||||
elem[ expando ] = id;
|
elem[ expando ] = id;
|
||||||
thisCache[ name ] = data;
|
thisCache[ name ] = data;
|
||||||
}
|
}
|
||||||
|
|
||||||
return name ? thisCache[ name ] : thisCache;
|
return name ? thisCache[ name ] : thisCache;
|
||||||
},
|
},
|
||||||
|
|
||||||
removeData: function( elem, name ) {
|
removeData: function( elem, name ) {
|
||||||
elem = elem == window ?
|
elem = elem == window ?
|
||||||
windowData :
|
windowData :
|
||||||
elem;
|
elem;
|
||||||
|
|
||||||
var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
|
var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
|
||||||
|
|
||||||
// If we want to remove a specific section of the element's data
|
// If we want to remove a specific section of the element's data
|
||||||
if ( name ) {
|
if ( name ) {
|
||||||
if ( thisCache ) {
|
if ( thisCache ) {
|
||||||
// Remove the section of cache data
|
// Remove the section of cache data
|
||||||
delete thisCache[ name ];
|
delete thisCache[ name ];
|
||||||
|
|
||||||
// If we've removed all the data, remove the element's cache
|
// If we've removed all the data, remove the element's cache
|
||||||
if ( jQuery.isEmptyObject(thisCache) ) {
|
if ( jQuery.isEmptyObject(thisCache) ) {
|
||||||
jQuery.removeData( elem );
|
jQuery.removeData( elem );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Otherwise, we want to remove all of the element's data
|
// Otherwise, we want to remove all of the element's data
|
||||||
} else {
|
} else {
|
||||||
// Clean up the element expando
|
// Clean up the element expando
|
||||||
try {
|
try {
|
||||||
delete elem[ expando ];
|
delete elem[ expando ];
|
||||||
} catch( e ) {
|
} catch( e ) {
|
||||||
// IE has trouble directly removing the expando
|
// IE has trouble directly removing the expando
|
||||||
// but it's ok with using removeAttribute
|
// but it's ok with using removeAttribute
|
||||||
if ( elem.removeAttribute ) {
|
if ( elem.removeAttribute ) {
|
||||||
elem.removeAttribute( expando );
|
elem.removeAttribute( expando );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Completely remove the data cache
|
// Completely remove the data cache
|
||||||
delete cache[ id ];
|
delete cache[ id ];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
queue: function( elem, type, data ) {
|
queue: function( elem, type, data ) {
|
||||||
if( !elem ) return;
|
if( !elem ) return;
|
||||||
|
|
||||||
type = (type || "fx") + "queue";
|
type = (type || "fx") + "queue";
|
||||||
var q = jQuery.data( elem, type );
|
var q = jQuery.data( elem, type );
|
||||||
|
|
||||||
// Speed up dequeue by getting out quickly if this is just a lookup
|
// Speed up dequeue by getting out quickly if this is just a lookup
|
||||||
if( !data ) return q || [];
|
if( !data ) return q || [];
|
||||||
|
|
||||||
if ( !q || jQuery.isArray(data) )
|
if ( !q || jQuery.isArray(data) )
|
||||||
q = jQuery.data( elem, type, jQuery.makeArray(data) );
|
q = jQuery.data( elem, type, jQuery.makeArray(data) );
|
||||||
else
|
else
|
||||||
q.push( data );
|
q.push( data );
|
||||||
|
|
||||||
return q;
|
return q;
|
||||||
},
|
},
|
||||||
|
|
||||||
dequeue: function( elem, type ){
|
dequeue: function( elem, type ){
|
||||||
type = type || "fx";
|
type = type || "fx";
|
||||||
|
|
||||||
var queue = jQuery.queue( elem, type ), fn = queue.shift();
|
var queue = jQuery.queue( elem, type ), fn = queue.shift();
|
||||||
|
|
||||||
// If the fx queue is dequeued, always remove the progress sentinel
|
// If the fx queue is dequeued, always remove the progress sentinel
|
||||||
if( fn === "inprogress" ) fn = queue.shift();
|
if( fn === "inprogress" ) fn = queue.shift();
|
||||||
|
|
||||||
if( fn ) {
|
if( fn ) {
|
||||||
// Add a progress sentinel to prevent the fx queue from being
|
// Add a progress sentinel to prevent the fx queue from being
|
||||||
// automatically dequeued
|
// automatically dequeued
|
||||||
if( type == "fx" ) queue.unshift("inprogress");
|
if( type == "fx" ) queue.unshift("inprogress");
|
||||||
|
|
||||||
fn.call(elem, function() { jQuery.dequeue(elem, type); });
|
fn.call(elem, function() { jQuery.dequeue(elem, type); });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
jQuery.fn.extend({
|
jQuery.fn.extend({
|
||||||
data: function( key, value ){
|
data: function( key, value ){
|
||||||
if ( typeof key === "undefined" && this.length ) {
|
if ( typeof key === "undefined" && this.length ) {
|
||||||
return jQuery.data( this[0] );
|
return jQuery.data( this[0] );
|
||||||
}
|
}
|
||||||
|
|
||||||
var parts = key.split(".");
|
var parts = key.split(".");
|
||||||
parts[1] = parts[1] ? "." + parts[1] : "";
|
parts[1] = parts[1] ? "." + parts[1] : "";
|
||||||
|
|
||||||
if ( value === undefined ) {
|
if ( value === undefined ) {
|
||||||
var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
|
var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
|
||||||
|
|
||||||
if ( data === undefined && this.length )
|
if ( data === undefined && this.length )
|
||||||
data = jQuery.data( this[0], key );
|
data = jQuery.data( this[0], key );
|
||||||
|
|
||||||
return data === undefined && parts[1] ?
|
return data === undefined && parts[1] ?
|
||||||
this.data( parts[0] ) :
|
this.data( parts[0] ) :
|
||||||
data;
|
data;
|
||||||
} else
|
} else
|
||||||
return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
|
return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
|
||||||
jQuery.data( this, key, value );
|
jQuery.data( this, key, value );
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
removeData: function( key ){
|
removeData: function( key ){
|
||||||
return this.each(function(){
|
return this.each(function(){
|
||||||
jQuery.removeData( this, key );
|
jQuery.removeData( this, key );
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
queue: function(type, data){
|
queue: function(type, data){
|
||||||
if ( typeof type !== "string" ) {
|
if ( typeof type !== "string" ) {
|
||||||
data = type;
|
data = type;
|
||||||
type = "fx";
|
type = "fx";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( data === undefined )
|
if ( data === undefined )
|
||||||
return jQuery.queue( this[0], type );
|
return jQuery.queue( this[0], type );
|
||||||
|
|
||||||
return this.each(function(i, elem){
|
return this.each(function(i, elem){
|
||||||
var queue = jQuery.queue( this, type, data );
|
var queue = jQuery.queue( this, type, data );
|
||||||
|
|
||||||
if( type == "fx" && queue[0] !== "inprogress" )
|
if( type == "fx" && queue[0] !== "inprogress" )
|
||||||
jQuery.dequeue( this, type )
|
jQuery.dequeue( this, type )
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
dequeue: function(type){
|
dequeue: function(type){
|
||||||
return this.each(function(){
|
return this.each(function(){
|
||||||
jQuery.dequeue( this, type );
|
jQuery.dequeue( this, type );
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
clearQueue: function(type){
|
clearQueue: function(type){
|
||||||
return this.queue( type || "fx", [] );
|
return this.queue( type || "fx", [] );
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
$json = $_REQUEST['json'];
|
$json = $_REQUEST['json'];
|
||||||
if($json) {
|
if($json) {
|
||||||
echo '[ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ]';
|
echo '[ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ]';
|
||||||
} else {
|
} else {
|
||||||
echo '{ "data": {"lang": "en", "length": 25} }';
|
echo '{ "data": {"lang": "en", "length": 25} }';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
<?php
|
<?php
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
$callback = $_REQUEST['callback'];
|
$callback = $_REQUEST['callback'];
|
||||||
$json = $_REQUEST['json'];
|
$json = $_REQUEST['json'];
|
||||||
if($json) {
|
if($json) {
|
||||||
echo $callback . '([ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ])';
|
echo $callback . '([ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ])';
|
||||||
} else {
|
} else {
|
||||||
echo $callback . '({ "data": {"lang": "en", "length": 25} })';
|
echo $callback . '({ "data": {"lang": "en", "length": 25} })';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,29 @@
|
||||||
<?php
|
<?php
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
$wait = $_REQUEST['wait'];
|
$wait = $_REQUEST['wait'];
|
||||||
if($wait) {
|
if($wait) {
|
||||||
sleep($wait);
|
sleep($wait);
|
||||||
}
|
}
|
||||||
$xml = $_REQUEST['xml'];
|
$xml = $_REQUEST['xml'];
|
||||||
if($xml) {
|
if($xml) {
|
||||||
header("Content-type: text/xml");
|
header("Content-type: text/xml");
|
||||||
$result = ($xml == "5-2") ? "3" : "?";
|
$result = ($xml == "5-2") ? "3" : "?";
|
||||||
echo "<math><calculation>$xml</calculation><result>$result</result></math>";
|
echo "<math><calculation>$xml</calculation><result>$result</result></math>";
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
$name = $_REQUEST['name'];
|
$name = $_REQUEST['name'];
|
||||||
if($name == 'foo') {
|
if($name == 'foo') {
|
||||||
echo "bar";
|
echo "bar";
|
||||||
die();
|
die();
|
||||||
} else if($name == 'peter') {
|
} else if($name == 'peter') {
|
||||||
echo "pan";
|
echo "pan";
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
$request = apache_request_headers();
|
$request = apache_request_headers();
|
||||||
$request = $request['X-Custom-Header'];
|
$request = $request['X-Custom-Header'];
|
||||||
if(strlen($request) > 0) {
|
if(strlen($request) > 0) {
|
||||||
echo $request;
|
echo $request;
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
echo 'ERROR <script type="text/javascript">ok( true, "name.php executed" );</script>';
|
echo 'ERROR <script type="text/javascript">ok( true, "name.php executed" );</script>';
|
||||||
?>
|
?>
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
<div id="post">
|
<div id="post">
|
||||||
<?php
|
<?php
|
||||||
foreach( $_POST as $key=>$value )
|
foreach( $_POST as $key=>$value )
|
||||||
echo "<b id='$key'>$value</b>";
|
echo "<b id='$key'>$value</b>";
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
<div id="get">
|
<div id="get">
|
||||||
<?php
|
<?php
|
||||||
foreach( $_GET as $key=>$value )
|
foreach( $_GET as $key=>$value )
|
||||||
echo "<b id='$key'>$value</b>";
|
echo "<b id='$key'>$value</b>";
|
||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
var foobar = "bar";
|
var foobar = "bar";
|
||||||
jQuery('#ap').html('bar');
|
jQuery('#ap').html('bar');
|
||||||
ok( true, "test.js executed");
|
ok( true, "test.js executed");
|
||||||
|
|
|
||||||
|
|
@ -1,64 +1,64 @@
|
||||||
<?php
|
<?php
|
||||||
if( count($_POST) ){ // second call
|
if( count($_POST) ){ // second call
|
||||||
$includes = array();
|
$includes = array();
|
||||||
foreach( $_POST as $lib=>$ver ){
|
foreach( $_POST as $lib=>$ver ){
|
||||||
if( !$ver )
|
if( !$ver )
|
||||||
continue;
|
continue;
|
||||||
$include = "<script type='text/javascript' src='otherlibs/$lib/$ver/$lib.js'></script>\n";
|
$include = "<script type='text/javascript' src='otherlibs/$lib/$ver/$lib.js'></script>\n";
|
||||||
if( $lib == 'prototype' ) // prototype must be included first
|
if( $lib == 'prototype' ) // prototype must be included first
|
||||||
array_unshift( $includes, $include );
|
array_unshift( $includes, $include );
|
||||||
else
|
else
|
||||||
array_push( $includes, $include );
|
array_push( $includes, $include );
|
||||||
}
|
}
|
||||||
|
|
||||||
$includes = implode( "\n", $includes );
|
$includes = implode( "\n", $includes );
|
||||||
$suite = file_get_contents('index.html');
|
$suite = file_get_contents('index.html');
|
||||||
echo str_replace( '<!-- Includes -->', $includes, $suite );
|
echo str_replace( '<!-- Includes -->', $includes, $suite );
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr" id="html">
|
||||||
<head>
|
<head>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
<title>jQuery Test Suite</title>
|
<title>jQuery Test Suite</title>
|
||||||
<link rel="Stylesheet" media="screen" href="qunit/testsuite.css" />
|
<link rel="Stylesheet" media="screen" href="qunit/testsuite.css" />
|
||||||
<link rel="Stylesheet" media="screen" href="data/otherlibs.css" />
|
<link rel="Stylesheet" media="screen" href="data/otherlibs.css" />
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
form.otherlibs{
|
form.otherlibs{
|
||||||
margin: 20px 0 0 30px;
|
margin: 20px 0 0 30px;
|
||||||
}
|
}
|
||||||
form.otherlibs label{
|
form.otherlibs label{
|
||||||
display:block;
|
display:block;
|
||||||
margin: 5px 0 5px 30px;
|
margin: 5px 0 5px 30px;
|
||||||
}
|
}
|
||||||
form.otherlibs input.submit{
|
form.otherlibs input.submit{
|
||||||
margin:30px 0 0 0;
|
margin:30px 0 0 0;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="body">
|
<body id="body">
|
||||||
<h1 id="header">jQuery Test Suite</h1>
|
<h1 id="header">jQuery Test Suite</h1>
|
||||||
<h2 id="banner" class="fail"></h2>
|
<h2 id="banner" class="fail"></h2>
|
||||||
<h2 id="userAgent">Choose other libraries to include</h2>
|
<h2 id="userAgent">Choose other libraries to include</h2>
|
||||||
|
|
||||||
<form class="otherlibs" action="" method="post">
|
<form class="otherlibs" action="" method="post">
|
||||||
<?php
|
<?php
|
||||||
$libs = scandir('otherlibs');
|
$libs = scandir('otherlibs');
|
||||||
foreach( $libs as $lib ){
|
foreach( $libs as $lib ){
|
||||||
if( $lib[0] == '.' )
|
if( $lib[0] == '.' )
|
||||||
continue;
|
continue;
|
||||||
echo "<h3>$lib</h3>";
|
echo "<h3>$lib</h3>";
|
||||||
$vers = scandir( "otherlibs/$lib");
|
$vers = scandir( "otherlibs/$lib");
|
||||||
foreach( $vers as $ver ){
|
foreach( $vers as $ver ){
|
||||||
if( $ver[0] != '.' )
|
if( $ver[0] != '.' )
|
||||||
echo "<label><input type='checkbox' name='$lib' value='$ver'>$ver</label>";
|
echo "<label><input type='checkbox' name='$lib' value='$ver'>$ver</label>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<input type="submit" value="Run" class="submit" />
|
<input type="submit" value="Run" class="submit" />
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,296 +1,296 @@
|
||||||
module("data");
|
module("data");
|
||||||
|
|
||||||
test("expando", function(){
|
test("expando", function(){
|
||||||
expect(7);
|
expect(7);
|
||||||
|
|
||||||
equals("expando" in jQuery, true, "jQuery is exposing the expando");
|
equals("expando" in jQuery, true, "jQuery is exposing the expando");
|
||||||
|
|
||||||
var obj = {};
|
var obj = {};
|
||||||
jQuery.data(obj);
|
jQuery.data(obj);
|
||||||
equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
|
equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
|
||||||
|
|
||||||
jQuery.data(obj, true);
|
jQuery.data(obj, true);
|
||||||
equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
|
equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
|
||||||
|
|
||||||
jQuery.data(obj, 'test');
|
jQuery.data(obj, 'test');
|
||||||
equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
|
equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" );
|
||||||
|
|
||||||
jQuery.data(obj, "foo", "bar");
|
jQuery.data(obj, "foo", "bar");
|
||||||
equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
|
equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
|
||||||
|
|
||||||
var id = obj[jQuery.expando];
|
var id = obj[jQuery.expando];
|
||||||
equals( id in jQuery.cache, true, "jQuery.data added an entry to jQuery.cache" );
|
equals( id in jQuery.cache, true, "jQuery.data added an entry to jQuery.cache" );
|
||||||
|
|
||||||
equals( jQuery.cache[id].foo, "bar", "jQuery.data worked correctly" );
|
equals( jQuery.cache[id].foo, "bar", "jQuery.data worked correctly" );
|
||||||
});
|
});
|
||||||
|
|
||||||
test("jQuery.data", function() {
|
test("jQuery.data", function() {
|
||||||
expect(6);
|
expect(6);
|
||||||
var div = jQuery("#foo")[0];
|
var div = jQuery("#foo")[0];
|
||||||
equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
|
equals( jQuery.data(div, "test"), undefined, "Check for no data exists" );
|
||||||
|
|
||||||
jQuery.data(div, "test", "success");
|
jQuery.data(div, "test", "success");
|
||||||
equals( jQuery.data(div, "test"), "success", "Check for added data" );
|
equals( jQuery.data(div, "test"), "success", "Check for added data" );
|
||||||
|
|
||||||
var data = jQuery.data(div);
|
var data = jQuery.data(div);
|
||||||
same( data, { "test": "success" }, "Return complete data set" );
|
same( data, { "test": "success" }, "Return complete data set" );
|
||||||
|
|
||||||
jQuery.data(div, "test", "overwritten");
|
jQuery.data(div, "test", "overwritten");
|
||||||
equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" );
|
equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" );
|
||||||
|
|
||||||
jQuery.data(div, "test", undefined);
|
jQuery.data(div, "test", undefined);
|
||||||
equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed");
|
equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed");
|
||||||
|
|
||||||
jQuery.data(div, "test", null);
|
jQuery.data(div, "test", null);
|
||||||
ok( jQuery.data(div, "test") === null, "Check for null data");
|
ok( jQuery.data(div, "test") === null, "Check for null data");
|
||||||
});
|
});
|
||||||
|
|
||||||
test(".data()", function() {
|
test(".data()", function() {
|
||||||
expect(1);
|
expect(1);
|
||||||
|
|
||||||
var div = jQuery("#foo");
|
var div = jQuery("#foo");
|
||||||
div.data("test", "success");
|
div.data("test", "success");
|
||||||
same( div.data(), {test: "success"}, "data() get the entire data object" )
|
same( div.data(), {test: "success"}, "data() get the entire data object" )
|
||||||
})
|
})
|
||||||
|
|
||||||
test(".data(String) and .data(String, Object)", function() {
|
test(".data(String) and .data(String, Object)", function() {
|
||||||
expect(22);
|
expect(22);
|
||||||
var div = jQuery("#foo");
|
var div = jQuery("#foo");
|
||||||
equals( div.data("test"), undefined, "Check for no data exists" );
|
equals( div.data("test"), undefined, "Check for no data exists" );
|
||||||
div.data("test", "success");
|
div.data("test", "success");
|
||||||
equals( div.data("test"), "success", "Check for added data" );
|
equals( div.data("test"), "success", "Check for added data" );
|
||||||
div.data("test", "overwritten");
|
div.data("test", "overwritten");
|
||||||
equals( div.data("test"), "overwritten", "Check for overwritten data" );
|
equals( div.data("test"), "overwritten", "Check for overwritten data" );
|
||||||
div.data("test", undefined);
|
div.data("test", undefined);
|
||||||
equals( div.data("test"), "overwritten", "Check that data wasn't removed");
|
equals( div.data("test"), "overwritten", "Check that data wasn't removed");
|
||||||
div.data("test", null);
|
div.data("test", null);
|
||||||
ok( div.data("test") === null, "Check for null data");
|
ok( div.data("test") === null, "Check for null data");
|
||||||
|
|
||||||
div.data("test", "overwritten");
|
div.data("test", "overwritten");
|
||||||
var hits = {test:0}, gets = {test:0};
|
var hits = {test:0}, gets = {test:0};
|
||||||
|
|
||||||
div
|
div
|
||||||
.bind("setData",function(e,key,value){ hits[key] += value; })
|
.bind("setData",function(e,key,value){ hits[key] += value; })
|
||||||
.bind("setData.foo",function(e,key,value){ hits[key] += value; })
|
.bind("setData.foo",function(e,key,value){ hits[key] += value; })
|
||||||
.bind("getData",function(e,key){ gets[key] += 1; })
|
.bind("getData",function(e,key){ gets[key] += 1; })
|
||||||
.bind("getData.foo",function(e,key){ gets[key] += 3; });
|
.bind("getData.foo",function(e,key){ gets[key] += 3; });
|
||||||
|
|
||||||
div.data("test.foo", 2);
|
div.data("test.foo", 2);
|
||||||
equals( div.data("test"), "overwritten", "Check for original data" );
|
equals( div.data("test"), "overwritten", "Check for original data" );
|
||||||
equals( div.data("test.foo"), 2, "Check for namespaced data" );
|
equals( div.data("test.foo"), 2, "Check for namespaced data" );
|
||||||
equals( div.data("test.bar"), "overwritten", "Check for unmatched namespace" );
|
equals( div.data("test.bar"), "overwritten", "Check for unmatched namespace" );
|
||||||
equals( hits.test, 2, "Check triggered setter functions" );
|
equals( hits.test, 2, "Check triggered setter functions" );
|
||||||
equals( gets.test, 5, "Check triggered getter functions" );
|
equals( gets.test, 5, "Check triggered getter functions" );
|
||||||
|
|
||||||
hits.test = 0;
|
hits.test = 0;
|
||||||
gets.test = 0;
|
gets.test = 0;
|
||||||
|
|
||||||
div.data("test", 1);
|
div.data("test", 1);
|
||||||
equals( div.data("test"), 1, "Check for original data" );
|
equals( div.data("test"), 1, "Check for original data" );
|
||||||
equals( div.data("test.foo"), 2, "Check for namespaced data" );
|
equals( div.data("test.foo"), 2, "Check for namespaced data" );
|
||||||
equals( div.data("test.bar"), 1, "Check for unmatched namespace" );
|
equals( div.data("test.bar"), 1, "Check for unmatched namespace" );
|
||||||
equals( hits.test, 1, "Check triggered setter functions" );
|
equals( hits.test, 1, "Check triggered setter functions" );
|
||||||
equals( gets.test, 5, "Check triggered getter functions" );
|
equals( gets.test, 5, "Check triggered getter functions" );
|
||||||
|
|
||||||
hits.test = 0;
|
hits.test = 0;
|
||||||
gets.test = 0;
|
gets.test = 0;
|
||||||
|
|
||||||
div
|
div
|
||||||
.bind("getData",function(e,key){ return key + "root"; })
|
.bind("getData",function(e,key){ return key + "root"; })
|
||||||
.bind("getData.foo",function(e,key){ return key + "foo"; });
|
.bind("getData.foo",function(e,key){ return key + "foo"; });
|
||||||
|
|
||||||
equals( div.data("test"), "testroot", "Check for original data" );
|
equals( div.data("test"), "testroot", "Check for original data" );
|
||||||
equals( div.data("test.foo"), "testfoo", "Check for namespaced data" );
|
equals( div.data("test.foo"), "testfoo", "Check for namespaced data" );
|
||||||
equals( div.data("test.bar"), "testroot", "Check for unmatched namespace" );
|
equals( div.data("test.bar"), "testroot", "Check for unmatched namespace" );
|
||||||
|
|
||||||
// #3748
|
// #3748
|
||||||
var $elem = jQuery({});
|
var $elem = jQuery({});
|
||||||
equals( $elem.data('nothing'), undefined, "Non-existent data returns undefined");
|
equals( $elem.data('nothing'), undefined, "Non-existent data returns undefined");
|
||||||
equals( $elem.data('null',null).data('null'), null, "null's are preserved");
|
equals( $elem.data('null',null).data('null'), null, "null's are preserved");
|
||||||
equals( $elem.data('emptyString','').data('emptyString'), '', "Empty strings are preserved");
|
equals( $elem.data('emptyString','').data('emptyString'), '', "Empty strings are preserved");
|
||||||
equals( $elem.data('false',false).data('false'), false, "false's are preserved");
|
equals( $elem.data('false',false).data('false'), false, "false's are preserved");
|
||||||
|
|
||||||
// Clean up
|
// Clean up
|
||||||
$elem.removeData();
|
$elem.removeData();
|
||||||
});
|
});
|
||||||
|
|
||||||
test("jQuery.removeData", function() {
|
test("jQuery.removeData", function() {
|
||||||
expect(1);
|
expect(1);
|
||||||
var div = jQuery("#foo")[0];
|
var div = jQuery("#foo")[0];
|
||||||
jQuery.data(div, "test", "testing");
|
jQuery.data(div, "test", "testing");
|
||||||
jQuery.removeData(div, "test");
|
jQuery.removeData(div, "test");
|
||||||
equals( jQuery.data(div, "test"), undefined, "Check removal of data" );
|
equals( jQuery.data(div, "test"), undefined, "Check removal of data" );
|
||||||
});
|
});
|
||||||
|
|
||||||
test(".removeData()", function() {
|
test(".removeData()", function() {
|
||||||
expect(6);
|
expect(6);
|
||||||
var div = jQuery("#foo");
|
var div = jQuery("#foo");
|
||||||
div.data("test", "testing");
|
div.data("test", "testing");
|
||||||
div.removeData("test");
|
div.removeData("test");
|
||||||
equals( div.data("test"), undefined, "Check removal of data" );
|
equals( div.data("test"), undefined, "Check removal of data" );
|
||||||
|
|
||||||
div.data("test", "testing");
|
div.data("test", "testing");
|
||||||
div.data("test.foo", "testing2");
|
div.data("test.foo", "testing2");
|
||||||
div.removeData("test.bar");
|
div.removeData("test.bar");
|
||||||
equals( div.data("test.foo"), "testing2", "Make sure data is intact" );
|
equals( div.data("test.foo"), "testing2", "Make sure data is intact" );
|
||||||
equals( div.data("test"), "testing", "Make sure data is intact" );
|
equals( div.data("test"), "testing", "Make sure data is intact" );
|
||||||
|
|
||||||
div.removeData("test");
|
div.removeData("test");
|
||||||
equals( div.data("test.foo"), "testing2", "Make sure data is intact" );
|
equals( div.data("test.foo"), "testing2", "Make sure data is intact" );
|
||||||
equals( div.data("test"), undefined, "Make sure data is intact" );
|
equals( div.data("test"), undefined, "Make sure data is intact" );
|
||||||
|
|
||||||
div.removeData("test.foo");
|
div.removeData("test.foo");
|
||||||
equals( div.data("test.foo"), undefined, "Make sure data is intact" );
|
equals( div.data("test.foo"), undefined, "Make sure data is intact" );
|
||||||
});
|
});
|
||||||
|
|
||||||
test("queue() defaults to 'fx' type", function () {
|
test("queue() defaults to 'fx' type", function () {
|
||||||
expect(1);
|
expect(1);
|
||||||
stop();
|
stop();
|
||||||
|
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
var $foo = jQuery("#foo");
|
var $foo = jQuery("#foo");
|
||||||
|
|
||||||
$foo.queue(function() {
|
$foo.queue(function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
jQuery(self).dequeue("fx");
|
jQuery(self).dequeue("fx");
|
||||||
start();
|
start();
|
||||||
}, 200);
|
}, 200);
|
||||||
}).queue(function() {
|
}).queue(function() {
|
||||||
ok( "dequeuing 'fx' calls queues created with no name" )
|
ok( "dequeuing 'fx' calls queues created with no name" )
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("queue() with other types",function() {
|
test("queue() with other types",function() {
|
||||||
expect(9);
|
expect(9);
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
var $div = jQuery({});
|
var $div = jQuery({});
|
||||||
|
|
||||||
$div
|
$div
|
||||||
.queue('foo',function(){
|
.queue('foo',function(){
|
||||||
equals( ++counter, 1, "Dequeuing" );
|
equals( ++counter, 1, "Dequeuing" );
|
||||||
jQuery.dequeue(this,'foo');
|
jQuery.dequeue(this,'foo');
|
||||||
})
|
})
|
||||||
.queue('foo',function(){
|
.queue('foo',function(){
|
||||||
equals( ++counter, 2, "Dequeuing" );
|
equals( ++counter, 2, "Dequeuing" );
|
||||||
jQuery(this).dequeue('foo');
|
jQuery(this).dequeue('foo');
|
||||||
})
|
})
|
||||||
.queue('foo',function(){
|
.queue('foo',function(){
|
||||||
equals( ++counter, 3, "Dequeuing" );
|
equals( ++counter, 3, "Dequeuing" );
|
||||||
})
|
})
|
||||||
.queue('foo',function(){
|
.queue('foo',function(){
|
||||||
equals( ++counter, 4, "Dequeuing" );
|
equals( ++counter, 4, "Dequeuing" );
|
||||||
});
|
});
|
||||||
|
|
||||||
equals( $div.queue('foo').length, 4, "Testing queue length" );
|
equals( $div.queue('foo').length, 4, "Testing queue length" );
|
||||||
|
|
||||||
$div.dequeue('foo');
|
$div.dequeue('foo');
|
||||||
|
|
||||||
equals( counter, 3, "Testing previous call to dequeue" );
|
equals( counter, 3, "Testing previous call to dequeue" );
|
||||||
equals( $div.queue('foo').length, 1, "Testing queue length" );
|
equals( $div.queue('foo').length, 1, "Testing queue length" );
|
||||||
|
|
||||||
$div.dequeue('foo');
|
$div.dequeue('foo');
|
||||||
|
|
||||||
equals( counter, 4, "Testing previous call to dequeue" );
|
equals( counter, 4, "Testing previous call to dequeue" );
|
||||||
equals( $div.queue('foo').length, 0, "Testing queue length" );
|
equals( $div.queue('foo').length, 0, "Testing queue length" );
|
||||||
});
|
});
|
||||||
|
|
||||||
test("queue(name) passes in the next item in the queue as a parameter", function() {
|
test("queue(name) passes in the next item in the queue as a parameter", function() {
|
||||||
expect(2);
|
expect(2);
|
||||||
|
|
||||||
var div = jQuery({});
|
var div = jQuery({});
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
div.queue("foo", function(next) {
|
div.queue("foo", function(next) {
|
||||||
equals(++counter, 1, "Dequeueing");
|
equals(++counter, 1, "Dequeueing");
|
||||||
next();
|
next();
|
||||||
}).queue("foo", function(next) {
|
}).queue("foo", function(next) {
|
||||||
equals(++counter, 2, "Next was called");
|
equals(++counter, 2, "Next was called");
|
||||||
next();
|
next();
|
||||||
}).queue("bar", function() {
|
}).queue("bar", function() {
|
||||||
equals(++counter, 3, "Other queues are not triggered by next()")
|
equals(++counter, 3, "Other queues are not triggered by next()")
|
||||||
});
|
});
|
||||||
|
|
||||||
div.dequeue("foo");
|
div.dequeue("foo");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("queue(name) passes in the next item in the queue as a parameter", function() {
|
test("queue(name) passes in the next item in the queue as a parameter", function() {
|
||||||
expect(2);
|
expect(2);
|
||||||
|
|
||||||
var div = jQuery({});
|
var div = jQuery({});
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
div.queue("foo", function(next) {
|
div.queue("foo", function(next) {
|
||||||
equals(++counter, 1, "Dequeueing");
|
equals(++counter, 1, "Dequeueing");
|
||||||
next();
|
next();
|
||||||
}).queue("foo", function(next) {
|
}).queue("foo", function(next) {
|
||||||
equals(++counter, 2, "Next was called");
|
equals(++counter, 2, "Next was called");
|
||||||
next();
|
next();
|
||||||
}).queue("bar", function() {
|
}).queue("bar", function() {
|
||||||
equals(++counter, 3, "Other queues are not triggered by next()")
|
equals(++counter, 3, "Other queues are not triggered by next()")
|
||||||
});
|
});
|
||||||
|
|
||||||
div.dequeue("foo");
|
div.dequeue("foo");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("queue() passes in the next item in the queue as a parameter to fx queues", function() {
|
test("queue() passes in the next item in the queue as a parameter to fx queues", function() {
|
||||||
expect(2);
|
expect(2);
|
||||||
stop();
|
stop();
|
||||||
|
|
||||||
var div = jQuery({});
|
var div = jQuery({});
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
div.queue(function(next) {
|
div.queue(function(next) {
|
||||||
equals(++counter, 1, "Dequeueing");
|
equals(++counter, 1, "Dequeueing");
|
||||||
var self = this;
|
var self = this;
|
||||||
setTimeout(function() { next() }, 500);
|
setTimeout(function() { next() }, 500);
|
||||||
}).queue(function(next) {
|
}).queue(function(next) {
|
||||||
equals(++counter, 2, "Next was called");
|
equals(++counter, 2, "Next was called");
|
||||||
next();
|
next();
|
||||||
start();
|
start();
|
||||||
}).queue("bar", function() {
|
}).queue("bar", function() {
|
||||||
equals(++counter, 3, "Other queues are not triggered by next()")
|
equals(++counter, 3, "Other queues are not triggered by next()")
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("clearQueue(name) clears the queue", function() {
|
test("clearQueue(name) clears the queue", function() {
|
||||||
expect(1);
|
expect(1);
|
||||||
|
|
||||||
var div = jQuery({});
|
var div = jQuery({});
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
div.queue("foo", function(next) {
|
div.queue("foo", function(next) {
|
||||||
counter++;
|
counter++;
|
||||||
jQuery(this).clearQueue("foo");
|
jQuery(this).clearQueue("foo");
|
||||||
next();
|
next();
|
||||||
}).queue("foo", function(next) {
|
}).queue("foo", function(next) {
|
||||||
counter++;
|
counter++;
|
||||||
});
|
});
|
||||||
|
|
||||||
div.dequeue("foo");
|
div.dequeue("foo");
|
||||||
|
|
||||||
equals(counter, 1, "the queue was cleared");
|
equals(counter, 1, "the queue was cleared");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("clearQueue() clears the fx queue", function() {
|
test("clearQueue() clears the fx queue", function() {
|
||||||
expect(1);
|
expect(1);
|
||||||
|
|
||||||
var div = jQuery({});
|
var div = jQuery({});
|
||||||
var counter = 0;
|
var counter = 0;
|
||||||
|
|
||||||
div.queue(function(next) {
|
div.queue(function(next) {
|
||||||
counter++;
|
counter++;
|
||||||
var self = this;
|
var self = this;
|
||||||
setTimeout(function() { jQuery(self).clearQueue(); next(); }, 50);
|
setTimeout(function() { jQuery(self).clearQueue(); next(); }, 50);
|
||||||
}).queue(function(next) {
|
}).queue(function(next) {
|
||||||
counter++;
|
counter++;
|
||||||
});
|
});
|
||||||
|
|
||||||
equals(counter, 1, "the queue was cleared");
|
equals(counter, 1, "the queue was cleared");
|
||||||
|
|
||||||
div.removeData();
|
div.removeData();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue