From ef819c91b999523ed6cd0c7029e0cee8997ef01a Mon Sep 17 00:00:00 2001 From: Mark Gibson Date: Wed, 25 Nov 2009 12:09:53 -0500 Subject: [PATCH] Fixing endlines. --- src/data.js | 340 +++++++++++++------------- test/data/json.php | 16 +- test/data/jsonp.php | 20 +- test/data/name.php | 56 ++--- test/data/params_html.php | 22 +- test/data/test.js | 6 +- test/polluted.php | 128 +++++----- test/unit/data.js | 592 ++++++++++++++++++++++----------------------- 8 files changed, 590 insertions(+), 590 deletions(-) diff --git a/src/data.js b/src/data.js index 500f7ea..8fa62dc 100644 --- a/src/data.js +++ b/src/data.js @@ -1,170 +1,170 @@ -var expando = "jQuery" + now(), uuid = 0, windowData = {}; -var emptyObject = {}; - -jQuery.extend({ - cache: {}, - - expando:expando, - - data: function( elem, name, data ) { - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ], cache = jQuery.cache, thisCache; - - // Handle the case where there's no name immediately - if ( !name && !id ) { - return null; - } - - // Compute a unique ID for the element - if ( !id ) { - id = ++uuid; - } - - // Avoid generating a new cache unless none exists and we - // want to manipulate it. - if ( cache[ id ] ) { - thisCache = cache[ id ]; - } else if ( typeof data === "undefined" ) { - thisCache = emptyObject; - } else { - thisCache = cache[ id ] = {}; - } - - // Prevent overriding the named cache with undefined values - if ( data !== undefined ) { - elem[ expando ] = id; - thisCache[ name ] = data; - } - - return name ? thisCache[ name ] : thisCache; - }, - - removeData: function( elem, name ) { - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; - - // If we want to remove a specific section of the element's data - if ( name ) { - if ( thisCache ) { - // Remove the section of cache data - delete thisCache[ name ]; - - // If we've removed all the data, remove the element's cache - if ( jQuery.isEmptyObject(thisCache) ) { - jQuery.removeData( elem ); - } - } - - // Otherwise, we want to remove all of the element's data - } else { - // Clean up the element expando - try { - delete elem[ expando ]; - } catch( e ) { - // IE has trouble directly removing the expando - // but it's ok with using removeAttribute - if ( elem.removeAttribute ) { - elem.removeAttribute( expando ); - } - } - - // Completely remove the data cache - delete cache[ id ]; - } - }, - - queue: function( elem, type, data ) { - if( !elem ) return; - - type = (type || "fx") + "queue"; - var q = jQuery.data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if( !data ) return q || []; - - if ( !q || jQuery.isArray(data) ) - q = jQuery.data( elem, type, jQuery.makeArray(data) ); - else - q.push( data ); - - return q; - }, - - dequeue: function( elem, type ){ - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), fn = queue.shift(); - - // If the fx queue is dequeued, always remove the progress sentinel - if( fn === "inprogress" ) fn = queue.shift(); - - if( fn ) { - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if( type == "fx" ) queue.unshift("inprogress"); - - fn.call(elem, function() { jQuery.dequeue(elem, type); }); - } - } -}); - -jQuery.fn.extend({ - data: function( key, value ){ - if ( typeof key === "undefined" && this.length ) { - return jQuery.data( this[0] ); - } - - var parts = key.split("."); - parts[1] = parts[1] ? "." + parts[1] : ""; - - if ( value === undefined ) { - var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - - if ( data === undefined && this.length ) - data = jQuery.data( this[0], key ); - - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; - } else - return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ - jQuery.data( this, key, value ); - }); - }, - - removeData: function( key ){ - return this.each(function(){ - jQuery.removeData( this, key ); - }); - }, - queue: function(type, data){ - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - } - - if ( data === undefined ) - return jQuery.queue( this[0], type ); - - return this.each(function(i, elem){ - var queue = jQuery.queue( this, type, data ); - - if( type == "fx" && queue[0] !== "inprogress" ) - jQuery.dequeue( this, type ) - }); - }, - dequeue: function(type){ - return this.each(function(){ - jQuery.dequeue( this, type ); - }); - }, - clearQueue: function(type){ - return this.queue( type || "fx", [] ); - } -}); +var expando = "jQuery" + now(), uuid = 0, windowData = {}; +var emptyObject = {}; + +jQuery.extend({ + cache: {}, + + expando:expando, + + data: function( elem, name, data ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ], cache = jQuery.cache, thisCache; + + // Handle the case where there's no name immediately + if ( !name && !id ) { + return null; + } + + // Compute a unique ID for the element + if ( !id ) { + id = ++uuid; + } + + // Avoid generating a new cache unless none exists and we + // want to manipulate it. + if ( cache[ id ] ) { + thisCache = cache[ id ]; + } else if ( typeof data === "undefined" ) { + thisCache = emptyObject; + } else { + thisCache = cache[ id ] = {}; + } + + // Prevent overriding the named cache with undefined values + if ( data !== undefined ) { + elem[ expando ] = id; + thisCache[ name ] = data; + } + + return name ? thisCache[ name ] : thisCache; + }, + + removeData: function( elem, name ) { + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; + + // If we want to remove a specific section of the element's data + if ( name ) { + if ( thisCache ) { + // Remove the section of cache data + delete thisCache[ name ]; + + // If we've removed all the data, remove the element's cache + if ( jQuery.isEmptyObject(thisCache) ) { + jQuery.removeData( elem ); + } + } + + // Otherwise, we want to remove all of the element's data + } else { + // Clean up the element expando + try { + delete elem[ expando ]; + } catch( e ) { + // IE has trouble directly removing the expando + // but it's ok with using removeAttribute + if ( elem.removeAttribute ) { + elem.removeAttribute( expando ); + } + } + + // Completely remove the data cache + delete cache[ id ]; + } + }, + + queue: function( elem, type, data ) { + if( !elem ) return; + + type = (type || "fx") + "queue"; + var q = jQuery.data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if( !data ) return q || []; + + if ( !q || jQuery.isArray(data) ) + q = jQuery.data( elem, type, jQuery.makeArray(data) ); + else + q.push( data ); + + return q; + }, + + dequeue: function( elem, type ){ + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), fn = queue.shift(); + + // If the fx queue is dequeued, always remove the progress sentinel + if( fn === "inprogress" ) fn = queue.shift(); + + if( fn ) { + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if( type == "fx" ) queue.unshift("inprogress"); + + fn.call(elem, function() { jQuery.dequeue(elem, type); }); + } + } +}); + +jQuery.fn.extend({ + data: function( key, value ){ + if ( typeof key === "undefined" && this.length ) { + return jQuery.data( this[0] ); + } + + var parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + if ( data === undefined && this.length ) + data = jQuery.data( this[0], key ); + + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + } else + return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ + jQuery.data( this, key, value ); + }); + }, + + removeData: function( key ){ + return this.each(function(){ + jQuery.removeData( this, key ); + }); + }, + queue: function(type, data){ + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + } + + if ( data === undefined ) + return jQuery.queue( this[0], type ); + + return this.each(function(i, elem){ + var queue = jQuery.queue( this, type, data ); + + if( type == "fx" && queue[0] !== "inprogress" ) + jQuery.dequeue( this, type ) + }); + }, + dequeue: function(type){ + return this.each(function(){ + jQuery.dequeue( this, type ); + }); + }, + clearQueue: function(type){ + return this.queue( type || "fx", [] ); + } +}); diff --git a/test/data/json.php b/test/data/json.php index 08e3f9e..d19a417 100644 --- a/test/data/json.php +++ b/test/data/json.php @@ -1,9 +1,9 @@ - \ No newline at end of file diff --git a/test/data/jsonp.php b/test/data/jsonp.php index 7500025..9ae1d84 100644 --- a/test/data/jsonp.php +++ b/test/data/jsonp.php @@ -1,10 +1,10 @@ - + diff --git a/test/data/name.php b/test/data/name.php index a4b990e..ee22e45 100644 --- a/test/data/name.php +++ b/test/data/name.php @@ -1,29 +1,29 @@ -$xml$result"; - die(); -} -$name = $_REQUEST['name']; -if($name == 'foo') { - echo "bar"; - die(); -} else if($name == 'peter') { - echo "pan"; - die(); -} -$request = apache_request_headers(); -$request = $request['X-Custom-Header']; -if(strlen($request) > 0) { - echo $request; - die(); -} -echo 'ERROR '; +$xml$result"; + die(); +} +$name = $_REQUEST['name']; +if($name == 'foo') { + echo "bar"; + die(); +} else if($name == 'peter') { + echo "pan"; + die(); +} +$request = apache_request_headers(); +$request = $request['X-Custom-Header']; +if(strlen($request) > 0) { + echo $request; + die(); +} +echo 'ERROR '; ?> \ No newline at end of file diff --git a/test/data/params_html.php b/test/data/params_html.php index e170e8a..0bab00f 100644 --- a/test/data/params_html.php +++ b/test/data/params_html.php @@ -1,12 +1,12 @@ -
-$value ) - echo "$value"; -?> -
-
-$value ) - echo "$value"; -?> +
+$value ) + echo "$value"; +?> +
+
+$value ) + echo "$value"; +?>
\ No newline at end of file diff --git a/test/data/test.js b/test/data/test.js index a41cb23..69f492d 100644 --- a/test/data/test.js +++ b/test/data/test.js @@ -1,3 +1,3 @@ -var foobar = "bar"; -jQuery('#ap').html('bar'); -ok( true, "test.js executed"); +var foobar = "bar"; +jQuery('#ap').html('bar'); +ok( true, "test.js executed"); diff --git a/test/polluted.php b/test/polluted.php index ebe4509..3ddb7ac 100644 --- a/test/polluted.php +++ b/test/polluted.php @@ -1,64 +1,64 @@ -$ver ){ - if( !$ver ) - continue; - $include = "\n"; - if( $lib == 'prototype' ) // prototype must be included first - array_unshift( $includes, $include ); - else - array_push( $includes, $include ); - } - - $includes = implode( "\n", $includes ); - $suite = file_get_contents('index.html'); - echo str_replace( '', $includes, $suite ); - exit; - } -?> - - - - - - jQuery Test Suite - - - - - - -

jQuery Test Suite

- -

Choose other libraries to include

- -
- $lib"; - $vers = scandir( "otherlibs/$lib"); - foreach( $vers as $ver ){ - if( $ver[0] != '.' ) - echo ""; - } - } - ?> - -
- - +$ver ){ + if( !$ver ) + continue; + $include = "\n"; + if( $lib == 'prototype' ) // prototype must be included first + array_unshift( $includes, $include ); + else + array_push( $includes, $include ); + } + + $includes = implode( "\n", $includes ); + $suite = file_get_contents('index.html'); + echo str_replace( '', $includes, $suite ); + exit; + } +?> + + + + + + jQuery Test Suite + + + + + + +

jQuery Test Suite

+ +

Choose other libraries to include

+ +
+ $lib"; + $vers = scandir( "otherlibs/$lib"); + foreach( $vers as $ver ){ + if( $ver[0] != '.' ) + echo ""; + } + } + ?> + +
+ + diff --git a/test/unit/data.js b/test/unit/data.js index d21ec32..d3241c9 100644 --- a/test/unit/data.js +++ b/test/unit/data.js @@ -1,296 +1,296 @@ -module("data"); - -test("expando", function(){ - expect(7); - - equals("expando" in jQuery, true, "jQuery is exposing the expando"); - - var obj = {}; - jQuery.data(obj); - equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); - - jQuery.data(obj, true); - equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); - - jQuery.data(obj, 'test'); - equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); - - jQuery.data(obj, "foo", "bar"); - equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" ); - - var id = obj[jQuery.expando]; - equals( id in jQuery.cache, true, "jQuery.data added an entry to jQuery.cache" ); - - equals( jQuery.cache[id].foo, "bar", "jQuery.data worked correctly" ); -}); - -test("jQuery.data", function() { - expect(6); - var div = jQuery("#foo")[0]; - equals( jQuery.data(div, "test"), undefined, "Check for no data exists" ); - - jQuery.data(div, "test", "success"); - equals( jQuery.data(div, "test"), "success", "Check for added data" ); - - var data = jQuery.data(div); - same( data, { "test": "success" }, "Return complete data set" ); - - jQuery.data(div, "test", "overwritten"); - equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" ); - - jQuery.data(div, "test", undefined); - equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed"); - - jQuery.data(div, "test", null); - ok( jQuery.data(div, "test") === null, "Check for null data"); -}); - -test(".data()", function() { - expect(1); - - var div = jQuery("#foo"); - div.data("test", "success"); - same( div.data(), {test: "success"}, "data() get the entire data object" ) -}) - -test(".data(String) and .data(String, Object)", function() { - expect(22); - var div = jQuery("#foo"); - equals( div.data("test"), undefined, "Check for no data exists" ); - div.data("test", "success"); - equals( div.data("test"), "success", "Check for added data" ); - div.data("test", "overwritten"); - equals( div.data("test"), "overwritten", "Check for overwritten data" ); - div.data("test", undefined); - equals( div.data("test"), "overwritten", "Check that data wasn't removed"); - div.data("test", null); - ok( div.data("test") === null, "Check for null data"); - - div.data("test", "overwritten"); - var hits = {test:0}, gets = {test:0}; - - div - .bind("setData",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.foo",function(e,key){ gets[key] += 3; }); - - div.data("test.foo", 2); - equals( div.data("test"), "overwritten", "Check for original data" ); - equals( div.data("test.foo"), 2, "Check for namespaced data" ); - equals( div.data("test.bar"), "overwritten", "Check for unmatched namespace" ); - equals( hits.test, 2, "Check triggered setter functions" ); - equals( gets.test, 5, "Check triggered getter functions" ); - - hits.test = 0; - gets.test = 0; - - div.data("test", 1); - equals( div.data("test"), 1, "Check for original data" ); - equals( div.data("test.foo"), 2, "Check for namespaced data" ); - equals( div.data("test.bar"), 1, "Check for unmatched namespace" ); - equals( hits.test, 1, "Check triggered setter functions" ); - equals( gets.test, 5, "Check triggered getter functions" ); - - hits.test = 0; - gets.test = 0; - - div - .bind("getData",function(e,key){ return key + "root"; }) - .bind("getData.foo",function(e,key){ return key + "foo"; }); - - equals( div.data("test"), "testroot", "Check for original data" ); - equals( div.data("test.foo"), "testfoo", "Check for namespaced data" ); - equals( div.data("test.bar"), "testroot", "Check for unmatched namespace" ); - - // #3748 - var $elem = jQuery({}); - 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('emptyString','').data('emptyString'), '', "Empty strings are preserved"); - equals( $elem.data('false',false).data('false'), false, "false's are preserved"); - - // Clean up - $elem.removeData(); -}); - -test("jQuery.removeData", function() { - expect(1); - var div = jQuery("#foo")[0]; - jQuery.data(div, "test", "testing"); - jQuery.removeData(div, "test"); - equals( jQuery.data(div, "test"), undefined, "Check removal of data" ); -}); - -test(".removeData()", function() { - expect(6); - var div = jQuery("#foo"); - div.data("test", "testing"); - div.removeData("test"); - equals( div.data("test"), undefined, "Check removal of data" ); - - div.data("test", "testing"); - div.data("test.foo", "testing2"); - div.removeData("test.bar"); - equals( div.data("test.foo"), "testing2", "Make sure data is intact" ); - equals( div.data("test"), "testing", "Make sure data is intact" ); - - div.removeData("test"); - equals( div.data("test.foo"), "testing2", "Make sure data is intact" ); - equals( div.data("test"), undefined, "Make sure data is intact" ); - - div.removeData("test.foo"); - equals( div.data("test.foo"), undefined, "Make sure data is intact" ); -}); - -test("queue() defaults to 'fx' type", function () { - expect(1); - stop(); - - var counter = 0; - - var $foo = jQuery("#foo"); - - $foo.queue(function() { - var self = this; - setTimeout(function() { - jQuery(self).dequeue("fx"); - start(); - }, 200); - }).queue(function() { - ok( "dequeuing 'fx' calls queues created with no name" ) - }); - -}); - -test("queue() with other types",function() { - expect(9); - var counter = 0; - - var $div = jQuery({}); - - $div - .queue('foo',function(){ - equals( ++counter, 1, "Dequeuing" ); - jQuery.dequeue(this,'foo'); - }) - .queue('foo',function(){ - equals( ++counter, 2, "Dequeuing" ); - jQuery(this).dequeue('foo'); - }) - .queue('foo',function(){ - equals( ++counter, 3, "Dequeuing" ); - }) - .queue('foo',function(){ - equals( ++counter, 4, "Dequeuing" ); - }); - - equals( $div.queue('foo').length, 4, "Testing queue length" ); - - $div.dequeue('foo'); - - equals( counter, 3, "Testing previous call to dequeue" ); - equals( $div.queue('foo').length, 1, "Testing queue length" ); - - $div.dequeue('foo'); - - equals( counter, 4, "Testing previous call to dequeue" ); - equals( $div.queue('foo').length, 0, "Testing queue length" ); -}); - -test("queue(name) passes in the next item in the queue as a parameter", function() { - expect(2); - - var div = jQuery({}); - var counter = 0; - - div.queue("foo", function(next) { - equals(++counter, 1, "Dequeueing"); - next(); - }).queue("foo", function(next) { - equals(++counter, 2, "Next was called"); - next(); - }).queue("bar", function() { - equals(++counter, 3, "Other queues are not triggered by next()") - }); - - div.dequeue("foo"); -}); - -test("queue(name) passes in the next item in the queue as a parameter", function() { - expect(2); - - var div = jQuery({}); - var counter = 0; - - div.queue("foo", function(next) { - equals(++counter, 1, "Dequeueing"); - next(); - }).queue("foo", function(next) { - equals(++counter, 2, "Next was called"); - next(); - }).queue("bar", function() { - equals(++counter, 3, "Other queues are not triggered by next()") - }); - - div.dequeue("foo"); -}); - -test("queue() passes in the next item in the queue as a parameter to fx queues", function() { - expect(2); - stop(); - - var div = jQuery({}); - var counter = 0; - - div.queue(function(next) { - equals(++counter, 1, "Dequeueing"); - var self = this; - setTimeout(function() { next() }, 500); - }).queue(function(next) { - equals(++counter, 2, "Next was called"); - next(); - start(); - }).queue("bar", function() { - equals(++counter, 3, "Other queues are not triggered by next()") - }); - -}); - -test("clearQueue(name) clears the queue", function() { - expect(1); - - var div = jQuery({}); - var counter = 0; - - div.queue("foo", function(next) { - counter++; - jQuery(this).clearQueue("foo"); - next(); - }).queue("foo", function(next) { - counter++; - }); - - div.dequeue("foo"); - - equals(counter, 1, "the queue was cleared"); -}); - -test("clearQueue() clears the fx queue", function() { - expect(1); - - var div = jQuery({}); - var counter = 0; - - div.queue(function(next) { - counter++; - var self = this; - setTimeout(function() { jQuery(self).clearQueue(); next(); }, 50); - }).queue(function(next) { - counter++; - }); - - equals(counter, 1, "the queue was cleared"); - - div.removeData(); -}); +module("data"); + +test("expando", function(){ + expect(7); + + equals("expando" in jQuery, true, "jQuery is exposing the expando"); + + var obj = {}; + jQuery.data(obj); + equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); + + jQuery.data(obj, true); + equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); + + jQuery.data(obj, 'test'); + equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); + + jQuery.data(obj, "foo", "bar"); + equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" ); + + var id = obj[jQuery.expando]; + equals( id in jQuery.cache, true, "jQuery.data added an entry to jQuery.cache" ); + + equals( jQuery.cache[id].foo, "bar", "jQuery.data worked correctly" ); +}); + +test("jQuery.data", function() { + expect(6); + var div = jQuery("#foo")[0]; + equals( jQuery.data(div, "test"), undefined, "Check for no data exists" ); + + jQuery.data(div, "test", "success"); + equals( jQuery.data(div, "test"), "success", "Check for added data" ); + + var data = jQuery.data(div); + same( data, { "test": "success" }, "Return complete data set" ); + + jQuery.data(div, "test", "overwritten"); + equals( jQuery.data(div, "test"), "overwritten", "Check for overwritten data" ); + + jQuery.data(div, "test", undefined); + equals( jQuery.data(div, "test"), "overwritten", "Check that data wasn't removed"); + + jQuery.data(div, "test", null); + ok( jQuery.data(div, "test") === null, "Check for null data"); +}); + +test(".data()", function() { + expect(1); + + var div = jQuery("#foo"); + div.data("test", "success"); + same( div.data(), {test: "success"}, "data() get the entire data object" ) +}) + +test(".data(String) and .data(String, Object)", function() { + expect(22); + var div = jQuery("#foo"); + equals( div.data("test"), undefined, "Check for no data exists" ); + div.data("test", "success"); + equals( div.data("test"), "success", "Check for added data" ); + div.data("test", "overwritten"); + equals( div.data("test"), "overwritten", "Check for overwritten data" ); + div.data("test", undefined); + equals( div.data("test"), "overwritten", "Check that data wasn't removed"); + div.data("test", null); + ok( div.data("test") === null, "Check for null data"); + + div.data("test", "overwritten"); + var hits = {test:0}, gets = {test:0}; + + div + .bind("setData",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.foo",function(e,key){ gets[key] += 3; }); + + div.data("test.foo", 2); + equals( div.data("test"), "overwritten", "Check for original data" ); + equals( div.data("test.foo"), 2, "Check for namespaced data" ); + equals( div.data("test.bar"), "overwritten", "Check for unmatched namespace" ); + equals( hits.test, 2, "Check triggered setter functions" ); + equals( gets.test, 5, "Check triggered getter functions" ); + + hits.test = 0; + gets.test = 0; + + div.data("test", 1); + equals( div.data("test"), 1, "Check for original data" ); + equals( div.data("test.foo"), 2, "Check for namespaced data" ); + equals( div.data("test.bar"), 1, "Check for unmatched namespace" ); + equals( hits.test, 1, "Check triggered setter functions" ); + equals( gets.test, 5, "Check triggered getter functions" ); + + hits.test = 0; + gets.test = 0; + + div + .bind("getData",function(e,key){ return key + "root"; }) + .bind("getData.foo",function(e,key){ return key + "foo"; }); + + equals( div.data("test"), "testroot", "Check for original data" ); + equals( div.data("test.foo"), "testfoo", "Check for namespaced data" ); + equals( div.data("test.bar"), "testroot", "Check for unmatched namespace" ); + + // #3748 + var $elem = jQuery({}); + 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('emptyString','').data('emptyString'), '', "Empty strings are preserved"); + equals( $elem.data('false',false).data('false'), false, "false's are preserved"); + + // Clean up + $elem.removeData(); +}); + +test("jQuery.removeData", function() { + expect(1); + var div = jQuery("#foo")[0]; + jQuery.data(div, "test", "testing"); + jQuery.removeData(div, "test"); + equals( jQuery.data(div, "test"), undefined, "Check removal of data" ); +}); + +test(".removeData()", function() { + expect(6); + var div = jQuery("#foo"); + div.data("test", "testing"); + div.removeData("test"); + equals( div.data("test"), undefined, "Check removal of data" ); + + div.data("test", "testing"); + div.data("test.foo", "testing2"); + div.removeData("test.bar"); + equals( div.data("test.foo"), "testing2", "Make sure data is intact" ); + equals( div.data("test"), "testing", "Make sure data is intact" ); + + div.removeData("test"); + equals( div.data("test.foo"), "testing2", "Make sure data is intact" ); + equals( div.data("test"), undefined, "Make sure data is intact" ); + + div.removeData("test.foo"); + equals( div.data("test.foo"), undefined, "Make sure data is intact" ); +}); + +test("queue() defaults to 'fx' type", function () { + expect(1); + stop(); + + var counter = 0; + + var $foo = jQuery("#foo"); + + $foo.queue(function() { + var self = this; + setTimeout(function() { + jQuery(self).dequeue("fx"); + start(); + }, 200); + }).queue(function() { + ok( "dequeuing 'fx' calls queues created with no name" ) + }); + +}); + +test("queue() with other types",function() { + expect(9); + var counter = 0; + + var $div = jQuery({}); + + $div + .queue('foo',function(){ + equals( ++counter, 1, "Dequeuing" ); + jQuery.dequeue(this,'foo'); + }) + .queue('foo',function(){ + equals( ++counter, 2, "Dequeuing" ); + jQuery(this).dequeue('foo'); + }) + .queue('foo',function(){ + equals( ++counter, 3, "Dequeuing" ); + }) + .queue('foo',function(){ + equals( ++counter, 4, "Dequeuing" ); + }); + + equals( $div.queue('foo').length, 4, "Testing queue length" ); + + $div.dequeue('foo'); + + equals( counter, 3, "Testing previous call to dequeue" ); + equals( $div.queue('foo').length, 1, "Testing queue length" ); + + $div.dequeue('foo'); + + equals( counter, 4, "Testing previous call to dequeue" ); + equals( $div.queue('foo').length, 0, "Testing queue length" ); +}); + +test("queue(name) passes in the next item in the queue as a parameter", function() { + expect(2); + + var div = jQuery({}); + var counter = 0; + + div.queue("foo", function(next) { + equals(++counter, 1, "Dequeueing"); + next(); + }).queue("foo", function(next) { + equals(++counter, 2, "Next was called"); + next(); + }).queue("bar", function() { + equals(++counter, 3, "Other queues are not triggered by next()") + }); + + div.dequeue("foo"); +}); + +test("queue(name) passes in the next item in the queue as a parameter", function() { + expect(2); + + var div = jQuery({}); + var counter = 0; + + div.queue("foo", function(next) { + equals(++counter, 1, "Dequeueing"); + next(); + }).queue("foo", function(next) { + equals(++counter, 2, "Next was called"); + next(); + }).queue("bar", function() { + equals(++counter, 3, "Other queues are not triggered by next()") + }); + + div.dequeue("foo"); +}); + +test("queue() passes in the next item in the queue as a parameter to fx queues", function() { + expect(2); + stop(); + + var div = jQuery({}); + var counter = 0; + + div.queue(function(next) { + equals(++counter, 1, "Dequeueing"); + var self = this; + setTimeout(function() { next() }, 500); + }).queue(function(next) { + equals(++counter, 2, "Next was called"); + next(); + start(); + }).queue("bar", function() { + equals(++counter, 3, "Other queues are not triggered by next()") + }); + +}); + +test("clearQueue(name) clears the queue", function() { + expect(1); + + var div = jQuery({}); + var counter = 0; + + div.queue("foo", function(next) { + counter++; + jQuery(this).clearQueue("foo"); + next(); + }).queue("foo", function(next) { + counter++; + }); + + div.dequeue("foo"); + + equals(counter, 1, "the queue was cleared"); +}); + +test("clearQueue() clears the fx queue", function() { + expect(1); + + var div = jQuery({}); + var counter = 0; + + div.queue(function(next) { + counter++; + var self = this; + setTimeout(function() { jQuery(self).clearQueue(); next(); }, 50); + }).queue(function(next) { + counter++; + }); + + equals(counter, 1, "the queue was cleared"); + + div.removeData(); +}); -- 1.7.10.4