]> source.dussan.org Git - jquery.git/commitdiff
Finished up some of the reorganization.
authorJohn Resig <jeresig@gmail.com>
Sat, 8 Sep 2007 12:46:01 +0000 (12:46 +0000)
committerJohn Resig <jeresig@gmail.com>
Sat, 8 Sep 2007 12:46:01 +0000 (12:46 +0000)
13 files changed:
build.xml
src/core.js [new file with mode: 0644]
src/jquery.js [deleted file]
test/unit/ajax.js [new file with mode: 0644]
test/unit/ajaxTest.js [deleted file]
test/unit/core.js [new file with mode: 0644]
test/unit/coreTest.js [deleted file]
test/unit/event.js [new file with mode: 0644]
test/unit/eventTest.js [deleted file]
test/unit/fx.js [new file with mode: 0644]
test/unit/fxTest.js [deleted file]
test/unit/selector.js [new file with mode: 0644]
test/unit/selectorTest.js [deleted file]

index 1b17822b36e51358b0e09c4c22c5caebba79e01a..f977269f04669f4d12234d76795d6c9fa50871c6 100644 (file)
--- a/build.xml
+++ b/build.xml
         <mkdir dir="${DIST_DIR}" />
         <concat destfile="${JQ}">
             <fileset dir="${SRC_DIR}" includes="intro.js" />
-            <fileset dir="${SRC_DIR}" includes="jquery/jquery.js" />
-            <fileset dir="${SRC_DIR}" includes="selector/selector.js" />
-            <fileset dir="${SRC_DIR}" includes="event/event.js" />
-            <fileset dir="${SRC_DIR}" includes="fx/fx.js" />
-            <fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />
+            <fileset dir="${SRC_DIR}" includes="core.js" />
+            <fileset dir="${SRC_DIR}" includes="selector.js" />
+            <fileset dir="${SRC_DIR}" includes="event.js" />
+            <fileset dir="${SRC_DIR}" includes="fx.js" />
+            <fileset dir="${SRC_DIR}" includes="ajax.js" />
             <fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
             <fileset dir="${SRC_DIR}" includes="outro.js" />
         </concat>
 
     <target name="test" depends="jquery" description="Copy files for the test suite into their own directory.">
         <echo message="Building Test Suite" />
+       <!--
         <delete dir="${TEST_DIR}" />
         <mkdir dir="${TEST_DIR}/data" />
         <copy todir="${TEST_DIR}/data">
             <fileset dir="${BUILD_DIR}/test/data/" />
         </copy>
         <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
+       -->
         <echo message="Test Suite built." />
     </target>
 
diff --git a/src/core.js b/src/core.js
new file mode 100644 (file)
index 0000000..537b4e2
--- /dev/null
@@ -0,0 +1,1014 @@
+/*
+ * jQuery @VERSION - New Wave Javascript
+ *
+ * Copyright (c) 2007 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date$
+ * $Rev$
+ */
+
+// Map over jQuery in case of overwrite
+if ( typeof jQuery != "undefined" )
+       var _jQuery = jQuery;
+
+var jQuery = window.jQuery = function(a,c) {
+       // If the context is global, return a new object
+       if ( window == this || !this.init )
+               return new jQuery(a,c);
+       
+       return this.init(a,c);
+};
+
+// Map over the $ in case of overwrite
+if ( typeof $ != "undefined" )
+       var _$ = $;
+       
+// Map the jQuery namespace to the '$' one
+window.$ = jQuery;
+
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
+
+jQuery.fn = jQuery.prototype = {
+       init: function(a,c) {
+               // Make sure that a selection was provided
+               a = a || document;
+
+               // Handle HTML strings
+               if ( typeof a  == "string" ) {
+                       var m = quickExpr.exec(a);
+                       if ( m && (m[1] || !c) ) {
+                               // HANDLE: $(html) -> $(array)
+                               if ( m[1] )
+                                       a = jQuery.clean( [ m[1] ], c );
+
+                               // HANDLE: $("#id")
+                               else {
+                                       var tmp = document.getElementById( m[3] );
+                                       if ( tmp )
+                                               // Handle the case where IE and Opera return items
+                                               // by name instead of ID
+                                               if ( tmp.id != m[3] )
+                                                       return jQuery().find( a );
+                                               else {
+                                                       this[0] = tmp;
+                                                       this.length = 1;
+                                                       return this;
+                                               }
+                                       else
+                                               a = [];
+                               }
+
+                       // HANDLE: $(expr)
+                       } else
+                               return new jQuery( c ).find( a );
+
+               // HANDLE: $(function)
+               // Shortcut for document ready
+               } else if ( jQuery.isFunction(a) )
+                       return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+
+               return this.setArray(
+                       // HANDLE: $(array)
+                       a.constructor == Array && a ||
+
+                       // HANDLE: $(arraylike)
+                       // Watch for when an array-like object is passed as the selector
+                       (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+
+                       // HANDLE: $(*)
+                       [ a ] );
+       },
+       
+       jquery: "@VERSION",
+
+       size: function() {
+               return this.length;
+       },
+       
+       length: 0,
+
+       get: function( num ) {
+               return num == undefined ?
+
+                       // Return a 'clean' array
+                       jQuery.makeArray( this ) :
+
+                       // Return just the object
+                       this[num];
+       },
+       
+       pushStack: function( a ) {
+               var ret = jQuery(a);
+               ret.prevObject = this;
+               return ret;
+       },
+       
+       setArray: function( a ) {
+               this.length = 0;
+               Array.prototype.push.apply( this, a );
+               return this;
+       },
+
+       each: function( fn, args ) {
+               return jQuery.each( this, fn, args );
+       },
+
+       index: function( obj ) {
+               var pos = -1;
+               this.each(function(i){
+                       if ( this == obj ) pos = i;
+               });
+               return pos;
+       },
+
+       attr: function( key, value, type ) {
+               var obj = key;
+               
+               // Look for the case where we're accessing a style value
+               if ( key.constructor == String )
+                       if ( value == undefined )
+                               return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
+                       else {
+                               obj = {};
+                               obj[ key ] = value;
+                       }
+               
+               // Check to see if we're setting style values
+               return this.each(function(index){
+                       // Set all the styles
+                       for ( var prop in obj )
+                               jQuery.attr(
+                                       type ? this.style : this,
+                                       prop, jQuery.prop(this, obj[prop], type, index, prop)
+                               );
+               });
+       },
+
+       css: function( key, value ) {
+               return this.attr( key, value, "curCSS" );
+       },
+
+       text: function(e) {
+               if ( typeof e != "object" && e != null )
+                       return this.empty().append( document.createTextNode( e ) );
+
+               var t = "";
+               jQuery.each( e || this, function(){
+                       jQuery.each( this.childNodes, function(){
+                               if ( this.nodeType != 8 )
+                                       t += this.nodeType != 1 ?
+                                               this.nodeValue : jQuery.fn.text([ this ]);
+                       });
+               });
+               return t;
+       },
+
+       wrapAll: function(html) {
+               if ( this[0] )
+                       // The elements to wrap the target around
+                       jQuery(html, this[0].ownerDocument)
+                               .clone()
+                               .insertBefore(this[0])
+                               .map(function(){
+                                       var elem = this;
+                                       while ( elem.firstChild )
+                                               elem = elem.firstChild;
+                                       return elem;
+                               })
+                               .append(this);
+
+               return this;
+       },
+
+       wrapInner: function(html) {
+               return this.each(function(){
+                       jQuery(this).contents().wrapAll(html);
+               });
+       },
+
+       wrap: function(html) {
+               return this.each(function(){
+                       jQuery(this).wrapAll(html);
+               });
+       },
+
+       append: function() {
+               return this.domManip(arguments, true, 1, function(a){
+                       this.appendChild( a );
+               });
+       },
+
+       prepend: function() {
+               return this.domManip(arguments, true, -1, function(a){
+                       this.insertBefore( a, this.firstChild );
+               });
+       },
+       
+       before: function() {
+               return this.domManip(arguments, false, 1, function(a){
+                       this.parentNode.insertBefore( a, this );
+               });
+       },
+
+       after: function() {
+               return this.domManip(arguments, false, -1, function(a){
+                       this.parentNode.insertBefore( a, this.nextSibling );
+               });
+       },
+
+       end: function() {
+               return this.prevObject || jQuery([]);
+       },
+
+       find: function(t) {
+               var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
+               return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
+                       jQuery.unique( data ) : data );
+       },
+
+       clone: function() {
+               var $this = this.add(this.find("*"));
+               if (jQuery.browser.msie) {
+                       // Need to remove events on the element and its descendants
+                       $this.each(function() {
+                               this._$events = {};
+                               for (var type in this.$events)
+                                       this._$events[type] = jQuery.extend({},this.$events[type]);
+                       }).unbind();
+               }
+
+               // Do the clone
+               var r = this.pushStack( jQuery.map( this, function(a){
+                       return a.cloneNode( true );
+               }) );
+
+               if (jQuery.browser.msie) {
+                       $this.each(function() {
+                               // Add the events back to the original and its descendants
+                               var events = this._$events;
+                               for (var type in events)
+                                       for (var handler in events[type])
+                                               jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
+                               this._$events = null;
+                       });
+               }
+
+               // copy form values over
+               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;
+       },
+
+       filter: function(t) {
+               return this.pushStack(
+                       jQuery.isFunction( t ) &&
+                       jQuery.grep(this, function(el, index){
+                               return t.apply(el, [index]);
+                       }) ||
+
+                       jQuery.multiFilter(t,this) );
+       },
+
+       not: function(t) {
+               return this.pushStack(
+                       t.constructor == String &&
+                       jQuery.multiFilter(t, this, true) ||
+
+                       jQuery.grep(this, function(a) {
+                               return ( t.constructor == Array || t.jquery )
+                                       ? jQuery.inArray( a, t ) < 0
+                                       : a != t;
+                       })
+               );
+       },
+
+       add: function(t) {
+               return this.pushStack( jQuery.merge(
+                       this.get(),
+                       t.constructor == String ?
+                               jQuery(t).get() :
+                               t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+                                       t : [t] )
+               );
+       },
+
+       is: function(expr) {
+               return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
+       },
+       
+       val: function( val ) {
+               if ( val == undefined ) {
+                   if ( this.length ) {
+                       var elem = this[0];
+                       
+                       // We need to handle select boxes special\r                              if ( jQuery.nodeName(elem, "select") ) {\r                                       var index = elem.selectedIndex,
+                                               a = [],
+                                               options = elem.options,
+                                               one = elem.type == "select-one";
+                                       
+                                       // Nothing was selected\r                                        if ( index < 0 )
+                                               return null;\r
+
+                                       // Loop through all the selected options\r                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+                                               var option = options[i];\r                                               if ( option.selected ) {\r                                                       // Get the specifc value for the option\r                                                        var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
+                                                       
+                                                       // We don't need an array for one selects\r                                                      if ( one )
+                                                               return val;
+                                                       
+                                                       // Multi-Selects return an array\r                                                       a.push(val);\r                                           }\r                                      }
+                                       \r                                       return a;
+                                       
+                               // Everything else, we just grab the value\r                             } else
+                                       return this[0].value.replace(/\r/g, "");
+                       }
+               } else
+                       return this.attr( "value", val );
+       },
+       
+       html: function( val ) {
+               return val == undefined ?
+                       ( this.length ? this[0].innerHTML : null ) :
+                       this.empty().append( val );
+       },
+
+       replaceWith: function( val ) {
+               return this.after( val ).remove();
+       },
+
+       slice: function() {
+               return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
+       },
+
+       map: function(fn) {
+               return this.pushStack(jQuery.map( this, function(elem,i){
+                       return fn.call( elem, i, elem );
+               }));
+       },
+
+       andSelf: function() {
+               return this.add( this.prevObject );
+       },
+       
+       domManip: function(args, table, dir, fn) {
+               var clone = this.length > 1, a; 
+
+               return this.each(function(){
+                       if ( !a ) {
+                               a = jQuery.clean(args, this.ownerDocument);
+                               if ( dir < 0 )
+                                       a.reverse();
+                       }
+
+                       var obj = this;
+
+                       if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
+                               obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
+
+                       jQuery.each( a, function(){
+                               if ( jQuery.nodeName(this, "script") ) {
+                                       if ( this.src )
+                                               jQuery.ajax({ url: this.src, async: false, dataType: "script" });
+                                       else
+                                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
+                               } else
+                                       fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+                       });
+               });
+       }
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+       // copy reference to target object
+       var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+
+       // Handle a deep copy situation
+       if ( target.constructor == Boolean ) {
+               deep = target;
+               target = arguments[1] || {};
+       }
+
+       // extend jQuery itself if only one argument is passed
+       if ( al == 1 ) {
+               target = this;
+               a = 0;
+       }
+
+       var prop;
+
+       for ( ; a < al; a++ )
+               // Only deal with non-null/undefined values
+               if ( (prop = arguments[a]) != null )
+                       // Extend the base object
+                       for ( var i in prop ) {
+                               // Prevent never-ending loop
+                               if ( target == prop[i] )
+                                       continue;
+
+                               // Recurse if we're merging object values
+                               if ( deep && typeof prop[i] == 'object' && target[i] )
+                                       jQuery.extend( target[i], prop[i] );
+
+                               // Don't bring in undefined values
+                               else if ( prop[i] != undefined )
+                                       target[i] = prop[i];
+                       }
+
+       // Return the modified object
+       return target;
+};
+
+jQuery.extend({
+       noConflict: function(deep) {
+               window.$ = _$;
+               if ( deep )
+                       window.jQuery = _jQuery;
+               return jQuery;
+       },
+
+       // This may seem like some crazy code, but trust me when I say that this
+       // is the only cross-browser way to do this. --John
+       isFunction: function( fn ) {
+               return !!fn && typeof fn != "string" && !fn.nodeName && 
+                       fn.constructor != Array && /function/i.test( fn + "" );
+       },
+       
+       // check if an element is in a XML document
+       isXMLDoc: function(elem) {
+               return elem.documentElement && !elem.body ||
+                       elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+       },
+
+       // Evalulates a script in a global context
+       // Evaluates Async. in Safari 2 :-(
+       globalEval: function( data ) {
+               data = jQuery.trim( data );
+               if ( data ) {
+                       if ( window.execScript )
+                               window.execScript( data );
+                       else if ( jQuery.browser.safari )
+                               // safari doesn't provide a synchronous global eval
+                               window.setTimeout( data, 0 );
+                       else
+                               eval.call( window, data );
+               }
+       },
+
+       nodeName: function( elem, name ) {
+               return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+       },
+
+       // args is for internal usage only
+       each: function( obj, fn, args ) {
+               if ( args ) {
+                       if ( obj.length == undefined )
+                               for ( var i in obj )
+                                       fn.apply( obj[i], args );
+                       else
+                               for ( var i = 0, ol = obj.length; i < ol; i++ )
+                                       if ( fn.apply( obj[i], args ) === false ) break;
+
+               // A special, fast, case for the most common use of each
+               } else {
+                       if ( obj.length == undefined )
+                               for ( var i in obj )
+                                       fn.call( obj[i], i, obj[i] );
+                       else
+                               for ( var i = 0, ol = obj.length, val = obj[0]; 
+                                       i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){}
+               }
+
+               return obj;
+       },
+       
+       prop: function(elem, value, type, index, prop){
+                       // Handle executable functions
+                       if ( jQuery.isFunction( value ) )
+                               value = value.call( elem, [index] );
+                               
+                       // exclude the following css properties to add px
+                       var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+
+                       // Handle passing in a number to a CSS property
+                       return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+                               value + "px" :
+                               value;
+       },
+
+       className: {
+               // internal only, use addClass("class")
+               add: function( elem, c ){
+                       jQuery.each( (c || "").split(/\s+/), function(i, cur){
+                               if ( !jQuery.className.has( elem.className, cur ) )
+                                       elem.className += ( elem.className ? " " : "" ) + cur;
+                       });
+               },
+
+               // internal only, use removeClass("class")
+               remove: function( elem, c ){
+                       elem.className = c != undefined ?
+                               jQuery.grep( elem.className.split(/\s+/), function(cur){
+                                       return !jQuery.className.has( c, cur ); 
+                               }).join(" ") : "";
+               },
+
+               // internal only, use is(".class")
+               has: function( t, c ) {
+                       return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
+               }
+       },
+
+       swap: function(e,o,f) {
+               for ( var i in o ) {
+                       e.style["old"+i] = e.style[i];
+                       e.style[i] = o[i];
+               }
+               f.apply( e, [] );
+               for ( var i in o )
+                       e.style[i] = e.style["old"+i];
+       },
+
+       css: function(e,p) {
+               if ( p == "height" || p == "width" ) {
+                       var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
+
+                       jQuery.each( d, function(){
+                               old["padding" + this] = 0;
+                               old["border" + this + "Width"] = 0;
+                       });
+
+                       jQuery.swap( e, old, function() {
+                               if ( jQuery(e).is(':visible') ) {
+                                       oHeight = e.offsetHeight;
+                                       oWidth = e.offsetWidth;
+                               } else {
+                                       e = jQuery(e.cloneNode(true))
+                                               .find(":radio").removeAttr("checked").end()
+                                               .css({
+                                                       visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
+                                               }).appendTo(e.parentNode)[0];
+
+                                       var parPos = jQuery.css(e.parentNode,"position") || "static";
+                                       if ( parPos == "static" )
+                                               e.parentNode.style.position = "relative";
+
+                                       oHeight = e.clientHeight;
+                                       oWidth = e.clientWidth;
+
+                                       if ( parPos == "static" )
+                                               e.parentNode.style.position = "static";
+
+                                       e.parentNode.removeChild(e);
+                               }
+                       });
+
+                       return p == "height" ? oHeight : oWidth;
+               }
+
+               return jQuery.curCSS( e, p );
+       },
+
+       curCSS: function(elem, prop, force) {
+               var ret, stack = [], swap = [];
+
+               // A helper method for determining if an element's values are broken
+               function color(a){
+                       if ( !jQuery.browser.safari )
+                               return false;
+
+                       var ret = document.defaultView.getComputedStyle(a,null);
+                       return !ret || ret.getPropertyValue("color") == "";
+               }
+
+               if (prop == "opacity" && jQuery.browser.msie) {
+                       ret = jQuery.attr(elem.style, "opacity");
+                       return ret == "" ? "1" : ret;
+               }
+               
+               if (prop.match(/float/i))
+                       prop = styleFloat;
+
+               if (!force && elem.style[prop])
+                       ret = elem.style[prop];
+
+               else if (document.defaultView && document.defaultView.getComputedStyle) {
+
+                       if (prop.match(/float/i))
+                               prop = "float";
+
+                       prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
+                       var cur = document.defaultView.getComputedStyle(elem, null);
+
+                       if ( cur && !color(elem) )
+                               ret = cur.getPropertyValue(prop);
+
+                       // If the element isn't reporting its values properly in Safari
+                       // then some display: none elements are involved
+                       else {
+                               // Locate all of the parent display: none elements
+                               for ( var a = elem; a && color(a); a = a.parentNode )
+                                       stack.unshift(a);
+
+                               // Go through and make them visible, but in reverse
+                               // (It would be better if we knew the exact display type that they had)
+                               for ( a = 0; a < stack.length; a++ )
+                                       if ( color(stack[a]) ) {
+                                               swap[a] = stack[a].style.display;
+                                               stack[a].style.display = "block";
+                                       }
+
+                               // Since we flip the display style, we have to handle that
+                               // one special, otherwise get the value
+                               ret = prop == "display" && swap[stack.length-1] != null ?
+                                       "none" :
+                                       document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || "";
+
+                               // Finally, revert the display styles back
+                               for ( a = 0; a < swap.length; a++ )
+                                       if ( swap[a] != null )
+                                               stack[a].style.display = swap[a];
+                       }
+
+                       if ( prop == "opacity" && ret == "" )
+                               ret = "1";
+
+               } else if (elem.currentStyle) {
+                       var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
+                       ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
+
+                       // From the awesome hack by Dean Edwards
+                       // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+                       // If we're not dealing with a regular pixel number
+                       // but a number that has a weird ending, we need to convert it to pixels
+                       if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) {
+                               var style = elem.style.left;
+                               var runtimeStyle = elem.runtimeStyle.left;
+                               elem.runtimeStyle.left = elem.currentStyle.left;
+                               elem.style.left = ret || 0;
+                               ret = elem.style.pixelLeft + "px";
+                               elem.style.left = style;
+                               elem.runtimeStyle.left = runtimeStyle;
+                       }
+               }
+
+               return ret;
+       },
+       
+       clean: function(a, doc) {
+               var r = [];
+               doc = doc || document;
+
+               jQuery.each( a, function(i,arg){
+                       if ( !arg ) return;
+
+                       if ( arg.constructor == Number )
+                               arg = arg.toString();
+                       
+                       // Convert html string into DOM nodes
+                       if ( typeof arg == "string" ) {
+                               // Fix "XHTML"-style tags in all browsers
+                               arg = arg.replace(/(<(\w+)[^>]*?)\/>/g, function(m, all, tag){
+                                       return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i)? m : all+"></"+tag+">";
+                               });
+
+                               // Trim whitespace, otherwise indexOf won't work as expected
+                               var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
+
+                               var wrap =
+                                       // option or optgroup
+                                       !s.indexOf("<opt") &&
+                                       [1, "<select>", "</select>"] ||
+                                       
+                                       !s.indexOf("<leg") &&
+                                       [1, "<fieldset>", "</fieldset>"] ||
+                                       
+                                       s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+                                       [1, "<table>", "</table>"] ||
+                                       
+                                       !s.indexOf("<tr") &&
+                                       [2, "<table><tbody>", "</tbody></table>"] ||
+                                       
+                                       // <thead> matched above
+                                       (!s.indexOf("<td") || !s.indexOf("<th")) &&
+                                       [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
+                                       
+                                       !s.indexOf("<col") &&
+                                       [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
+
+                                       // IE can't serialize <link> and <script> tags normally
+                                       jQuery.browser.msie &&
+                                       [1, "div<div>", "</div>"] ||
+                                       
+                                       [0,"",""];
+
+                               // Go to html and back, then peel off extra wrappers
+                               div.innerHTML = wrap[1] + arg + wrap[2];
+                               
+                               // Move to the right depth
+                               while ( wrap[0]-- )
+                                       div = div.lastChild;
+                               
+                               // Remove IE's autoinserted <tbody> from table fragments
+                               if ( jQuery.browser.msie ) {
+                                       
+                                       // String was a <table>, *may* have spurious <tbody>
+                                       if ( !s.indexOf("<table") && s.indexOf("<tbody") < 0 ) 
+                                               tb = div.firstChild && div.firstChild.childNodes;
+                                               
+                                       // String was a bare <thead> or <tfoot>
+                                       else if ( wrap[1] == "<table>" && s.indexOf("<tbody") < 0 )
+                                               tb = div.childNodes;
+
+                                       for ( var n = tb.length-1; n >= 0 ; --n )
+                                               if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
+                                                       tb[n].parentNode.removeChild(tb[n]);
+       
+                                       // IE completely kills leading whitespace when innerHTML is used        
+                                       if ( /^\s/.test(arg) )  
+                                               div.insertBefore( doc.createTextNode( arg.match(/^\s*/)[0] ), div.firstChild );
+
+                               }
+                               
+                               arg = jQuery.makeArray( div.childNodes );
+                       }
+
+                       if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
+                               return;
+
+                       if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
+                               r.push( arg );
+                       else
+                               r = jQuery.merge( r, arg );
+
+               });
+
+               return r;
+       },
+       
+       attr: function(elem, name, value){
+               var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
+
+               // Safari mis-reports the default selected property of a hidden option
+               // Accessing the parent's selectedIndex property fixes it
+               if ( name == "selected" && jQuery.browser.safari )
+                       elem.parentNode.selectedIndex;
+               
+               // Certain attributes only work when accessed via the old DOM 0 way
+               if ( fix[name] ) {
+                       if ( value != undefined ) elem[fix[name]] = value;
+                       return elem[fix[name]];
+               } else if ( jQuery.browser.msie && name == "style" )
+                       return jQuery.attr( elem.style, "cssText", value );
+
+               else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
+                       return elem.getAttributeNode(name).nodeValue;
+
+               // IE elem.getAttribute passes even for style
+               else if ( elem.tagName ) {
+
+                       if ( value != undefined ) {
+                               if ( name == "type" && jQuery.nodeName(elem,"input") && elem.parentNode )
+                                       throw "type property can't be changed";
+                               elem.setAttribute( name, value );
+                       }
+
+                       if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
+                               return elem.getAttribute( name, 2 );
+
+                       return elem.getAttribute( name );
+
+               // elem is actually elem.style ... set the style
+               } else {
+                       // IE actually uses filters for opacity
+                       if ( name == "opacity" && jQuery.browser.msie ) {
+                               if ( value != undefined ) {
+                                       // IE has trouble with opacity if it does not have layout
+                                       // Force it by setting the zoom level
+                                       elem.zoom = 1; 
+       
+                                       // Set the alpha filter to set the opacity
+                                       elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
+                                               (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+                               }
+       
+                               return elem.filter ? 
+                                       (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
+                       }
+                       name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
+                       if ( value != undefined ) elem[name] = value;
+                       return elem[name];
+               }
+       },
+       
+       trim: function(t){
+               return (t||"").replace(/^\s+|\s+$/g, "");
+       },
+
+       makeArray: function( a ) {
+               var r = [];
+
+               // Need to use typeof to fight Safari childNodes crashes
+               if ( typeof a != "array" )
+                       for ( var i = 0, al = a.length; i < al; i++ )
+                               r.push( a[i] );
+               else
+                       r = a.slice( 0 );
+
+               return r;
+       },
+
+       inArray: function( b, a ) {
+               for ( var i = 0, al = a.length; i < al; i++ )
+                       if ( a[i] == b )
+                               return i;
+               return -1;
+       },
+
+       merge: function(first, second) {
+               // We have to loop this way because IE & Opera overwrite the length
+               // expando of getElementsByTagName
+
+               // Also, we need to make sure that the correct elements are being returned
+               // (IE returns comment nodes in a '*' query)
+               if ( jQuery.browser.msie ) {
+                       for ( var i = 0; second[i]; i++ )
+                               if ( second[i].nodeType != 8 )
+                                       first.push(second[i]);
+               } else
+                       for ( var i = 0; second[i]; i++ )
+                               first.push(second[i]);
+
+               return first;
+       },
+
+       unique: function(first) {
+               var r = [], num = jQuery.mergeNum++;
+
+               try {
+                       for ( var i = 0, fl = first.length; i < fl; i++ )
+                               if ( num != first[i].mergeNum ) {
+                                       first[i].mergeNum = num;
+                                       r.push(first[i]);
+                               }
+               } catch(e) {
+                       r = first;
+               }
+
+               return r;
+       },
+
+       mergeNum: 0,
+
+       grep: function(elems, fn, inv) {
+               // If a string is passed in for the function, make a function
+               // for it (a handy shortcut)
+               if ( typeof fn == "string" )
+                       fn = eval("false||function(a,i){return " + fn + "}");
+
+               var result = [];
+
+               // Go through the array, only saving the items
+               // that pass the validator function
+               for ( var i = 0, el = elems.length; i < el; i++ )
+                       if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
+                               result.push( elems[i] );
+
+               return result;
+       },
+
+       map: function(elems, fn) {
+               // If a string is passed in for the function, make a function
+               // for it (a handy shortcut)
+               if ( typeof fn == "string" )
+                       fn = eval("false||function(a){return " + fn + "}");
+
+               var result = [];
+
+               // Go through the array, translating each of the items to their
+               // new value (or values).
+               for ( var i = 0, el = elems.length; i < el; i++ ) {
+                       var val = fn(elems[i],i);
+
+                       if ( val !== null && val != undefined ) {
+                               if ( val.constructor != Array ) val = [val];
+                               result = result.concat( val );
+                       }
+               }
+
+               return result;
+       }
+});
+
+var userAgent = navigator.userAgent.toLowerCase();
+
+// Figure out what browser is being used
+jQuery.browser = {
+       version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
+       safari: /webkit/.test(userAgent),
+       opera: /opera/.test(userAgent),
+       msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+       mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+};
+
+var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+       
+jQuery.extend({
+       // Check to see if the W3C box model is being used
+       boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
+       
+       styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+       
+       props: {
+               "for": "htmlFor",
+               "class": "className",
+               "float": styleFloat,
+               cssFloat: styleFloat,
+               styleFloat: styleFloat,
+               innerHTML: "innerHTML",
+               className: "className",
+               value: "value",
+               disabled: "disabled",
+               checked: "checked",
+               readonly: "readOnly",
+               selected: "selected",
+               maxlength: "maxLength"
+       }
+});
+
+jQuery.each({
+       parent: "a.parentNode",
+       parents: "jQuery.parents(a)",
+       next: "jQuery.nth(a,2,'nextSibling')",
+       prev: "jQuery.nth(a,2,'previousSibling')",
+       siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
+       children: "jQuery.sibling(a.firstChild)",
+       contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
+}, function(i,n){
+       jQuery.fn[ i ] = function(a) {
+               var ret = jQuery.map(this,n);
+               if ( a && typeof a == "string" )
+                       ret = jQuery.multiFilter(a,ret);
+               return this.pushStack( jQuery.unique(ret) );
+       };
+});
+
+jQuery.each({
+       appendTo: "append",
+       prependTo: "prepend",
+       insertBefore: "before",
+       insertAfter: "after",
+       replaceAll: "replaceWith"
+}, function(i,n){
+       jQuery.fn[ i ] = function(){
+               var a = arguments;
+               return this.each(function(){
+                       for ( var j = 0, al = a.length; j < al; j++ )
+                               jQuery(a[j])[n]( this );
+               });
+       };
+});
+
+jQuery.each( {
+       removeAttr: function( key ) {
+               jQuery.attr( this, key, "" );
+               this.removeAttribute( key );
+       },
+       addClass: function(c){
+               jQuery.className.add(this,c);
+       },
+       removeClass: function(c){
+               jQuery.className.remove(this,c);
+       },
+       toggleClass: function( c ){
+               jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
+       },
+       remove: function(a){
+               if ( !a || jQuery.filter( a, [this] ).r.length )
+                       this.parentNode.removeChild( this );
+       },
+       empty: function() {
+               while ( this.firstChild )
+                       this.removeChild( this.firstChild );
+       }
+}, function(i,n){
+       jQuery.fn[ i ] = function() {
+               return this.each( n, arguments );
+       };
+});
+
+jQuery.each( [ "height", "width" ], function(i,n){
+       jQuery.fn[ n ] = function(h) {
+               return h == undefined ?
+                       ( this.length ? jQuery.css( this[0], n ) : null ) :
+                       this.css( n, h.constructor == String ? h : h + "px" );
+       };
+});
diff --git a/src/jquery.js b/src/jquery.js
deleted file mode 100644 (file)
index 537b4e2..0000000
+++ /dev/null
@@ -1,1014 +0,0 @@
-/*
- * jQuery @VERSION - New Wave Javascript
- *
- * Copyright (c) 2007 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date$
- * $Rev$
- */
-
-// Map over jQuery in case of overwrite
-if ( typeof jQuery != "undefined" )
-       var _jQuery = jQuery;
-
-var jQuery = window.jQuery = function(a,c) {
-       // If the context is global, return a new object
-       if ( window == this || !this.init )
-               return new jQuery(a,c);
-       
-       return this.init(a,c);
-};
-
-// Map over the $ in case of overwrite
-if ( typeof $ != "undefined" )
-       var _$ = $;
-       
-// Map the jQuery namespace to the '$' one
-window.$ = jQuery;
-
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
-
-jQuery.fn = jQuery.prototype = {
-       init: function(a,c) {
-               // Make sure that a selection was provided
-               a = a || document;
-
-               // Handle HTML strings
-               if ( typeof a  == "string" ) {
-                       var m = quickExpr.exec(a);
-                       if ( m && (m[1] || !c) ) {
-                               // HANDLE: $(html) -> $(array)
-                               if ( m[1] )
-                                       a = jQuery.clean( [ m[1] ], c );
-
-                               // HANDLE: $("#id")
-                               else {
-                                       var tmp = document.getElementById( m[3] );
-                                       if ( tmp )
-                                               // Handle the case where IE and Opera return items
-                                               // by name instead of ID
-                                               if ( tmp.id != m[3] )
-                                                       return jQuery().find( a );
-                                               else {
-                                                       this[0] = tmp;
-                                                       this.length = 1;
-                                                       return this;
-                                               }
-                                       else
-                                               a = [];
-                               }
-
-                       // HANDLE: $(expr)
-                       } else
-                               return new jQuery( c ).find( a );
-
-               // HANDLE: $(function)
-               // Shortcut for document ready
-               } else if ( jQuery.isFunction(a) )
-                       return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
-
-               return this.setArray(
-                       // HANDLE: $(array)
-                       a.constructor == Array && a ||
-
-                       // HANDLE: $(arraylike)
-                       // Watch for when an array-like object is passed as the selector
-                       (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
-
-                       // HANDLE: $(*)
-                       [ a ] );
-       },
-       
-       jquery: "@VERSION",
-
-       size: function() {
-               return this.length;
-       },
-       
-       length: 0,
-
-       get: function( num ) {
-               return num == undefined ?
-
-                       // Return a 'clean' array
-                       jQuery.makeArray( this ) :
-
-                       // Return just the object
-                       this[num];
-       },
-       
-       pushStack: function( a ) {
-               var ret = jQuery(a);
-               ret.prevObject = this;
-               return ret;
-       },
-       
-       setArray: function( a ) {
-               this.length = 0;
-               Array.prototype.push.apply( this, a );
-               return this;
-       },
-
-       each: function( fn, args ) {
-               return jQuery.each( this, fn, args );
-       },
-
-       index: function( obj ) {
-               var pos = -1;
-               this.each(function(i){
-                       if ( this == obj ) pos = i;
-               });
-               return pos;
-       },
-
-       attr: function( key, value, type ) {
-               var obj = key;
-               
-               // Look for the case where we're accessing a style value
-               if ( key.constructor == String )
-                       if ( value == undefined )
-                               return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
-                       else {
-                               obj = {};
-                               obj[ key ] = value;
-                       }
-               
-               // Check to see if we're setting style values
-               return this.each(function(index){
-                       // Set all the styles
-                       for ( var prop in obj )
-                               jQuery.attr(
-                                       type ? this.style : this,
-                                       prop, jQuery.prop(this, obj[prop], type, index, prop)
-                               );
-               });
-       },
-
-       css: function( key, value ) {
-               return this.attr( key, value, "curCSS" );
-       },
-
-       text: function(e) {
-               if ( typeof e != "object" && e != null )
-                       return this.empty().append( document.createTextNode( e ) );
-
-               var t = "";
-               jQuery.each( e || this, function(){
-                       jQuery.each( this.childNodes, function(){
-                               if ( this.nodeType != 8 )
-                                       t += this.nodeType != 1 ?
-                                               this.nodeValue : jQuery.fn.text([ this ]);
-                       });
-               });
-               return t;
-       },
-
-       wrapAll: function(html) {
-               if ( this[0] )
-                       // The elements to wrap the target around
-                       jQuery(html, this[0].ownerDocument)
-                               .clone()
-                               .insertBefore(this[0])
-                               .map(function(){
-                                       var elem = this;
-                                       while ( elem.firstChild )
-                                               elem = elem.firstChild;
-                                       return elem;
-                               })
-                               .append(this);
-
-               return this;
-       },
-
-       wrapInner: function(html) {
-               return this.each(function(){
-                       jQuery(this).contents().wrapAll(html);
-               });
-       },
-
-       wrap: function(html) {
-               return this.each(function(){
-                       jQuery(this).wrapAll(html);
-               });
-       },
-
-       append: function() {
-               return this.domManip(arguments, true, 1, function(a){
-                       this.appendChild( a );
-               });
-       },
-
-       prepend: function() {
-               return this.domManip(arguments, true, -1, function(a){
-                       this.insertBefore( a, this.firstChild );
-               });
-       },
-       
-       before: function() {
-               return this.domManip(arguments, false, 1, function(a){
-                       this.parentNode.insertBefore( a, this );
-               });
-       },
-
-       after: function() {
-               return this.domManip(arguments, false, -1, function(a){
-                       this.parentNode.insertBefore( a, this.nextSibling );
-               });
-       },
-
-       end: function() {
-               return this.prevObject || jQuery([]);
-       },
-
-       find: function(t) {
-               var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
-               return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
-                       jQuery.unique( data ) : data );
-       },
-
-       clone: function() {
-               var $this = this.add(this.find("*"));
-               if (jQuery.browser.msie) {
-                       // Need to remove events on the element and its descendants
-                       $this.each(function() {
-                               this._$events = {};
-                               for (var type in this.$events)
-                                       this._$events[type] = jQuery.extend({},this.$events[type]);
-                       }).unbind();
-               }
-
-               // Do the clone
-               var r = this.pushStack( jQuery.map( this, function(a){
-                       return a.cloneNode( true );
-               }) );
-
-               if (jQuery.browser.msie) {
-                       $this.each(function() {
-                               // Add the events back to the original and its descendants
-                               var events = this._$events;
-                               for (var type in events)
-                                       for (var handler in events[type])
-                                               jQuery.event.add(this, type, events[type][handler], events[type][handler].data);
-                               this._$events = null;
-                       });
-               }
-
-               // copy form values over
-               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;
-       },
-
-       filter: function(t) {
-               return this.pushStack(
-                       jQuery.isFunction( t ) &&
-                       jQuery.grep(this, function(el, index){
-                               return t.apply(el, [index]);
-                       }) ||
-
-                       jQuery.multiFilter(t,this) );
-       },
-
-       not: function(t) {
-               return this.pushStack(
-                       t.constructor == String &&
-                       jQuery.multiFilter(t, this, true) ||
-
-                       jQuery.grep(this, function(a) {
-                               return ( t.constructor == Array || t.jquery )
-                                       ? jQuery.inArray( a, t ) < 0
-                                       : a != t;
-                       })
-               );
-       },
-
-       add: function(t) {
-               return this.pushStack( jQuery.merge(
-                       this.get(),
-                       t.constructor == String ?
-                               jQuery(t).get() :
-                               t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
-                                       t : [t] )
-               );
-       },
-
-       is: function(expr) {
-               return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
-       },
-       
-       val: function( val ) {
-               if ( val == undefined ) {
-                   if ( this.length ) {
-                       var elem = this[0];
-                       
-                       // We need to handle select boxes special\r                              if ( jQuery.nodeName(elem, "select") ) {\r                                       var index = elem.selectedIndex,
-                                               a = [],
-                                               options = elem.options,
-                                               one = elem.type == "select-one";
-                                       
-                                       // Nothing was selected\r                                        if ( index < 0 )
-                                               return null;\r
-
-                                       // Loop through all the selected options\r                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-                                               var option = options[i];\r                                               if ( option.selected ) {\r                                                       // Get the specifc value for the option\r                                                        var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
-                                                       
-                                                       // We don't need an array for one selects\r                                                      if ( one )
-                                                               return val;
-                                                       
-                                                       // Multi-Selects return an array\r                                                       a.push(val);\r                                           }\r                                      }
-                                       \r                                       return a;
-                                       
-                               // Everything else, we just grab the value\r                             } else
-                                       return this[0].value.replace(/\r/g, "");
-                       }
-               } else
-                       return this.attr( "value", val );
-       },
-       
-       html: function( val ) {
-               return val == undefined ?
-                       ( this.length ? this[0].innerHTML : null ) :
-                       this.empty().append( val );
-       },
-
-       replaceWith: function( val ) {
-               return this.after( val ).remove();
-       },
-
-       slice: function() {
-               return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
-       },
-
-       map: function(fn) {
-               return this.pushStack(jQuery.map( this, function(elem,i){
-                       return fn.call( elem, i, elem );
-               }));
-       },
-
-       andSelf: function() {
-               return this.add( this.prevObject );
-       },
-       
-       domManip: function(args, table, dir, fn) {
-               var clone = this.length > 1, a; 
-
-               return this.each(function(){
-                       if ( !a ) {
-                               a = jQuery.clean(args, this.ownerDocument);
-                               if ( dir < 0 )
-                                       a.reverse();
-                       }
-
-                       var obj = this;
-
-                       if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
-                               obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
-
-                       jQuery.each( a, function(){
-                               if ( jQuery.nodeName(this, "script") ) {
-                                       if ( this.src )
-                                               jQuery.ajax({ url: this.src, async: false, dataType: "script" });
-                                       else
-                                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-                               } else
-                                       fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
-                       });
-               });
-       }
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-       // copy reference to target object
-       var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
-
-       // Handle a deep copy situation
-       if ( target.constructor == Boolean ) {
-               deep = target;
-               target = arguments[1] || {};
-       }
-
-       // extend jQuery itself if only one argument is passed
-       if ( al == 1 ) {
-               target = this;
-               a = 0;
-       }
-
-       var prop;
-
-       for ( ; a < al; a++ )
-               // Only deal with non-null/undefined values
-               if ( (prop = arguments[a]) != null )
-                       // Extend the base object
-                       for ( var i in prop ) {
-                               // Prevent never-ending loop
-                               if ( target == prop[i] )
-                                       continue;
-
-                               // Recurse if we're merging object values
-                               if ( deep && typeof prop[i] == 'object' && target[i] )
-                                       jQuery.extend( target[i], prop[i] );
-
-                               // Don't bring in undefined values
-                               else if ( prop[i] != undefined )
-                                       target[i] = prop[i];
-                       }
-
-       // Return the modified object
-       return target;
-};
-
-jQuery.extend({
-       noConflict: function(deep) {
-               window.$ = _$;
-               if ( deep )
-                       window.jQuery = _jQuery;
-               return jQuery;
-       },
-
-       // This may seem like some crazy code, but trust me when I say that this
-       // is the only cross-browser way to do this. --John
-       isFunction: function( fn ) {
-               return !!fn && typeof fn != "string" && !fn.nodeName && 
-                       fn.constructor != Array && /function/i.test( fn + "" );
-       },
-       
-       // check if an element is in a XML document
-       isXMLDoc: function(elem) {
-               return elem.documentElement && !elem.body ||
-                       elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
-       },
-
-       // Evalulates a script in a global context
-       // Evaluates Async. in Safari 2 :-(
-       globalEval: function( data ) {
-               data = jQuery.trim( data );
-               if ( data ) {
-                       if ( window.execScript )
-                               window.execScript( data );
-                       else if ( jQuery.browser.safari )
-                               // safari doesn't provide a synchronous global eval
-                               window.setTimeout( data, 0 );
-                       else
-                               eval.call( window, data );
-               }
-       },
-
-       nodeName: function( elem, name ) {
-               return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
-       },
-
-       // args is for internal usage only
-       each: function( obj, fn, args ) {
-               if ( args ) {
-                       if ( obj.length == undefined )
-                               for ( var i in obj )
-                                       fn.apply( obj[i], args );
-                       else
-                               for ( var i = 0, ol = obj.length; i < ol; i++ )
-                                       if ( fn.apply( obj[i], args ) === false ) break;
-
-               // A special, fast, case for the most common use of each
-               } else {
-                       if ( obj.length == undefined )
-                               for ( var i in obj )
-                                       fn.call( obj[i], i, obj[i] );
-                       else
-                               for ( var i = 0, ol = obj.length, val = obj[0]; 
-                                       i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){}
-               }
-
-               return obj;
-       },
-       
-       prop: function(elem, value, type, index, prop){
-                       // Handle executable functions
-                       if ( jQuery.isFunction( value ) )
-                               value = value.call( elem, [index] );
-                               
-                       // exclude the following css properties to add px
-                       var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
-
-                       // Handle passing in a number to a CSS property
-                       return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
-                               value + "px" :
-                               value;
-       },
-
-       className: {
-               // internal only, use addClass("class")
-               add: function( elem, c ){
-                       jQuery.each( (c || "").split(/\s+/), function(i, cur){
-                               if ( !jQuery.className.has( elem.className, cur ) )
-                                       elem.className += ( elem.className ? " " : "" ) + cur;
-                       });
-               },
-
-               // internal only, use removeClass("class")
-               remove: function( elem, c ){
-                       elem.className = c != undefined ?
-                               jQuery.grep( elem.className.split(/\s+/), function(cur){
-                                       return !jQuery.className.has( c, cur ); 
-                               }).join(" ") : "";
-               },
-
-               // internal only, use is(".class")
-               has: function( t, c ) {
-                       return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
-               }
-       },
-
-       swap: function(e,o,f) {
-               for ( var i in o ) {
-                       e.style["old"+i] = e.style[i];
-                       e.style[i] = o[i];
-               }
-               f.apply( e, [] );
-               for ( var i in o )
-                       e.style[i] = e.style["old"+i];
-       },
-
-       css: function(e,p) {
-               if ( p == "height" || p == "width" ) {
-                       var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
-
-                       jQuery.each( d, function(){
-                               old["padding" + this] = 0;
-                               old["border" + this + "Width"] = 0;
-                       });
-
-                       jQuery.swap( e, old, function() {
-                               if ( jQuery(e).is(':visible') ) {
-                                       oHeight = e.offsetHeight;
-                                       oWidth = e.offsetWidth;
-                               } else {
-                                       e = jQuery(e.cloneNode(true))
-                                               .find(":radio").removeAttr("checked").end()
-                                               .css({
-                                                       visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
-                                               }).appendTo(e.parentNode)[0];
-
-                                       var parPos = jQuery.css(e.parentNode,"position") || "static";
-                                       if ( parPos == "static" )
-                                               e.parentNode.style.position = "relative";
-
-                                       oHeight = e.clientHeight;
-                                       oWidth = e.clientWidth;
-
-                                       if ( parPos == "static" )
-                                               e.parentNode.style.position = "static";
-
-                                       e.parentNode.removeChild(e);
-                               }
-                       });
-
-                       return p == "height" ? oHeight : oWidth;
-               }
-
-               return jQuery.curCSS( e, p );
-       },
-
-       curCSS: function(elem, prop, force) {
-               var ret, stack = [], swap = [];
-
-               // A helper method for determining if an element's values are broken
-               function color(a){
-                       if ( !jQuery.browser.safari )
-                               return false;
-
-                       var ret = document.defaultView.getComputedStyle(a,null);
-                       return !ret || ret.getPropertyValue("color") == "";
-               }
-
-               if (prop == "opacity" && jQuery.browser.msie) {
-                       ret = jQuery.attr(elem.style, "opacity");
-                       return ret == "" ? "1" : ret;
-               }
-               
-               if (prop.match(/float/i))
-                       prop = styleFloat;
-
-               if (!force && elem.style[prop])
-                       ret = elem.style[prop];
-
-               else if (document.defaultView && document.defaultView.getComputedStyle) {
-
-                       if (prop.match(/float/i))
-                               prop = "float";
-
-                       prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
-                       var cur = document.defaultView.getComputedStyle(elem, null);
-
-                       if ( cur && !color(elem) )
-                               ret = cur.getPropertyValue(prop);
-
-                       // If the element isn't reporting its values properly in Safari
-                       // then some display: none elements are involved
-                       else {
-                               // Locate all of the parent display: none elements
-                               for ( var a = elem; a && color(a); a = a.parentNode )
-                                       stack.unshift(a);
-
-                               // Go through and make them visible, but in reverse
-                               // (It would be better if we knew the exact display type that they had)
-                               for ( a = 0; a < stack.length; a++ )
-                                       if ( color(stack[a]) ) {
-                                               swap[a] = stack[a].style.display;
-                                               stack[a].style.display = "block";
-                                       }
-
-                               // Since we flip the display style, we have to handle that
-                               // one special, otherwise get the value
-                               ret = prop == "display" && swap[stack.length-1] != null ?
-                                       "none" :
-                                       document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || "";
-
-                               // Finally, revert the display styles back
-                               for ( a = 0; a < swap.length; a++ )
-                                       if ( swap[a] != null )
-                                               stack[a].style.display = swap[a];
-                       }
-
-                       if ( prop == "opacity" && ret == "" )
-                               ret = "1";
-
-               } else if (elem.currentStyle) {
-                       var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
-                       ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
-
-                       // From the awesome hack by Dean Edwards
-                       // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-                       // If we're not dealing with a regular pixel number
-                       // but a number that has a weird ending, we need to convert it to pixels
-                       if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) {
-                               var style = elem.style.left;
-                               var runtimeStyle = elem.runtimeStyle.left;
-                               elem.runtimeStyle.left = elem.currentStyle.left;
-                               elem.style.left = ret || 0;
-                               ret = elem.style.pixelLeft + "px";
-                               elem.style.left = style;
-                               elem.runtimeStyle.left = runtimeStyle;
-                       }
-               }
-
-               return ret;
-       },
-       
-       clean: function(a, doc) {
-               var r = [];
-               doc = doc || document;
-
-               jQuery.each( a, function(i,arg){
-                       if ( !arg ) return;
-
-                       if ( arg.constructor == Number )
-                               arg = arg.toString();
-                       
-                       // Convert html string into DOM nodes
-                       if ( typeof arg == "string" ) {
-                               // Fix "XHTML"-style tags in all browsers
-                               arg = arg.replace(/(<(\w+)[^>]*?)\/>/g, function(m, all, tag){
-                                       return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i)? m : all+"></"+tag+">";
-                               });
-
-                               // Trim whitespace, otherwise indexOf won't work as expected
-                               var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
-
-                               var wrap =
-                                       // option or optgroup
-                                       !s.indexOf("<opt") &&
-                                       [1, "<select>", "</select>"] ||
-                                       
-                                       !s.indexOf("<leg") &&
-                                       [1, "<fieldset>", "</fieldset>"] ||
-                                       
-                                       s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
-                                       [1, "<table>", "</table>"] ||
-                                       
-                                       !s.indexOf("<tr") &&
-                                       [2, "<table><tbody>", "</tbody></table>"] ||
-                                       
-                                       // <thead> matched above
-                                       (!s.indexOf("<td") || !s.indexOf("<th")) &&
-                                       [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
-                                       
-                                       !s.indexOf("<col") &&
-                                       [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
-
-                                       // IE can't serialize <link> and <script> tags normally
-                                       jQuery.browser.msie &&
-                                       [1, "div<div>", "</div>"] ||
-                                       
-                                       [0,"",""];
-
-                               // Go to html and back, then peel off extra wrappers
-                               div.innerHTML = wrap[1] + arg + wrap[2];
-                               
-                               // Move to the right depth
-                               while ( wrap[0]-- )
-                                       div = div.lastChild;
-                               
-                               // Remove IE's autoinserted <tbody> from table fragments
-                               if ( jQuery.browser.msie ) {
-                                       
-                                       // String was a <table>, *may* have spurious <tbody>
-                                       if ( !s.indexOf("<table") && s.indexOf("<tbody") < 0 ) 
-                                               tb = div.firstChild && div.firstChild.childNodes;
-                                               
-                                       // String was a bare <thead> or <tfoot>
-                                       else if ( wrap[1] == "<table>" && s.indexOf("<tbody") < 0 )
-                                               tb = div.childNodes;
-
-                                       for ( var n = tb.length-1; n >= 0 ; --n )
-                                               if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
-                                                       tb[n].parentNode.removeChild(tb[n]);
-       
-                                       // IE completely kills leading whitespace when innerHTML is used        
-                                       if ( /^\s/.test(arg) )  
-                                               div.insertBefore( doc.createTextNode( arg.match(/^\s*/)[0] ), div.firstChild );
-
-                               }
-                               
-                               arg = jQuery.makeArray( div.childNodes );
-                       }
-
-                       if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
-                               return;
-
-                       if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
-                               r.push( arg );
-                       else
-                               r = jQuery.merge( r, arg );
-
-               });
-
-               return r;
-       },
-       
-       attr: function(elem, name, value){
-               var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
-
-               // Safari mis-reports the default selected property of a hidden option
-               // Accessing the parent's selectedIndex property fixes it
-               if ( name == "selected" && jQuery.browser.safari )
-                       elem.parentNode.selectedIndex;
-               
-               // Certain attributes only work when accessed via the old DOM 0 way
-               if ( fix[name] ) {
-                       if ( value != undefined ) elem[fix[name]] = value;
-                       return elem[fix[name]];
-               } else if ( jQuery.browser.msie && name == "style" )
-                       return jQuery.attr( elem.style, "cssText", value );
-
-               else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
-                       return elem.getAttributeNode(name).nodeValue;
-
-               // IE elem.getAttribute passes even for style
-               else if ( elem.tagName ) {
-
-                       if ( value != undefined ) {
-                               if ( name == "type" && jQuery.nodeName(elem,"input") && elem.parentNode )
-                                       throw "type property can't be changed";
-                               elem.setAttribute( name, value );
-                       }
-
-                       if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
-                               return elem.getAttribute( name, 2 );
-
-                       return elem.getAttribute( name );
-
-               // elem is actually elem.style ... set the style
-               } else {
-                       // IE actually uses filters for opacity
-                       if ( name == "opacity" && jQuery.browser.msie ) {
-                               if ( value != undefined ) {
-                                       // IE has trouble with opacity if it does not have layout
-                                       // Force it by setting the zoom level
-                                       elem.zoom = 1; 
-       
-                                       // Set the alpha filter to set the opacity
-                                       elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
-                                               (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-                               }
-       
-                               return elem.filter ? 
-                                       (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
-                       }
-                       name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
-                       if ( value != undefined ) elem[name] = value;
-                       return elem[name];
-               }
-       },
-       
-       trim: function(t){
-               return (t||"").replace(/^\s+|\s+$/g, "");
-       },
-
-       makeArray: function( a ) {
-               var r = [];
-
-               // Need to use typeof to fight Safari childNodes crashes
-               if ( typeof a != "array" )
-                       for ( var i = 0, al = a.length; i < al; i++ )
-                               r.push( a[i] );
-               else
-                       r = a.slice( 0 );
-
-               return r;
-       },
-
-       inArray: function( b, a ) {
-               for ( var i = 0, al = a.length; i < al; i++ )
-                       if ( a[i] == b )
-                               return i;
-               return -1;
-       },
-
-       merge: function(first, second) {
-               // We have to loop this way because IE & Opera overwrite the length
-               // expando of getElementsByTagName
-
-               // Also, we need to make sure that the correct elements are being returned
-               // (IE returns comment nodes in a '*' query)
-               if ( jQuery.browser.msie ) {
-                       for ( var i = 0; second[i]; i++ )
-                               if ( second[i].nodeType != 8 )
-                                       first.push(second[i]);
-               } else
-                       for ( var i = 0; second[i]; i++ )
-                               first.push(second[i]);
-
-               return first;
-       },
-
-       unique: function(first) {
-               var r = [], num = jQuery.mergeNum++;
-
-               try {
-                       for ( var i = 0, fl = first.length; i < fl; i++ )
-                               if ( num != first[i].mergeNum ) {
-                                       first[i].mergeNum = num;
-                                       r.push(first[i]);
-                               }
-               } catch(e) {
-                       r = first;
-               }
-
-               return r;
-       },
-
-       mergeNum: 0,
-
-       grep: function(elems, fn, inv) {
-               // If a string is passed in for the function, make a function
-               // for it (a handy shortcut)
-               if ( typeof fn == "string" )
-                       fn = eval("false||function(a,i){return " + fn + "}");
-
-               var result = [];
-
-               // Go through the array, only saving the items
-               // that pass the validator function
-               for ( var i = 0, el = elems.length; i < el; i++ )
-                       if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
-                               result.push( elems[i] );
-
-               return result;
-       },
-
-       map: function(elems, fn) {
-               // If a string is passed in for the function, make a function
-               // for it (a handy shortcut)
-               if ( typeof fn == "string" )
-                       fn = eval("false||function(a){return " + fn + "}");
-
-               var result = [];
-
-               // Go through the array, translating each of the items to their
-               // new value (or values).
-               for ( var i = 0, el = elems.length; i < el; i++ ) {
-                       var val = fn(elems[i],i);
-
-                       if ( val !== null && val != undefined ) {
-                               if ( val.constructor != Array ) val = [val];
-                               result = result.concat( val );
-                       }
-               }
-
-               return result;
-       }
-});
-
-var userAgent = navigator.userAgent.toLowerCase();
-
-// Figure out what browser is being used
-jQuery.browser = {
-       version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
-       safari: /webkit/.test(userAgent),
-       opera: /opera/.test(userAgent),
-       msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
-       mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
-};
-
-var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
-       
-jQuery.extend({
-       // Check to see if the W3C box model is being used
-       boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-       
-       styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
-       
-       props: {
-               "for": "htmlFor",
-               "class": "className",
-               "float": styleFloat,
-               cssFloat: styleFloat,
-               styleFloat: styleFloat,
-               innerHTML: "innerHTML",
-               className: "className",
-               value: "value",
-               disabled: "disabled",
-               checked: "checked",
-               readonly: "readOnly",
-               selected: "selected",
-               maxlength: "maxLength"
-       }
-});
-
-jQuery.each({
-       parent: "a.parentNode",
-       parents: "jQuery.parents(a)",
-       next: "jQuery.nth(a,2,'nextSibling')",
-       prev: "jQuery.nth(a,2,'previousSibling')",
-       siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
-       children: "jQuery.sibling(a.firstChild)",
-       contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
-}, function(i,n){
-       jQuery.fn[ i ] = function(a) {
-               var ret = jQuery.map(this,n);
-               if ( a && typeof a == "string" )
-                       ret = jQuery.multiFilter(a,ret);
-               return this.pushStack( jQuery.unique(ret) );
-       };
-});
-
-jQuery.each({
-       appendTo: "append",
-       prependTo: "prepend",
-       insertBefore: "before",
-       insertAfter: "after",
-       replaceAll: "replaceWith"
-}, function(i,n){
-       jQuery.fn[ i ] = function(){
-               var a = arguments;
-               return this.each(function(){
-                       for ( var j = 0, al = a.length; j < al; j++ )
-                               jQuery(a[j])[n]( this );
-               });
-       };
-});
-
-jQuery.each( {
-       removeAttr: function( key ) {
-               jQuery.attr( this, key, "" );
-               this.removeAttribute( key );
-       },
-       addClass: function(c){
-               jQuery.className.add(this,c);
-       },
-       removeClass: function(c){
-               jQuery.className.remove(this,c);
-       },
-       toggleClass: function( c ){
-               jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
-       },
-       remove: function(a){
-               if ( !a || jQuery.filter( a, [this] ).r.length )
-                       this.parentNode.removeChild( this );
-       },
-       empty: function() {
-               while ( this.firstChild )
-                       this.removeChild( this.firstChild );
-       }
-}, function(i,n){
-       jQuery.fn[ i ] = function() {
-               return this.each( n, arguments );
-       };
-});
-
-jQuery.each( [ "height", "width" ], function(i,n){
-       jQuery.fn[ n ] = function(h) {
-               return h == undefined ?
-                       ( this.length ? jQuery.css( this[0], n ) : null ) :
-                       this.css( n, h.constructor == String ? h : h + "px" );
-       };
-});
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
new file mode 100644 (file)
index 0000000..872ec08
--- /dev/null
@@ -0,0 +1,641 @@
+module("ajax");
+
+// Safari 3 randomly crashes when running these tests,
+// but only in the full suite - you can run just the Ajax
+// tests and they'll pass
+//if ( !jQuery.browser.safari ) {
+
+test("$.ajax() - success callbacks", function() {
+       expect( 8 );
+       
+       $.ajaxSetup({ timeout: 0 });
+       
+       stop();
+       
+       setTimeout(function(){  
+        $('#foo').ajaxStart(function(){
+            ok( true, "ajaxStart" );
+        }).ajaxStop(function(){
+            ok( true, "ajaxStop" );
+            start();
+        }).ajaxSend(function(){
+            ok( true, "ajaxSend" );
+        }).ajaxComplete(function(){
+            ok( true, "ajaxComplete" );
+        }).ajaxError(function(){
+            ok( false, "ajaxError" );
+        }).ajaxSuccess(function(){
+            ok( true, "ajaxSuccess" );
+        });
+        
+        $.ajax({
+            url: url("data/name.html"),
+            beforeSend: function(){ ok(true, "beforeSend"); },
+            success: function(){ ok(true, "success"); },
+            error: function(){ ok(false, "error"); },
+            complete: function(){ ok(true, "complete"); }
+        });
+    }, 13);
+});
+
+if ( !isLocal ) {
+       test("$.ajax() - error callbacks", function() {
+               expect( 8 );
+               stop();
+               
+               $('#foo').ajaxStart(function(){
+                       ok( true, "ajaxStart" );
+               }).ajaxStop(function(){
+                       ok( true, "ajaxStop" );
+                       start();
+               }).ajaxSend(function(){
+                       ok( true, "ajaxSend" );
+               }).ajaxComplete(function(){
+                       ok( true, "ajaxComplete" );
+               }).ajaxError(function(){
+                       ok( true, "ajaxError" );
+               }).ajaxSuccess(function(){
+                       ok( false, "ajaxSuccess" );
+               });
+               
+               $.ajaxSetup({ timeout: 500 });
+               
+               $.ajax({
+                       url: url("data/name.php?wait=5"),
+                       beforeSend: function(){ ok(true, "beforeSend"); },
+                       success: function(){ ok(false, "success"); },
+                       error: function(){ ok(true, "error"); },
+                       complete: function(){ ok(true, "complete"); }
+               });
+       });
+}
+
+test("$.ajax() - disabled globals", function() {
+       expect( 3 );
+       stop();
+       
+       $('#foo').ajaxStart(function(){
+               ok( false, "ajaxStart" );
+       }).ajaxStop(function(){
+               ok( false, "ajaxStop" );
+       }).ajaxSend(function(){
+               ok( false, "ajaxSend" );
+       }).ajaxComplete(function(){
+               ok( false, "ajaxComplete" );
+       }).ajaxError(function(){
+               ok( false, "ajaxError" );
+       }).ajaxSuccess(function(){
+               ok( false, "ajaxSuccess" );
+       });
+       
+       $.ajax({
+               global: false,
+               url: url("data/name.html"),
+               beforeSend: function(){ ok(true, "beforeSend"); },
+               success: function(){ ok(true, "success"); },
+               error: function(){ ok(false, "error"); },
+               complete: function(){
+                 ok(true, "complete");
+                 setTimeout(function(){ start(); }, 13);
+        }
+       });
+});
+
+test("$.ajax - xml: non-namespace elements inside namespaced elements", function() {
+       expect(3);
+       stop();
+       $.ajax({
+         url: url("data/with_fries.xml"),
+         dataType: "xml",
+         success: function(resp) {
+           equals( $("properties", resp).length, 1, 'properties in responseXML' );
+           equals( $("jsconf", resp).length, 1, 'jsconf in responseXML' );
+           equals( $("thing", resp).length, 2, 'things in responseXML' );
+           start();
+         }
+       });
+});
+
+test("$.ajax - beforeSend", function() {
+       expect(1);
+       stop();
+       
+       var check = false;
+       
+       $.ajaxSetup({ timeout: 0 });
+       
+       $.ajax({
+               url: url("data/name.html"), 
+               beforeSend: function(xml) {
+                       check = true;
+               },
+               success: function(data) {
+                       ok( check, "check beforeSend was executed" );
+                       start();
+               }
+       });
+});
+
+var foobar;
+
+test("$.ajax - dataType html", function() {
+       expect(5);
+       stop();
+       
+       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' );
+         start();
+       };
+
+       $.ajax({
+         dataType: "html",
+         url: url("data/test.html"),
+         success: function(data) {
+               $("#ap").html(data);
+           ok( data.match(/^html text/), 'Check content for datatype html' );
+           setTimeout(verifyEvaluation, 600);
+         }
+       });
+});
+
+test("serialize()", function() {
+       expect(6);
+       
+       equals( $('#form').serialize(),
+               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1",
+               'Check form serialization as query string');
+               
+       equals( $('#form :input').serialize(),
+               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1",
+               'Check input serialization as query string');
+       
+       equals( $('#testForm').serialize(), 
+               'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=', 
+               'Check form serialization as query string');
+               
+       equals( $('#testForm :input').serialize(), 
+               'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=', 
+               'Check input serialization as query string');
+               
+       equals( $('#form, #testForm').serialize(),
+               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
+               'Multiple form serialization as query string');
+               
+       equals( $('#form, #testForm :input').serialize(),
+               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
+               'Mixed form/input serialization as query string');
+});
+
+test("$.param()", function() {
+       expect(4);
+       var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
+       equals( $.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
+       
+       params = {someName: [1, 2, 3], regularThing: "blah" };
+       equals( $.param(params), "someName=1&someName=2&someName=3&regularThing=blah", "with array" );
+       
+       params = {"foo[]":["baz", 42, "All your base are belong to us"]};
+       equals( $.param(params), "foo%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=All+your+base+are+belong+to+us", "more array" );
+       
+       params = {"foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us"};
+       equals( $.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All+your+base+are+belong+to+us", "even more arrays" );
+});
+
+test("synchronous request", function() {
+       expect(1);
+       ok( /^{ "data"/.test( $.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
+});
+
+test("synchronous request with callbacks", function() {
+       expect(2);
+       var result;
+       $.ajax({url: url("data/json_obj.js"), async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
+       ok( /^{ "data"/.test( result ), "check returned text" );
+});
+
+test("pass-through request object", function() {
+       expect(1);
+       stop(true);
+       
+       var target = "data/name.html";
+       var count = 0;
+       var success = function() {
+               // Disabled
+               //if(count++ == 5)
+               start();
+       };
+       
+       /* Test disabled, too many simultaneous requests
+       ok( $.get(url(target), success), "get" );
+       ok( $.post(url(target), success), "post" );
+       ok( $.getScript(url("data/test.js"), success), "script" );
+       ok( $.getJSON(url("data/json_obj.js"), success), "json" );
+       */
+       ok( $.ajax({url: url(target), success: success}), "generic" );
+});
+
+test("global ajaxSettings", function() {
+       expect(3);
+
+       var tmp = jQuery.extend({}, jQuery.ajaxSettings);
+    var orig = { url: "data/with_fries.xml", data: null };
+       var t;
+
+       $.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
+
+    t = jQuery.extend({}, orig);
+    $.ajax(t);
+       ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending null" );
+
+    t = jQuery.extend({}, orig);
+       t.data = {};
+    $.ajax(t);
+       ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );
+
+    t = jQuery.extend({}, orig);
+       t.data = { zoo: 'a', ping: 'b' };
+    $.ajax(t);
+       ok( t.url.indexOf('ping') > -1 && t.url.indexOf('zoo') > -1 && t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending { zoo: 'a', ping: 'b' }" );
+       
+       jQuery.ajaxSettings = tmp;
+});
+
+test("load(String)", function() {
+       expect(1);
+       stop(true); // check if load can be called with only url
+       $('#first').load("data/name.html", start);
+});
+
+test("load('url selector')", function() {
+       expect(1);
+       stop(true); // check if load can be called with only url
+       $('#first').load("data/test3.html div.user", function(){
+               equals( $(this).children("div").length, 2, "Verify that specific elements were injected" );
+               start();
+       });
+});
+
+test("load(String, Function) - simple: inject text into DOM", function() {
+       expect(2);
+       stop();
+       $('#first').load(url("data/name.html"), function() {
+               ok( /^ERROR/.test($('#first').text()), 'Check if content was injected into the DOM' );
+               start();
+       });
+});
+
+test("load(String, Function) - check scripts", function() {
+       expect(7);
+       stop();
+       window.testFoo = undefined;
+       window.foobar = null;
+       var verifyEvaluation = function() {
+         equals( foobar, "bar", 'Check if script src was evaluated after load' );
+         equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
+         start();
+       };
+       $('#first').load(url('data/test.html'), function() {
+         ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
+         equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+         equals( testFoo, "foo", 'Check if script was evaluated after load' );
+         setTimeout(verifyEvaluation, 600);
+       });
+});
+
+test("load(String, Function) - check file with only a script tag", function() {
+       expect(3);
+       stop();
+       testFoo = undefined;
+       $('#first').load(url('data/test2.html'), function() {
+         ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
+         ok( testFoo == "foo", 'Check if script was evaluated after load' );
+         start();
+       });
+});
+
+test("$.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
+       expect(2);
+       stop();
+       $.get(url('data/dashboard.xml'), function(xml) {
+               var content = [];
+               $('tab', xml).each(function() {
+                       content.push($(this).text());
+               });
+               equals( content[0], 'blabla', 'Check first tab');
+               equals( content[1], 'blublu', 'Check second tab');
+               start();
+       });
+});
+
+test("$.getScript(String, Function) - with callback", function() {
+       expect(2);
+       stop();
+       $.getScript(url("data/test.js"), function() {
+               equals( foobar, "bar", 'Check if script was evaluated' );
+               setTimeout(start, 100);
+       });
+});
+
+test("$.getScript(String, Function) - no callback", function() {
+       expect(1);
+       stop(true);
+       $.getScript(url("data/test.js"), start);
+});
+
+if ( !isLocal ) {
+
+test("$.ajax() - JSONP, Local", function() {
+       expect(7);
+
+       var count = 0;
+       function plus(){ if ( ++count == 7 ) start(); }
+
+       stop();
+
+       $.ajax({
+               url: "data/jsonp.php",
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, no callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               url: "data/jsonp.php?callback=?",
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, url callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               url: "data/jsonp.php",
+               dataType: "jsonp",
+               data: "callback=?",
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, data callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               url: "data/jsonp.php",
+               dataType: "jsonp",
+               data: { callback: "?" },
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, data obj callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               type: "POST",
+               url: "data/jsonp.php",
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (POST, no callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               type: "POST",
+               url: "data/jsonp.php",
+               data: "callback=?",
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (POST, data callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               type: "POST",
+               url: "data/jsonp.php",
+               data: { callback: "?" },
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (POST, data obj callback)" );
+                       plus();
+               }
+       });
+});
+
+test("$.ajax() - JSONP, Remote", function() {
+       expect(4);
+
+       var count = 0;
+       function plus(){ if ( ++count == 4 ) start(); }
+
+       var base = window.location.href.replace(/\?.*$/, "");
+
+       stop();
+
+       $.ajax({
+               url: base + "data/jsonp.php",
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, no callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               url: base + "data/jsonp.php?callback=?",
+               dataType: "jsonp",
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, url callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               url: base + "data/jsonp.php",
+               dataType: "jsonp",
+               data: "callback=?",
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, data callback)" );
+                       plus();
+               }
+       });
+
+       $.ajax({
+               url: base + "data/jsonp.php",
+               dataType: "jsonp",
+               data: { callback: "?" },
+               success: function(data){
+                       ok( data.data, "JSON results returned (GET, data obj callback)" );
+                       plus();
+               }
+       });
+});
+
+test("$.ajax() - script, Remote", function() {
+       expect(2);
+
+       var base = window.location.href.replace(/\?.*$/, "");
+
+       stop();
+
+       $.ajax({
+               url: base + "data/test.js",
+               dataType: "script",
+               success: function(data){
+                       ok( foobar, "Script results returned (GET, no callback)" );
+                       start();
+               }
+       });
+});
+
+test("$.getJSON(String, Hash, Function) - JSON array", function() {
+       expect(4);
+       stop();
+       $.getJSON(url("data/json.php"), {json: "array"}, function(json) {
+         ok( json[0].name == 'John', 'Check JSON: first, name' );
+         ok( json[0].age == 21, 'Check JSON: first, age' );
+         ok( json[1].name == 'Peter', 'Check JSON: second, name' );
+         ok( json[1].age == 25, 'Check JSON: second, age' );
+         start();
+       });
+});
+
+test("$.getJSON(String, Function) - JSON object", function() {
+       expect(2);
+       stop();
+       $.getJSON(url("data/json.php"), function(json) {
+         ok( json.data.lang == 'en', 'Check JSON: lang' );
+         ok( json.data.length == 25, 'Check JSON: length' );
+         start();
+       });
+});
+
+test("$.post(String, Hash, Function) - simple with xml", function() {
+       expect(2);
+       stop();
+       $.post(url("data/name.php"), {xml: "5-2"}, function(xml){
+         $('math', xml).each(function() {
+                   ok( $('calculation', this).text() == '5-2', 'Check for XML' );
+                   ok( $('result', this).text() == '3', 'Check for XML' );
+                });
+         start();
+       });
+});
+
+test("$.ajaxSetup({timeout: Number}) - with global timeout", function() {
+       stop();
+       
+       var passed = 0;
+
+       $.ajaxSetup({timeout: 1000});
+       
+       var pass = function() {
+               passed++;
+               if ( passed == 2 ) {
+                       ok( true, 'Check local and global callbacks after timeout' );
+               $('#main').unbind("ajaxError");
+                       start();
+               }
+       };
+       
+       var fail = function(a,b,c) {
+               ok( false, 'Check for timeout failed ' + a + ' ' + b );
+               start();
+       };
+       
+       $('#main').ajaxError(pass);
+       
+       $.ajax({
+         type: "GET",
+         url: url("data/name.php?wait=5"),
+         error: pass,
+         success: fail
+       });
+       
+       // reset timeout
+       $.ajaxSetup({timeout: 0});
+});
+
+test("$.ajaxSetup({timeout: Number}) with localtimeout", function() {
+       stop();
+       $.ajaxSetup({timeout: 50});
+
+       $.ajax({
+         type: "GET",
+         timeout: 5000,
+         url: url("data/name.php?wait=1"),
+         error: function() {
+                  ok( false, 'Check for local timeout failed' );
+                  start();
+         },
+         success: function() {
+           ok( true, 'Check for local timeout' );
+           start();
+         }
+       });
+
+       // reset timeout
+       $.ajaxSetup({timeout: 0});
+});
+
+test("$.ajax - simple get", function() {
+       expect(1);
+       stop();
+       $.ajax({
+         type: "GET",
+         url: url("data/name.php?name=foo"),
+         success: function(msg){
+           ok( msg == 'bar', 'Check for GET' );
+           start();
+         }
+       });
+});
+
+test("$.ajax - simple post", function() {
+       expect(1);
+       stop();
+       $.ajax({
+         type: "POST",
+         url: url("data/name.php"),
+         data: "name=peter",
+         success: function(msg){
+           ok( msg == 'pan', 'Check for POST' );
+           start();
+         }
+       });
+});
+
+test("ajaxSetup()", function() {
+       expect(1);
+       stop();
+       $.ajaxSetup({
+               url: url("data/name.php?name=foo"),
+               success: function(msg){
+               ok( msg == 'bar', 'Check for GET' );
+                       start();
+               }
+       });
+       $.ajax();
+});
+
+test("custom timeout does not set error message when timeout occurs, see #970", function() {
+       stop();
+       $.ajax({
+               url: "data/name.php?wait=10",
+               timeout: 500,
+               error: function(request, status) {
+                       ok( status != null, "status shouldn't be null in error handler" );
+                       equals( "timeout", status );
+                       start();
+               }
+       });
+});
+
+}
+
+//}
diff --git a/test/unit/ajaxTest.js b/test/unit/ajaxTest.js
deleted file mode 100644 (file)
index 872ec08..0000000
+++ /dev/null
@@ -1,641 +0,0 @@
-module("ajax");
-
-// Safari 3 randomly crashes when running these tests,
-// but only in the full suite - you can run just the Ajax
-// tests and they'll pass
-//if ( !jQuery.browser.safari ) {
-
-test("$.ajax() - success callbacks", function() {
-       expect( 8 );
-       
-       $.ajaxSetup({ timeout: 0 });
-       
-       stop();
-       
-       setTimeout(function(){  
-        $('#foo').ajaxStart(function(){
-            ok( true, "ajaxStart" );
-        }).ajaxStop(function(){
-            ok( true, "ajaxStop" );
-            start();
-        }).ajaxSend(function(){
-            ok( true, "ajaxSend" );
-        }).ajaxComplete(function(){
-            ok( true, "ajaxComplete" );
-        }).ajaxError(function(){
-            ok( false, "ajaxError" );
-        }).ajaxSuccess(function(){
-            ok( true, "ajaxSuccess" );
-        });
-        
-        $.ajax({
-            url: url("data/name.html"),
-            beforeSend: function(){ ok(true, "beforeSend"); },
-            success: function(){ ok(true, "success"); },
-            error: function(){ ok(false, "error"); },
-            complete: function(){ ok(true, "complete"); }
-        });
-    }, 13);
-});
-
-if ( !isLocal ) {
-       test("$.ajax() - error callbacks", function() {
-               expect( 8 );
-               stop();
-               
-               $('#foo').ajaxStart(function(){
-                       ok( true, "ajaxStart" );
-               }).ajaxStop(function(){
-                       ok( true, "ajaxStop" );
-                       start();
-               }).ajaxSend(function(){
-                       ok( true, "ajaxSend" );
-               }).ajaxComplete(function(){
-                       ok( true, "ajaxComplete" );
-               }).ajaxError(function(){
-                       ok( true, "ajaxError" );
-               }).ajaxSuccess(function(){
-                       ok( false, "ajaxSuccess" );
-               });
-               
-               $.ajaxSetup({ timeout: 500 });
-               
-               $.ajax({
-                       url: url("data/name.php?wait=5"),
-                       beforeSend: function(){ ok(true, "beforeSend"); },
-                       success: function(){ ok(false, "success"); },
-                       error: function(){ ok(true, "error"); },
-                       complete: function(){ ok(true, "complete"); }
-               });
-       });
-}
-
-test("$.ajax() - disabled globals", function() {
-       expect( 3 );
-       stop();
-       
-       $('#foo').ajaxStart(function(){
-               ok( false, "ajaxStart" );
-       }).ajaxStop(function(){
-               ok( false, "ajaxStop" );
-       }).ajaxSend(function(){
-               ok( false, "ajaxSend" );
-       }).ajaxComplete(function(){
-               ok( false, "ajaxComplete" );
-       }).ajaxError(function(){
-               ok( false, "ajaxError" );
-       }).ajaxSuccess(function(){
-               ok( false, "ajaxSuccess" );
-       });
-       
-       $.ajax({
-               global: false,
-               url: url("data/name.html"),
-               beforeSend: function(){ ok(true, "beforeSend"); },
-               success: function(){ ok(true, "success"); },
-               error: function(){ ok(false, "error"); },
-               complete: function(){
-                 ok(true, "complete");
-                 setTimeout(function(){ start(); }, 13);
-        }
-       });
-});
-
-test("$.ajax - xml: non-namespace elements inside namespaced elements", function() {
-       expect(3);
-       stop();
-       $.ajax({
-         url: url("data/with_fries.xml"),
-         dataType: "xml",
-         success: function(resp) {
-           equals( $("properties", resp).length, 1, 'properties in responseXML' );
-           equals( $("jsconf", resp).length, 1, 'jsconf in responseXML' );
-           equals( $("thing", resp).length, 2, 'things in responseXML' );
-           start();
-         }
-       });
-});
-
-test("$.ajax - beforeSend", function() {
-       expect(1);
-       stop();
-       
-       var check = false;
-       
-       $.ajaxSetup({ timeout: 0 });
-       
-       $.ajax({
-               url: url("data/name.html"), 
-               beforeSend: function(xml) {
-                       check = true;
-               },
-               success: function(data) {
-                       ok( check, "check beforeSend was executed" );
-                       start();
-               }
-       });
-});
-
-var foobar;
-
-test("$.ajax - dataType html", function() {
-       expect(5);
-       stop();
-       
-       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' );
-         start();
-       };
-
-       $.ajax({
-         dataType: "html",
-         url: url("data/test.html"),
-         success: function(data) {
-               $("#ap").html(data);
-           ok( data.match(/^html text/), 'Check content for datatype html' );
-           setTimeout(verifyEvaluation, 600);
-         }
-       });
-});
-
-test("serialize()", function() {
-       expect(6);
-       
-       equals( $('#form').serialize(),
-               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1",
-               'Check form serialization as query string');
-               
-       equals( $('#form :input').serialize(),
-               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1",
-               'Check input serialization as query string');
-       
-       equals( $('#testForm').serialize(), 
-               'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=', 
-               'Check form serialization as query string');
-               
-       equals( $('#testForm :input').serialize(), 
-               'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=', 
-               'Check input serialization as query string');
-               
-       equals( $('#form, #testForm').serialize(),
-               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
-               'Multiple form serialization as query string');
-               
-       equals( $('#form, #testForm :input').serialize(),
-               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=0&select3=1&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
-               'Mixed form/input serialization as query string');
-});
-
-test("$.param()", function() {
-       expect(4);
-       var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
-       equals( $.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
-       
-       params = {someName: [1, 2, 3], regularThing: "blah" };
-       equals( $.param(params), "someName=1&someName=2&someName=3&regularThing=blah", "with array" );
-       
-       params = {"foo[]":["baz", 42, "All your base are belong to us"]};
-       equals( $.param(params), "foo%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=All+your+base+are+belong+to+us", "more array" );
-       
-       params = {"foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us"};
-       equals( $.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All+your+base+are+belong+to+us", "even more arrays" );
-});
-
-test("synchronous request", function() {
-       expect(1);
-       ok( /^{ "data"/.test( $.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
-});
-
-test("synchronous request with callbacks", function() {
-       expect(2);
-       var result;
-       $.ajax({url: url("data/json_obj.js"), async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
-       ok( /^{ "data"/.test( result ), "check returned text" );
-});
-
-test("pass-through request object", function() {
-       expect(1);
-       stop(true);
-       
-       var target = "data/name.html";
-       var count = 0;
-       var success = function() {
-               // Disabled
-               //if(count++ == 5)
-               start();
-       };
-       
-       /* Test disabled, too many simultaneous requests
-       ok( $.get(url(target), success), "get" );
-       ok( $.post(url(target), success), "post" );
-       ok( $.getScript(url("data/test.js"), success), "script" );
-       ok( $.getJSON(url("data/json_obj.js"), success), "json" );
-       */
-       ok( $.ajax({url: url(target), success: success}), "generic" );
-});
-
-test("global ajaxSettings", function() {
-       expect(3);
-
-       var tmp = jQuery.extend({}, jQuery.ajaxSettings);
-    var orig = { url: "data/with_fries.xml", data: null };
-       var t;
-
-       $.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
-
-    t = jQuery.extend({}, orig);
-    $.ajax(t);
-       ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending null" );
-
-    t = jQuery.extend({}, orig);
-       t.data = {};
-    $.ajax(t);
-       ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );
-
-    t = jQuery.extend({}, orig);
-       t.data = { zoo: 'a', ping: 'b' };
-    $.ajax(t);
-       ok( t.url.indexOf('ping') > -1 && t.url.indexOf('zoo') > -1 && t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending { zoo: 'a', ping: 'b' }" );
-       
-       jQuery.ajaxSettings = tmp;
-});
-
-test("load(String)", function() {
-       expect(1);
-       stop(true); // check if load can be called with only url
-       $('#first').load("data/name.html", start);
-});
-
-test("load('url selector')", function() {
-       expect(1);
-       stop(true); // check if load can be called with only url
-       $('#first').load("data/test3.html div.user", function(){
-               equals( $(this).children("div").length, 2, "Verify that specific elements were injected" );
-               start();
-       });
-});
-
-test("load(String, Function) - simple: inject text into DOM", function() {
-       expect(2);
-       stop();
-       $('#first').load(url("data/name.html"), function() {
-               ok( /^ERROR/.test($('#first').text()), 'Check if content was injected into the DOM' );
-               start();
-       });
-});
-
-test("load(String, Function) - check scripts", function() {
-       expect(7);
-       stop();
-       window.testFoo = undefined;
-       window.foobar = null;
-       var verifyEvaluation = function() {
-         equals( foobar, "bar", 'Check if script src was evaluated after load' );
-         equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
-         start();
-       };
-       $('#first').load(url('data/test.html'), function() {
-         ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
-         equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
-         equals( testFoo, "foo", 'Check if script was evaluated after load' );
-         setTimeout(verifyEvaluation, 600);
-       });
-});
-
-test("load(String, Function) - check file with only a script tag", function() {
-       expect(3);
-       stop();
-       testFoo = undefined;
-       $('#first').load(url('data/test2.html'), function() {
-         ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
-         ok( testFoo == "foo", 'Check if script was evaluated after load' );
-         start();
-       });
-});
-
-test("$.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
-       expect(2);
-       stop();
-       $.get(url('data/dashboard.xml'), function(xml) {
-               var content = [];
-               $('tab', xml).each(function() {
-                       content.push($(this).text());
-               });
-               equals( content[0], 'blabla', 'Check first tab');
-               equals( content[1], 'blublu', 'Check second tab');
-               start();
-       });
-});
-
-test("$.getScript(String, Function) - with callback", function() {
-       expect(2);
-       stop();
-       $.getScript(url("data/test.js"), function() {
-               equals( foobar, "bar", 'Check if script was evaluated' );
-               setTimeout(start, 100);
-       });
-});
-
-test("$.getScript(String, Function) - no callback", function() {
-       expect(1);
-       stop(true);
-       $.getScript(url("data/test.js"), start);
-});
-
-if ( !isLocal ) {
-
-test("$.ajax() - JSONP, Local", function() {
-       expect(7);
-
-       var count = 0;
-       function plus(){ if ( ++count == 7 ) start(); }
-
-       stop();
-
-       $.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, no callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               url: "data/jsonp.php?callback=?",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, url callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               data: "callback=?",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               data: { callback: "?" },
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data obj callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               type: "POST",
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (POST, no callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               type: "POST",
-               url: "data/jsonp.php",
-               data: "callback=?",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (POST, data callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               type: "POST",
-               url: "data/jsonp.php",
-               data: { callback: "?" },
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (POST, data obj callback)" );
-                       plus();
-               }
-       });
-});
-
-test("$.ajax() - JSONP, Remote", function() {
-       expect(4);
-
-       var count = 0;
-       function plus(){ if ( ++count == 4 ) start(); }
-
-       var base = window.location.href.replace(/\?.*$/, "");
-
-       stop();
-
-       $.ajax({
-               url: base + "data/jsonp.php",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, no callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               url: base + "data/jsonp.php?callback=?",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, url callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               url: base + "data/jsonp.php",
-               dataType: "jsonp",
-               data: "callback=?",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data callback)" );
-                       plus();
-               }
-       });
-
-       $.ajax({
-               url: base + "data/jsonp.php",
-               dataType: "jsonp",
-               data: { callback: "?" },
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data obj callback)" );
-                       plus();
-               }
-       });
-});
-
-test("$.ajax() - script, Remote", function() {
-       expect(2);
-
-       var base = window.location.href.replace(/\?.*$/, "");
-
-       stop();
-
-       $.ajax({
-               url: base + "data/test.js",
-               dataType: "script",
-               success: function(data){
-                       ok( foobar, "Script results returned (GET, no callback)" );
-                       start();
-               }
-       });
-});
-
-test("$.getJSON(String, Hash, Function) - JSON array", function() {
-       expect(4);
-       stop();
-       $.getJSON(url("data/json.php"), {json: "array"}, function(json) {
-         ok( json[0].name == 'John', 'Check JSON: first, name' );
-         ok( json[0].age == 21, 'Check JSON: first, age' );
-         ok( json[1].name == 'Peter', 'Check JSON: second, name' );
-         ok( json[1].age == 25, 'Check JSON: second, age' );
-         start();
-       });
-});
-
-test("$.getJSON(String, Function) - JSON object", function() {
-       expect(2);
-       stop();
-       $.getJSON(url("data/json.php"), function(json) {
-         ok( json.data.lang == 'en', 'Check JSON: lang' );
-         ok( json.data.length == 25, 'Check JSON: length' );
-         start();
-       });
-});
-
-test("$.post(String, Hash, Function) - simple with xml", function() {
-       expect(2);
-       stop();
-       $.post(url("data/name.php"), {xml: "5-2"}, function(xml){
-         $('math', xml).each(function() {
-                   ok( $('calculation', this).text() == '5-2', 'Check for XML' );
-                   ok( $('result', this).text() == '3', 'Check for XML' );
-                });
-         start();
-       });
-});
-
-test("$.ajaxSetup({timeout: Number}) - with global timeout", function() {
-       stop();
-       
-       var passed = 0;
-
-       $.ajaxSetup({timeout: 1000});
-       
-       var pass = function() {
-               passed++;
-               if ( passed == 2 ) {
-                       ok( true, 'Check local and global callbacks after timeout' );
-               $('#main').unbind("ajaxError");
-                       start();
-               }
-       };
-       
-       var fail = function(a,b,c) {
-               ok( false, 'Check for timeout failed ' + a + ' ' + b );
-               start();
-       };
-       
-       $('#main').ajaxError(pass);
-       
-       $.ajax({
-         type: "GET",
-         url: url("data/name.php?wait=5"),
-         error: pass,
-         success: fail
-       });
-       
-       // reset timeout
-       $.ajaxSetup({timeout: 0});
-});
-
-test("$.ajaxSetup({timeout: Number}) with localtimeout", function() {
-       stop();
-       $.ajaxSetup({timeout: 50});
-
-       $.ajax({
-         type: "GET",
-         timeout: 5000,
-         url: url("data/name.php?wait=1"),
-         error: function() {
-                  ok( false, 'Check for local timeout failed' );
-                  start();
-         },
-         success: function() {
-           ok( true, 'Check for local timeout' );
-           start();
-         }
-       });
-
-       // reset timeout
-       $.ajaxSetup({timeout: 0});
-});
-
-test("$.ajax - simple get", function() {
-       expect(1);
-       stop();
-       $.ajax({
-         type: "GET",
-         url: url("data/name.php?name=foo"),
-         success: function(msg){
-           ok( msg == 'bar', 'Check for GET' );
-           start();
-         }
-       });
-});
-
-test("$.ajax - simple post", function() {
-       expect(1);
-       stop();
-       $.ajax({
-         type: "POST",
-         url: url("data/name.php"),
-         data: "name=peter",
-         success: function(msg){
-           ok( msg == 'pan', 'Check for POST' );
-           start();
-         }
-       });
-});
-
-test("ajaxSetup()", function() {
-       expect(1);
-       stop();
-       $.ajaxSetup({
-               url: url("data/name.php?name=foo"),
-               success: function(msg){
-               ok( msg == 'bar', 'Check for GET' );
-                       start();
-               }
-       });
-       $.ajax();
-});
-
-test("custom timeout does not set error message when timeout occurs, see #970", function() {
-       stop();
-       $.ajax({
-               url: "data/name.php?wait=10",
-               timeout: 500,
-               error: function(request, status) {
-                       ok( status != null, "status shouldn't be null in error handler" );
-                       equals( "timeout", status );
-                       start();
-               }
-       });
-});
-
-}
-
-//}
diff --git a/test/unit/core.js b/test/unit/core.js
new file mode 100644 (file)
index 0000000..db47856
--- /dev/null
@@ -0,0 +1,1065 @@
+module("core");
+
+test("Basic requirements", function() {
+       expect(7);
+       ok( Array.prototype.push, "Array.push()" );
+       ok( Function.prototype.apply, "Function.apply()" );
+       ok( document.getElementById, "getElementById" );
+       ok( document.getElementsByTagName, "getElementsByTagName" );
+       ok( RegExp, "RegExp" );
+       ok( jQuery, "jQuery" );
+       ok( $, "$()" );
+});
+
+test("$()", function() {
+       expect(5);
+       
+       var main = $("#main");
+       isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
+       
+       // make sure this is handled
+       $('<p>\r\n</p>');
+       ok( true, "Check for \\r and \\n in jQuery()" );
+       
+       /* // Disabled until we add this functionality in
+       var pass = true;
+       try {
+               $("<div>Testing</div>").appendTo(document.getElementById("iframe").contentDocument.body);
+       } catch(e){
+               pass = false;
+       }
+       ok( pass, "$('&lt;tag&gt;') needs optional document parameter to ease cross-frame DOM wrangling, see #968" );*/
+
+       var code = $("<code/>");
+       equals( code.length, 1, "Correct number of elements generated for code" );
+       var img = $("<img/>");
+       equals( img.length, 1, "Correct number of elements generated for img" );
+       var div = $("<div/><hr/><code/><b/>");
+       equals( div.length, 4, "Correct number of elements generated for div hr code b" );
+});
+
+test("isFunction", function() {
+       expect(21);
+
+       // Make sure that false values return false
+       ok( !jQuery.isFunction(), "No Value" );
+       ok( !jQuery.isFunction( null ), "null Value" );
+       ok( !jQuery.isFunction( undefined ), "undefined Value" );
+       ok( !jQuery.isFunction( "" ), "Empty String Value" );
+       ok( !jQuery.isFunction( 0 ), "0 Value" );
+
+       // Check built-ins
+       // Safari uses "(Internal Function)"
+       ok( jQuery.isFunction(String), "String Function" );
+       ok( jQuery.isFunction(Array), "Array Function" );
+       ok( jQuery.isFunction(Object), "Object Function" );
+       ok( jQuery.isFunction(Function), "Function Function" );
+
+       // When stringified, this could be misinterpreted
+       var mystr = "function";
+       ok( !jQuery.isFunction(mystr), "Function String" );
+
+       // When stringified, this could be misinterpreted
+       var myarr = [ "function" ];
+       ok( !jQuery.isFunction(myarr), "Function Array" );
+
+       // When stringified, this could be misinterpreted
+       var myfunction = { "function": "test" };
+       ok( !jQuery.isFunction(myfunction), "Function Object" );
+
+       // Make sure normal functions still work
+       var fn = function(){};
+       ok( jQuery.isFunction(fn), "Normal Function" );
+
+       var obj = document.createElement("object");
+
+       // Firefox says this is a function
+       ok( !jQuery.isFunction(obj), "Object Element" );
+
+       // IE says this is an object
+       ok( jQuery.isFunction(obj.getAttribute), "getAttribute Function" );
+
+       var nodes = document.body.childNodes;
+
+       // Safari says this is a function
+       ok( !jQuery.isFunction(nodes), "childNodes Property" );
+
+       var first = document.body.firstChild;
+       
+       // Normal elements are reported ok everywhere
+       ok( !jQuery.isFunction(first), "A normal DOM Element" );
+
+       var input = document.createElement("input");
+       input.type = "text";
+       document.body.appendChild( input );
+
+       // IE says this is an object
+       ok( jQuery.isFunction(input.focus), "A default function property" );
+
+       document.body.removeChild( input );
+
+       var a = document.createElement("a");
+       a.href = "some-function";
+       document.body.appendChild( a );
+
+       // This serializes with the word 'function' in it
+       ok( !jQuery.isFunction(a), "Anchor Element" );
+
+       document.body.removeChild( a );
+
+       // Recursive function calls have lengths and array-like properties
+       function callme(callback){
+               function fn(response){
+                       callback(response);
+               }
+
+               ok( jQuery.isFunction(fn), "Recursive Function Call" );
+
+       fn({ some: "data" });
+       };
+
+       callme(function(){
+       callme(function(){});
+       });
+});
+
+test("$('html')", function() {
+       expect(2);
+       
+       reset();
+       ok( $("<script>var foo='test';</script>")[0], "Creating a script" );
+       
+       reset();
+       ok( $("<link rel='stylesheet'/>")[0], "Creating a link" );
+       
+       reset();
+});
+
+test("length", function() {
+       expect(1);
+       ok( $("p").length == 6, "Get Number of Elements Found" );
+});
+
+test("size()", function() {
+       expect(1);
+       ok( $("p").size() == 6, "Get Number of Elements Found" );
+});
+
+test("get()", function() {
+       expect(1);
+       isSet( $("p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" );
+});
+
+test("get(Number)", function() {
+       expect(1);
+       ok( $("p").get(0) == document.getElementById("firstp"), "Get A Single Element" );
+});
+
+test("add(String|Element|Array)", function() {
+       expect(7);
+       isSet( $("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
+       isSet( $("#sndp").add( $("#en")[0] ).add( $("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
+       ok( $([]).add($("#form")[0].elements).length >= 13, "Check elements from array" );
+       
+       var x = $([]).add($("<p id='x1'>xxx</p>")).add($("<p id='x2'>xxx</p>"));
+       ok( x[0].id == "x1", "Check on-the-fly element1" );
+       ok( x[1].id == "x2", "Check on-the-fly element2" );
+       
+       var x = $([]).add("<p id='x1'>xxx</p>").add("<p id='x2'>xxx</p>");
+       ok( x[0].id == "x1", "Check on-the-fly element1" );
+       ok( x[1].id == "x2", "Check on-the-fly element2" );
+});
+
+test("each(Function)", function() {
+       expect(1);
+       var div = $("div");
+       div.each(function(){this.foo = 'zoo';});
+       var pass = true;
+       for ( var i = 0; i < div.size(); i++ ) {
+         if ( div.get(i).foo != "zoo" ) pass = false;
+       }
+       ok( pass, "Execute a function, Relative" );
+});
+
+test("index(Object)", function() {
+       expect(8);
+       ok( $([window, document]).index(window) == 0, "Check for index of elements" );
+       ok( $([window, document]).index(document) == 1, "Check for index of elements" );
+       var inputElements = $('#radio1,#radio2,#check1,#check2');
+       ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" );
+       ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" );
+       ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" );
+       ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" );
+       ok( inputElements.index(window) == -1, "Check for not found index" );
+       ok( inputElements.index(document) == -1, "Check for not found index" );
+});
+
+test("attr(String)", function() {
+       expect(13);
+       ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
+       ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
+       ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
+       ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
+       ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
+       ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
+       ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
+       ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );
+       ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );
+       ok( $('#name').attr('name') == "name", 'Check for name attribute' );
+       ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
+       ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
+       
+       $('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
+       ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
+});
+
+test("attr(String) in XML Files", function() {
+       expect(2);
+       stop();
+       $.get("data/dashboard.xml", function(xml) {
+               ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
+               ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
+               start();
+       });
+});
+
+test("attr(String, Function)", function() {
+       expect(2);
+       ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
+       ok( $('#text1').attr('title', function(i) { return i }).attr('title') == "0", "Set value with an index");
+});
+
+test("attr(Hash)", function() {
+       expect(1);
+       var pass = true;
+       $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
+         if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
+       });
+       ok( pass, "Set Multiple Attributes" );
+});
+
+test("attr(String, Object)", function() {
+       expect(12);
+       var div = $("div");
+       div.attr("foo", "bar");
+       var pass = true;
+       for ( var i = 0; i < div.size(); i++ ) {
+         if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
+       }
+       ok( pass, "Set Attribute" );
+
+       ok( $("#foo").attr({"width": null}), "Try to set an attribute to nothing" );    
+       
+       $("#name").attr('name', 'something');
+       ok( $("#name").attr('name') == 'something', 'Set name attribute' );
+       $("#check2").attr('checked', true);
+       ok( document.getElementById('check2').checked == true, 'Set checked attribute' );
+       $("#check2").attr('checked', false);
+       ok( document.getElementById('check2').checked == false, 'Set checked attribute' );
+       $("#text1").attr('readonly', true);
+       ok( document.getElementById('text1').readOnly == true, 'Set readonly attribute' );
+       $("#text1").attr('readonly', false);
+       ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' );
+       $("#name").attr('maxlength', '5');
+       ok( document.getElementById('name').maxLength == '5', 'Set maxlength attribute' );
+
+       reset();
+
+       var type = $("#check2").attr('type');
+       var thrown = false;
+       try {
+               $("#check2").attr('type','hidden');
+       } catch(e) {
+               thrown = true;
+       }
+       ok( thrown, "Exception thrown when trying to change type property" );
+       equals( type, $("#check2").attr('type'), "Verify that you can't change the type of an input element" );
+
+       var check = document.createElement("input");
+       var thrown = true;
+       try {
+               $(check).attr('type','checkbox');
+       } catch(e) {
+               thrown = false;
+       }
+       ok( thrown, "Exception thrown when trying to change type property" );
+       equals( "checkbox", $(check).attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
+});
+
+test("attr(String, Object) - Loaded via XML document", function() {
+       expect(2);
+       stop();
+       $.get('data/dashboard.xml', function(xml) { 
+               var titles = [];
+               $('tab', xml).each(function() {
+                       titles.push($(this).attr('title'));
+               });
+               ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
+               ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
+               start();
+       });
+});
+
+test("css(String|Hash)", function() {
+       expect(19);
+       
+       ok( $('#main').css("display") == 'none', 'Check for css property "display"');
+       
+       ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
+       $('#foo').css({display: 'none'});
+       ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
+       $('#foo').css({display: 'block'});
+       ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+       
+       $('#floatTest').css({styleFloat: 'right'});
+       ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right');
+       $('#floatTest').css({cssFloat: 'left'});
+       ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
+       $('#floatTest').css({'float': 'right'});
+       ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right');
+       $('#floatTest').css({'font-size': '30px'});
+       ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');
+       
+       $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
+               $('#foo').css({opacity: n});
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
+               $('#foo').css({opacity: parseFloat(n)});
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
+       });     
+       $('#foo').css({opacity: ''});
+       ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
+});
+
+test("css(String, Object)", function() {
+       expect(18);
+       ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
+       $('#foo').css('display', 'none');
+       ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
+       $('#foo').css('display', 'block');
+       ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+       
+       $('#floatTest').css('styleFloat', 'left');
+       ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left');
+       $('#floatTest').css('cssFloat', 'right');
+       ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+       $('#floatTest').css('float', 'left');
+       ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left');
+       $('#floatTest').css('font-size', '20px');
+       ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');
+       
+       $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
+               $('#foo').css('opacity', n);
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
+               $('#foo').css('opacity', parseFloat(n));
+               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
+       });
+       $('#foo').css('opacity', '');
+       ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
+});
+
+test("text()", function() {
+       expect(1);
+       var expected = "This link has class=\"blog\": Simon Willison's Weblog";
+       ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' );
+});
+
+test("wrap(String|Element)", function() {
+       expect(6);
+       var defaultText = 'Try them out:'
+       var result = $('#first').wrap('<div class="red"><span></span></div>').text();
+       ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
+       ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
+
+       reset();
+       var defaultText = 'Try them out:'
+       var result = $('#first').wrap(document.getElementById('empty')).parent();
+       ok( result.is('ol'), 'Check for element wrapping' );
+       ok( result.text() == defaultText, 'Check for element wrapping' );
+       
+       reset();
+       $('#check1').click(function() {         
+               var checkbox = this;            
+               ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
+               $(checkbox).wrap( '<div id="c1" style="display:none;"></div>' );
+               ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
+       }).click();
+});
+
+test("wrapAll(String|Element)", function() {
+       expect(8);
+       var prev = $("#first")[0].previousSibling;
+       var p = $("#first")[0].parentNode;
+       var result = $('#first,#firstp').wrapAll('<div class="red"><div id="tmp"></div></div>');
+       equals( result.parent().length, 1, 'Check for wrapping of on-the-fly html' );
+       ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
+       ok( $('#firstp').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
+       equals( $("#first").parent().parent()[0].previousSibling, prev, "Correct Previous Sibling" );
+       equals( $("#first").parent().parent()[0].parentNode, p, "Correct Parent" );
+
+       reset();
+       var prev = $("#first")[0].previousSibling;
+       var p = $("#first")[0].parentNode;
+       var result = $('#first,#firstp').wrapAll(document.getElementById('empty'));
+       equals( $("#first").parent()[0], $("#firstp").parent()[0], "Same Parent" );
+       equals( $("#first").parent()[0].previousSibling, prev, "Correct Previous Sibling" );
+       equals( $("#first").parent()[0].parentNode, p, "Correct Parent" );
+});
+
+test("wrapInner(String|Element)", function() {
+       expect(6);
+       var num = $("#first").children().length;
+       var result = $('#first').wrapInner('<div class="red"><div id="tmp"></div></div>');
+       equals( $("#first").children().length, 1, "Only one child" );
+       ok( $("#first").children().is(".red"), "Verify Right Element" );
+       equals( $("#first").children().children().children().length, num, "Verify Elements Intact" );
+
+       reset();
+       var num = $("#first").children().length;
+       var result = $('#first').wrapInner(document.getElementById('empty'));
+       equals( $("#first").children().length, 1, "Only one child" );
+       ok( $("#first").children().is("#empty"), "Verify Right Element" );
+       equals( $("#first").children().children().length, num, "Verify Elements Intact" );
+});
+
+test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(18);
+       var defaultText = 'Try them out:'
+       var result = $('#first').append('<b>buga</b>');
+       ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
+       ok( $('#select3').append('<option value="appendTest">Append Test</option>').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
+       
+       reset();
+       var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
+       $('#sap').append(document.getElementById('first'));
+       ok( expected == $('#sap').text(), "Check for appending of element" );
+       
+       reset();
+       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+       $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);
+       ok( expected == $('#sap').text(), "Check for appending of array of elements" );
+       
+       reset();
+       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+       $('#sap').append($("#first, #yahoo"));
+       ok( expected == $('#sap').text(), "Check for appending of jQuery object" );
+
+       reset();
+       $("#sap").append( 5 );
+       ok( $("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" );
+
+       reset();
+       $("#sap").append( " text with spaces " );
+       ok( $("#sap")[0].innerHTML.match(/ text with spaces $/), "Check for appending text with spaces" );
+
+       reset();
+       ok( $("#sap").append([]), "Check for appending an empty array." );
+       ok( $("#sap").append(""), "Check for appending an empty string." );
+       ok( $("#sap").append(document.getElementsByTagName("foo")), "Check for appending an empty nodelist." );
+       
+       reset();
+       $("#sap").append(document.getElementById('form'));
+       ok( $("#sap>form").size() == 1, "Check for appending a form" );  // Bug #910
+
+       reset();
+       var pass = true;
+       try {
+               $( $("iframe")[0].contentWindow.document.body ).append("<div>test</div>");
+       } catch(e) {
+               pass = false;
+       }
+
+       ok( pass, "Test for appending a DOM node to the contents of an IFrame" );
+       
+       reset();
+       $('<fieldset/>').appendTo('#form').append('<legend id="legend">test</legend>');
+       t( 'Append legend', '#legend', ['legend'] );
+       
+       reset();
+       $('#select1').append('<OPTION>Test</OPTION>');
+       ok( $('#select1 option:last').text() == "Test", "Appending &lt;OPTION&gt; (all caps)" );
+       
+       $('#table').append('<colgroup></colgroup>');
+       ok( $('#table colgroup').length, "Append colgroup" );
+       
+       $('#table colgroup').append('<col/>');
+       ok( $('#table colgroup col').length, "Append col" );
+       
+       reset();
+       $('#table').append('<caption></caption>');
+       ok( $('#table caption').length, "Append caption" );
+
+       reset();
+       $('form:last')
+               .append('<select id="appendSelect1"></select>')
+               .append('<select id="appendSelect2"><option>Test</option></select>');
+       
+       t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
+});
+
+test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(6);
+       var defaultText = 'Try them out:'
+       $('<b>buga</b>').appendTo('#first');
+       ok( $("#first").text() == defaultText + 'buga', 'Check if text appending works' );
+       ok( $('<option value="appendTest">Append Test</option>').appendTo('#select3').parent().find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
+       
+       reset();
+       var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
+       $(document.getElementById('first')).appendTo('#sap');
+       ok( expected == $('#sap').text(), "Check for appending of element" );
+       
+       reset();
+       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+       $([document.getElementById('first'), document.getElementById('yahoo')]).appendTo('#sap');
+       ok( expected == $('#sap').text(), "Check for appending of array of elements" );
+       
+       reset();
+       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+       $("#first, #yahoo").appendTo('#sap');
+       ok( expected == $('#sap').text(), "Check for appending of jQuery object" );
+       
+       reset();
+       $('#select1').appendTo('#foo');
+       t( 'Append select', '#foo select', ['select1'] );
+});
+
+test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(5);
+       var defaultText = 'Try them out:'
+       var result = $('#first').prepend('<b>buga</b>');
+       ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
+       ok( $('#select3').prepend('<option value="prependTest">Prepend Test</option>').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
+       
+       reset();
+       var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
+       $('#sap').prepend(document.getElementById('first'));
+       ok( expected == $('#sap').text(), "Check for prepending of element" );
+
+       reset();
+       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+       $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);
+       ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
+       
+       reset();
+       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+       $('#sap').prepend($("#first, #yahoo"));
+       ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );
+});
+
+test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(6);
+       var defaultText = 'Try them out:'
+       $('<b>buga</b>').prependTo('#first');
+       ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' );
+       ok( $('<option value="prependTest">Prepend Test</option>').prependTo('#select3').parent().find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
+       
+       reset();
+       var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
+       $(document.getElementById('first')).prependTo('#sap');
+       ok( expected == $('#sap').text(), "Check for prepending of element" );
+
+       reset();
+       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+       $([document.getElementById('yahoo'), document.getElementById('first')]).prependTo('#sap');
+       ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
+       
+       reset();
+       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+       $("#yahoo, #first").prependTo('#sap');
+       ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );
+       
+       reset();
+       $('<select id="prependSelect1"></select>').prependTo('form:last');
+       $('<select id="prependSelect2"><option>Test</option></select>').prependTo('form:last');
+       
+       t( "Prepend Select", "#prependSelect1, #prependSelect2", ["prependSelect1", "prependSelect2"] );
+});
+
+test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(4);
+       var expected = 'This is a normal link: bugaYahoo';
+       $('#yahoo').before('<b>buga</b>');
+       ok( expected == $('#en').text(), 'Insert String before' );
+       
+       reset();
+       expected = "This is a normal link: Try them out:Yahoo";
+       $('#yahoo').before(document.getElementById('first'));
+       ok( expected == $('#en').text(), "Insert element before" );
+       
+       reset();
+       expected = "This is a normal link: Try them out:diveintomarkYahoo";
+       $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);
+       ok( expected == $('#en').text(), "Insert array of elements before" );
+       
+       reset();
+       expected = "This is a normal link: Try them out:diveintomarkYahoo";
+       $('#yahoo').before($("#first, #mark"));
+       ok( expected == $('#en').text(), "Insert jQuery before" );
+});
+
+test("insertBefore(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(4);
+       var expected = 'This is a normal link: bugaYahoo';
+       $('<b>buga</b>').insertBefore('#yahoo');
+       ok( expected == $('#en').text(), 'Insert String before' );
+       
+       reset();
+       expected = "This is a normal link: Try them out:Yahoo";
+       $(document.getElementById('first')).insertBefore('#yahoo');
+       ok( expected == $('#en').text(), "Insert element before" );
+       
+       reset();
+       expected = "This is a normal link: Try them out:diveintomarkYahoo";
+       $([document.getElementById('first'), document.getElementById('mark')]).insertBefore('#yahoo');
+       ok( expected == $('#en').text(), "Insert array of elements before" );
+       
+       reset();
+       expected = "This is a normal link: Try them out:diveintomarkYahoo";
+       $("#first, #mark").insertBefore('#yahoo');
+       ok( expected == $('#en').text(), "Insert jQuery before" );
+});
+
+test("after(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(4);
+       var expected = 'This is a normal link: Yahoobuga';
+       $('#yahoo').after('<b>buga</b>');
+       ok( expected == $('#en').text(), 'Insert String after' );
+       
+       reset();
+       expected = "This is a normal link: YahooTry them out:";
+       $('#yahoo').after(document.getElementById('first'));
+       ok( expected == $('#en').text(), "Insert element after" );
+
+       reset();
+       expected = "This is a normal link: YahooTry them out:diveintomark";
+       $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);
+       ok( expected == $('#en').text(), "Insert array of elements after" );
+       
+       reset();
+       expected = "This is a normal link: YahooTry them out:diveintomark";
+       $('#yahoo').after($("#first, #mark"));
+       ok( expected == $('#en').text(), "Insert jQuery after" );
+});
+
+test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(4);
+       var expected = 'This is a normal link: Yahoobuga';
+       $('<b>buga</b>').insertAfter('#yahoo');
+       ok( expected == $('#en').text(), 'Insert String after' );
+       
+       reset();
+       expected = "This is a normal link: YahooTry them out:";
+       $(document.getElementById('first')).insertAfter('#yahoo');
+       ok( expected == $('#en').text(), "Insert element after" );
+
+       reset();
+       expected = "This is a normal link: YahooTry them out:diveintomark";
+       $([document.getElementById('mark'), document.getElementById('first')]).insertAfter('#yahoo');
+       ok( expected == $('#en').text(), "Insert array of elements after" );
+       
+       reset();
+       expected = "This is a normal link: YahooTry them out:diveintomark";
+       $("#mark, #first").insertAfter('#yahoo');
+       ok( expected == $('#en').text(), "Insert jQuery after" );
+});
+
+test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(10);
+       $('#yahoo').replaceWith('<b id="replace">buga</b>');
+       ok( $("#replace")[0], 'Replace element with string' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after string' );
+       
+       reset();
+       $('#yahoo').replaceWith(document.getElementById('first'));
+       ok( $("#first")[0], 'Replace element with element' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after element' );
+
+       reset();
+       $('#yahoo').replaceWith([document.getElementById('first'), document.getElementById('mark')]);
+       ok( $("#first")[0], 'Replace element with array of elements' );
+       ok( $("#mark")[0], 'Replace element with array of elements' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after array of elements' );
+       
+       reset();
+       $('#yahoo').replaceWith($("#first, #mark"));
+       ok( $("#first")[0], 'Replace element with set of elements' );
+       ok( $("#mark")[0], 'Replace element with set of elements' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
+});
+
+test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+       expect(10);
+       $('<b id="replace">buga</b>').replaceAll("#yahoo");
+       ok( $("#replace")[0], 'Replace element with string' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after string' );
+       
+       reset();
+       $(document.getElementById('first')).replaceAll("#yahoo");
+       ok( $("#first")[0], 'Replace element with element' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after element' );
+
+       reset();
+       $([document.getElementById('first'), document.getElementById('mark')]).replaceAll("#yahoo");
+       ok( $("#first")[0], 'Replace element with array of elements' );
+       ok( $("#mark")[0], 'Replace element with array of elements' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after array of elements' );
+       
+       reset();
+       $("#first, #mark").replaceAll("#yahoo");
+       ok( $("#first")[0], 'Replace element with set of elements' );
+       ok( $("#mark")[0], 'Replace element with set of elements' );
+       ok( !$("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
+});
+
+test("end()", function() {
+       expect(3);
+       ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' );
+       ok( $('#yahoo').end(), 'Check for end with nothing to end' );
+       
+       var x = $('#yahoo');
+       x.parent();
+       ok( 'Yahoo' == $('#yahoo').text(), 'Check for non-destructive behaviour' );
+});
+
+test("find(String)", function() {
+       expect(1);
+       ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' );
+});
+
+test("clone()", function() {
+       expect(3);
+       ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' );
+       var clone = $('#yahoo').clone();
+       ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' );
+       ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' );
+});
+
+test("is(String)", function() {
+       expect(26);
+       ok( $('#form').is('form'), 'Check for element: A form must be a form' );
+       ok( !$('#form').is('div'), 'Check for element: A form is not a div' );
+       ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' );
+       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( $('#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(':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' );
+});
+
+test("$.extend(Object, Object)", function() {
+       expect(10);
+
+       var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+               options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+               optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+               merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
+               deep1 = { foo: { bar: true } },
+               deep1copy = { foo: { bar: true } },
+               deep2 = { foo: { baz: true } },
+               deep2copy = { foo: { baz: true } },
+               deepmerged = { foo: { bar: true, baz: true } };
+
+       jQuery.extend(settings, options);
+       isObj( settings, merged, "Check if extended: settings must be extended" );
+       isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
+
+       jQuery.extend(settings, null, options);
+       isObj( settings, merged, "Check if extended: settings must be extended" );
+       isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
+
+       jQuery.extend(true, deep1, deep2);
+       isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
+       isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
+
+       var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+               defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
+               options1 =     { xnumber2: 1, xstring2: "x" },
+               options1Copy = { xnumber2: 1, xstring2: "x" },
+               options2 =     { xstring2: "xx", xxx: "newstringx" },
+               options2Copy = { xstring2: "xx", xxx: "newstringx" },
+               merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
+
+       var settings = jQuery.extend({}, defaults, options1, options2);
+       isObj( settings, merged2, "Check if extended: settings must be extended" );
+       isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
+       isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" );
+       isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" );
+});
+
+test("val()", function() {
+       expect(2);
+       ok( $("#text1").val() == "Test", "Check for value of input element" );
+       ok( !$("#text1").val() == "", "Check for value of input element" );
+});
+
+test("val(String)", function() {
+       expect(2);
+       document.getElementById('text1').value = "bla";
+       ok( $("#text1").val() == "bla", "Check for modified value of input element" );
+       $("#text1").val('test');
+       ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
+});
+
+test("html(String)", function() {
+       expect(1);
+       var div = $("div");
+       div.html("<b>test</b>");
+       var pass = true;
+       for ( var i = 0; i < div.size(); i++ ) {
+         if ( div.get(i).childNodes.length == 0 ) pass = false;
+       }
+       ok( pass, "Set HTML" );
+
+       // Ccommented out until we can resolve it       
+       // $("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>').evalScripts();
+});
+
+test("filter()", function() {
+       expect(4);
+       isSet( $("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
+       isSet( $("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
+       isSet( $("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
+       isSet( $("p").filter(function() { return !$("a", this).length }).get(), q("sndp", "first"), "filter(Function)" );
+});
+
+test("not()", function() {
+       expect(3);
+       ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );
+       isSet( $("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
+       isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );
+});
+
+test("andSelf()", function() {
+       expect(4);
+       isSet( $("#en").siblings().andSelf().get(), q("sndp", "sap","en"), "Check for siblings and self" );
+       isSet( $("#foo").children().andSelf().get(), q("sndp", "en", "sap", "foo"), "Check for children and self" );
+       isSet( $("#en, #sndp").parent().andSelf().get(), q("foo","en","sndp"), "Check for parent and self" );
+       isSet( $("#groups").parents("p, div").andSelf().get(), q("ap", "main", "groups"), "Check for parents and self" );
+});
+
+test("siblings([String])", function() {
+       expect(5);
+       isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
+       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", "testForm", "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(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" );
+       isSet( $("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" );
+});
+
+test("parent([String])", function() {
+       expect(5);
+       ok( $("#groups").parent()[0].id == "ap", "Simple parent check" );
+       ok( $("#groups").parent("p")[0].id == "ap", "Filtered parent check" );
+       ok( $("#groups").parent("div").length == 0, "Filtered parent check, no match" );
+       ok( $("#groups").parent("div, p")[0].id == "ap", "Check for multiple filters" );
+       isSet( $("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" );
+});
+       
+test("parents([String])", function() {
+       expect(5);
+       ok( $("#groups").parents()[0].id == "ap", "Simple parents check" );
+       ok( $("#groups").parents("p")[0].id == "ap", "Filtered parents check" );
+       ok( $("#groups").parents("div")[0].id == "main", "Filtered parents check2" );
+       isSet( $("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );
+       isSet( $("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );
+});
+
+test("next([String])", function() {
+       expect(4);
+       ok( $("#ap").next()[0].id == "foo", "Simple next check" );
+       ok( $("#ap").next("div")[0].id == "foo", "Filtered next check" );
+       ok( $("#ap").next("p").length == 0, "Filtered next check, no match" );
+       ok( $("#ap").next("div, p")[0].id == "foo", "Multiple filters" );
+});
+       
+test("prev([String])", function() {
+       expect(4);
+       ok( $("#foo").prev()[0].id == "ap", "Simple prev check" );
+       ok( $("#foo").prev("p")[0].id == "ap", "Filtered prev check" );
+       ok( $("#foo").prev("div").length == 0, "Filtered prev check, no match" );
+       ok( $("#foo").prev("p, div")[0].id == "ap", "Multiple filters" );
+});
+
+test("show()", function() {
+       expect(1);
+       var pass = true, div = $("div");
+       div.show().each(function(){
+         if ( this.style.display == "none" ) pass = false;
+       });
+       ok( pass, "Show" );
+});
+
+test("addClass(String)", function() {
+       expect(1);
+       var div = $("div");
+       div.addClass("test");
+       var pass = true;
+       for ( var i = 0; i < div.size(); i++ ) {
+        if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
+       }
+       ok( pass, "Add Class" );
+});
+
+test("removeClass(String) - simple", function() {
+       expect(3);
+       var div = $("div").addClass("test").removeClass("test"),
+               pass = true;
+       for ( var i = 0; i < div.size(); i++ ) {
+               if ( div.get(i).className.indexOf("test") != -1 ) pass = false;
+       }
+       ok( pass, "Remove Class" );
+       
+       reset();
+       var div = $("div").addClass("test").addClass("foo").addClass("bar");
+       div.removeClass("test").removeClass("bar").removeClass("foo");
+       var pass = true;
+       for ( var i = 0; i < div.size(); i++ ) {
+        if ( div.get(i).className.match(/test|bar|foo/) ) pass = false;
+       }
+       ok( pass, "Remove multiple classes" );
+       
+       reset();
+       var div = $("div:eq(0)").addClass("test").removeClass("");
+       ok( div.is('.test'), "Empty string passed to removeClass" );
+       
+});
+
+test("toggleClass(String)", function() {
+       expect(3);
+       var e = $("#firstp");
+       ok( !e.is(".test"), "Assert class not present" );
+       e.toggleClass("test");
+       ok( e.is(".test"), "Assert class present" ); 
+       e.toggleClass("test");
+       ok( !e.is(".test"), "Assert class not present" );
+});
+
+test("removeAttr(String", function() {
+       expect(1);
+       ok( $('#mark').removeAttr("class")[0].className == "", "remove class" );
+});
+
+test("text(String)", function() {
+       expect(1);
+       ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+});
+
+test("$.each(Object,Function)", function() {
+       expect(8);
+       $.each( [0,1,2], function(i, n){
+               ok( i == n, "Check array iteration" );
+       });
+       
+       $.each( [5,6,7], function(i, n){
+               ok( i == n - 5, "Check array iteration" );
+       });
+        
+       $.each( { name: "name", lang: "lang" }, function(i, n){
+               ok( i == n, "Check object iteration" );
+       });
+});
+
+test("$.prop", function() {
+       expect(2);
+       var handle = function() { return this.id };
+       ok( $.prop($("#ap")[0], handle) == "ap", "Check with Function argument" );
+       ok( $.prop($("#ap")[0], "value") == "value", "Check with value argument" );
+});
+
+test("$.className", function() {
+       expect(6);
+       var x = $("<p>Hi</p>")[0];
+       var c = $.className;
+       c.add(x, "hi");
+       ok( x.className == "hi", "Check single added class" );
+       c.add(x, "foo bar");
+       ok( x.className == "hi foo bar", "Check more added classes" );
+       c.remove(x);
+       ok( x.className == "", "Remove all classes" );
+       c.add(x, "hi foo bar");
+       c.remove(x, "foo");
+       ok( x.className == "hi bar", "Check removal of one class" );
+       ok( c.has(x, "hi"), "Check has1" );
+       ok( c.has(x, "bar"), "Check has2" );
+});
+
+test("remove()", function() {
+       expect(4);
+       $("#ap").children().remove();
+       ok( $("#ap").text().length > 10, "Check text is not removed" );
+       ok( $("#ap").children().length == 0, "Check remove" );
+       
+       reset();
+       $("#ap").children().remove("a");
+       ok( $("#ap").text().length > 10, "Check text is not removed" );
+       ok( $("#ap").children().length == 1, "Check filtered remove" );
+});
+
+test("empty()", function() {
+       expect(2);
+       ok( $("#ap").children().empty().text().length == 0, "Check text is removed" );
+       ok( $("#ap").children().length == 4, "Check elements are not removed" );
+});
+
+test("slice()", function() {
+       expect(4);
+       isSet( $("#ap a").slice(1,2), q("groups"), "slice(1,2)" );
+       isSet( $("#ap a").slice(1), q("groups", "anchor1", "mark"), "slice(1)" );
+       isSet( $("#ap a").slice(0,3), q("google", "groups", "anchor1"), "slice(0,3)" );
+       isSet( $("#ap a").slice(-1), q("mark"), "slice(-1)" );
+});
+
+test("map()", function() {
+       expect(2);
+
+       isSet(
+               $("#ap").map(function(){
+                       return $(this).find("a").get();
+               }),
+               q("google", "groups", "anchor1", "mark"),
+               "Array Map"
+       );
+
+       isSet(
+               $("#ap > a").map(function(){
+                       return this.parentNode;
+               }),
+               q("ap","ap","ap"),
+               "Single Map"
+       );
+});
+
+test("contents()", function() {
+       expect(2);
+       equals( $("#ap").contents().length, 9, "Check element contents" );
+       ok( $("#iframe").contents()[0], "Check existance of IFrame document" );
+       // Disabled, randomly fails
+       //ok( $("#iframe").contents()[0].body, "Check existance of IFrame body" );
+});
diff --git a/test/unit/coreTest.js b/test/unit/coreTest.js
deleted file mode 100644 (file)
index db47856..0000000
+++ /dev/null
@@ -1,1065 +0,0 @@
-module("core");
-
-test("Basic requirements", function() {
-       expect(7);
-       ok( Array.prototype.push, "Array.push()" );
-       ok( Function.prototype.apply, "Function.apply()" );
-       ok( document.getElementById, "getElementById" );
-       ok( document.getElementsByTagName, "getElementsByTagName" );
-       ok( RegExp, "RegExp" );
-       ok( jQuery, "jQuery" );
-       ok( $, "$()" );
-});
-
-test("$()", function() {
-       expect(5);
-       
-       var main = $("#main");
-       isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
-       
-       // make sure this is handled
-       $('<p>\r\n</p>');
-       ok( true, "Check for \\r and \\n in jQuery()" );
-       
-       /* // Disabled until we add this functionality in
-       var pass = true;
-       try {
-               $("<div>Testing</div>").appendTo(document.getElementById("iframe").contentDocument.body);
-       } catch(e){
-               pass = false;
-       }
-       ok( pass, "$('&lt;tag&gt;') needs optional document parameter to ease cross-frame DOM wrangling, see #968" );*/
-
-       var code = $("<code/>");
-       equals( code.length, 1, "Correct number of elements generated for code" );
-       var img = $("<img/>");
-       equals( img.length, 1, "Correct number of elements generated for img" );
-       var div = $("<div/><hr/><code/><b/>");
-       equals( div.length, 4, "Correct number of elements generated for div hr code b" );
-});
-
-test("isFunction", function() {
-       expect(21);
-
-       // Make sure that false values return false
-       ok( !jQuery.isFunction(), "No Value" );
-       ok( !jQuery.isFunction( null ), "null Value" );
-       ok( !jQuery.isFunction( undefined ), "undefined Value" );
-       ok( !jQuery.isFunction( "" ), "Empty String Value" );
-       ok( !jQuery.isFunction( 0 ), "0 Value" );
-
-       // Check built-ins
-       // Safari uses "(Internal Function)"
-       ok( jQuery.isFunction(String), "String Function" );
-       ok( jQuery.isFunction(Array), "Array Function" );
-       ok( jQuery.isFunction(Object), "Object Function" );
-       ok( jQuery.isFunction(Function), "Function Function" );
-
-       // When stringified, this could be misinterpreted
-       var mystr = "function";
-       ok( !jQuery.isFunction(mystr), "Function String" );
-
-       // When stringified, this could be misinterpreted
-       var myarr = [ "function" ];
-       ok( !jQuery.isFunction(myarr), "Function Array" );
-
-       // When stringified, this could be misinterpreted
-       var myfunction = { "function": "test" };
-       ok( !jQuery.isFunction(myfunction), "Function Object" );
-
-       // Make sure normal functions still work
-       var fn = function(){};
-       ok( jQuery.isFunction(fn), "Normal Function" );
-
-       var obj = document.createElement("object");
-
-       // Firefox says this is a function
-       ok( !jQuery.isFunction(obj), "Object Element" );
-
-       // IE says this is an object
-       ok( jQuery.isFunction(obj.getAttribute), "getAttribute Function" );
-
-       var nodes = document.body.childNodes;
-
-       // Safari says this is a function
-       ok( !jQuery.isFunction(nodes), "childNodes Property" );
-
-       var first = document.body.firstChild;
-       
-       // Normal elements are reported ok everywhere
-       ok( !jQuery.isFunction(first), "A normal DOM Element" );
-
-       var input = document.createElement("input");
-       input.type = "text";
-       document.body.appendChild( input );
-
-       // IE says this is an object
-       ok( jQuery.isFunction(input.focus), "A default function property" );
-
-       document.body.removeChild( input );
-
-       var a = document.createElement("a");
-       a.href = "some-function";
-       document.body.appendChild( a );
-
-       // This serializes with the word 'function' in it
-       ok( !jQuery.isFunction(a), "Anchor Element" );
-
-       document.body.removeChild( a );
-
-       // Recursive function calls have lengths and array-like properties
-       function callme(callback){
-               function fn(response){
-                       callback(response);
-               }
-
-               ok( jQuery.isFunction(fn), "Recursive Function Call" );
-
-       fn({ some: "data" });
-       };
-
-       callme(function(){
-       callme(function(){});
-       });
-});
-
-test("$('html')", function() {
-       expect(2);
-       
-       reset();
-       ok( $("<script>var foo='test';</script>")[0], "Creating a script" );
-       
-       reset();
-       ok( $("<link rel='stylesheet'/>")[0], "Creating a link" );
-       
-       reset();
-});
-
-test("length", function() {
-       expect(1);
-       ok( $("p").length == 6, "Get Number of Elements Found" );
-});
-
-test("size()", function() {
-       expect(1);
-       ok( $("p").size() == 6, "Get Number of Elements Found" );
-});
-
-test("get()", function() {
-       expect(1);
-       isSet( $("p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" );
-});
-
-test("get(Number)", function() {
-       expect(1);
-       ok( $("p").get(0) == document.getElementById("firstp"), "Get A Single Element" );
-});
-
-test("add(String|Element|Array)", function() {
-       expect(7);
-       isSet( $("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
-       isSet( $("#sndp").add( $("#en")[0] ).add( $("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
-       ok( $([]).add($("#form")[0].elements).length >= 13, "Check elements from array" );
-       
-       var x = $([]).add($("<p id='x1'>xxx</p>")).add($("<p id='x2'>xxx</p>"));
-       ok( x[0].id == "x1", "Check on-the-fly element1" );
-       ok( x[1].id == "x2", "Check on-the-fly element2" );
-       
-       var x = $([]).add("<p id='x1'>xxx</p>").add("<p id='x2'>xxx</p>");
-       ok( x[0].id == "x1", "Check on-the-fly element1" );
-       ok( x[1].id == "x2", "Check on-the-fly element2" );
-});
-
-test("each(Function)", function() {
-       expect(1);
-       var div = $("div");
-       div.each(function(){this.foo = 'zoo';});
-       var pass = true;
-       for ( var i = 0; i < div.size(); i++ ) {
-         if ( div.get(i).foo != "zoo" ) pass = false;
-       }
-       ok( pass, "Execute a function, Relative" );
-});
-
-test("index(Object)", function() {
-       expect(8);
-       ok( $([window, document]).index(window) == 0, "Check for index of elements" );
-       ok( $([window, document]).index(document) == 1, "Check for index of elements" );
-       var inputElements = $('#radio1,#radio2,#check1,#check2');
-       ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" );
-       ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" );
-       ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" );
-       ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" );
-       ok( inputElements.index(window) == -1, "Check for not found index" );
-       ok( inputElements.index(document) == -1, "Check for not found index" );
-});
-
-test("attr(String)", function() {
-       expect(13);
-       ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
-       ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
-       ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
-       ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
-       ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
-       ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
-       ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
-       ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );
-       ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );
-       ok( $('#name').attr('name') == "name", 'Check for name attribute' );
-       ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
-       ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
-       
-       $('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
-       ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
-});
-
-test("attr(String) in XML Files", function() {
-       expect(2);
-       stop();
-       $.get("data/dashboard.xml", function(xml) {
-               ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
-               ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
-               start();
-       });
-});
-
-test("attr(String, Function)", function() {
-       expect(2);
-       ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
-       ok( $('#text1').attr('title', function(i) { return i }).attr('title') == "0", "Set value with an index");
-});
-
-test("attr(Hash)", function() {
-       expect(1);
-       var pass = true;
-       $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
-         if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
-       });
-       ok( pass, "Set Multiple Attributes" );
-});
-
-test("attr(String, Object)", function() {
-       expect(12);
-       var div = $("div");
-       div.attr("foo", "bar");
-       var pass = true;
-       for ( var i = 0; i < div.size(); i++ ) {
-         if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
-       }
-       ok( pass, "Set Attribute" );
-
-       ok( $("#foo").attr({"width": null}), "Try to set an attribute to nothing" );    
-       
-       $("#name").attr('name', 'something');
-       ok( $("#name").attr('name') == 'something', 'Set name attribute' );
-       $("#check2").attr('checked', true);
-       ok( document.getElementById('check2').checked == true, 'Set checked attribute' );
-       $("#check2").attr('checked', false);
-       ok( document.getElementById('check2').checked == false, 'Set checked attribute' );
-       $("#text1").attr('readonly', true);
-       ok( document.getElementById('text1').readOnly == true, 'Set readonly attribute' );
-       $("#text1").attr('readonly', false);
-       ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' );
-       $("#name").attr('maxlength', '5');
-       ok( document.getElementById('name').maxLength == '5', 'Set maxlength attribute' );
-
-       reset();
-
-       var type = $("#check2").attr('type');
-       var thrown = false;
-       try {
-               $("#check2").attr('type','hidden');
-       } catch(e) {
-               thrown = true;
-       }
-       ok( thrown, "Exception thrown when trying to change type property" );
-       equals( type, $("#check2").attr('type'), "Verify that you can't change the type of an input element" );
-
-       var check = document.createElement("input");
-       var thrown = true;
-       try {
-               $(check).attr('type','checkbox');
-       } catch(e) {
-               thrown = false;
-       }
-       ok( thrown, "Exception thrown when trying to change type property" );
-       equals( "checkbox", $(check).attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
-});
-
-test("attr(String, Object) - Loaded via XML document", function() {
-       expect(2);
-       stop();
-       $.get('data/dashboard.xml', function(xml) { 
-               var titles = [];
-               $('tab', xml).each(function() {
-                       titles.push($(this).attr('title'));
-               });
-               ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
-               ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
-               start();
-       });
-});
-
-test("css(String|Hash)", function() {
-       expect(19);
-       
-       ok( $('#main').css("display") == 'none', 'Check for css property "display"');
-       
-       ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
-       $('#foo').css({display: 'none'});
-       ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
-       $('#foo').css({display: 'block'});
-       ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
-       
-       $('#floatTest').css({styleFloat: 'right'});
-       ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right');
-       $('#floatTest').css({cssFloat: 'left'});
-       ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
-       $('#floatTest').css({'float': 'right'});
-       ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right');
-       $('#floatTest').css({'font-size': '30px'});
-       ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');
-       
-       $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
-               $('#foo').css({opacity: n});
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
-               $('#foo').css({opacity: parseFloat(n)});
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
-       });     
-       $('#foo').css({opacity: ''});
-       ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
-});
-
-test("css(String, Object)", function() {
-       expect(18);
-       ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
-       $('#foo').css('display', 'none');
-       ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
-       $('#foo').css('display', 'block');
-       ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
-       
-       $('#floatTest').css('styleFloat', 'left');
-       ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left');
-       $('#floatTest').css('cssFloat', 'right');
-       ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
-       $('#floatTest').css('float', 'left');
-       ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left');
-       $('#floatTest').css('font-size', '20px');
-       ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');
-       
-       $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
-               $('#foo').css('opacity', n);
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
-               $('#foo').css('opacity', parseFloat(n));
-               ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
-       });
-       $('#foo').css('opacity', '');
-       ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
-});
-
-test("text()", function() {
-       expect(1);
-       var expected = "This link has class=\"blog\": Simon Willison's Weblog";
-       ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' );
-});
-
-test("wrap(String|Element)", function() {
-       expect(6);
-       var defaultText = 'Try them out:'
-       var result = $('#first').wrap('<div class="red"><span></span></div>').text();
-       ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
-       ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
-
-       reset();
-       var defaultText = 'Try them out:'
-       var result = $('#first').wrap(document.getElementById('empty')).parent();
-       ok( result.is('ol'), 'Check for element wrapping' );
-       ok( result.text() == defaultText, 'Check for element wrapping' );
-       
-       reset();
-       $('#check1').click(function() {         
-               var checkbox = this;            
-               ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
-               $(checkbox).wrap( '<div id="c1" style="display:none;"></div>' );
-               ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
-       }).click();
-});
-
-test("wrapAll(String|Element)", function() {
-       expect(8);
-       var prev = $("#first")[0].previousSibling;
-       var p = $("#first")[0].parentNode;
-       var result = $('#first,#firstp').wrapAll('<div class="red"><div id="tmp"></div></div>');
-       equals( result.parent().length, 1, 'Check for wrapping of on-the-fly html' );
-       ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
-       ok( $('#firstp').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
-       equals( $("#first").parent().parent()[0].previousSibling, prev, "Correct Previous Sibling" );
-       equals( $("#first").parent().parent()[0].parentNode, p, "Correct Parent" );
-
-       reset();
-       var prev = $("#first")[0].previousSibling;
-       var p = $("#first")[0].parentNode;
-       var result = $('#first,#firstp').wrapAll(document.getElementById('empty'));
-       equals( $("#first").parent()[0], $("#firstp").parent()[0], "Same Parent" );
-       equals( $("#first").parent()[0].previousSibling, prev, "Correct Previous Sibling" );
-       equals( $("#first").parent()[0].parentNode, p, "Correct Parent" );
-});
-
-test("wrapInner(String|Element)", function() {
-       expect(6);
-       var num = $("#first").children().length;
-       var result = $('#first').wrapInner('<div class="red"><div id="tmp"></div></div>');
-       equals( $("#first").children().length, 1, "Only one child" );
-       ok( $("#first").children().is(".red"), "Verify Right Element" );
-       equals( $("#first").children().children().children().length, num, "Verify Elements Intact" );
-
-       reset();
-       var num = $("#first").children().length;
-       var result = $('#first').wrapInner(document.getElementById('empty'));
-       equals( $("#first").children().length, 1, "Only one child" );
-       ok( $("#first").children().is("#empty"), "Verify Right Element" );
-       equals( $("#first").children().children().length, num, "Verify Elements Intact" );
-});
-
-test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(18);
-       var defaultText = 'Try them out:'
-       var result = $('#first').append('<b>buga</b>');
-       ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
-       ok( $('#select3').append('<option value="appendTest">Append Test</option>').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
-       
-       reset();
-       var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
-       $('#sap').append(document.getElementById('first'));
-       ok( expected == $('#sap').text(), "Check for appending of element" );
-       
-       reset();
-       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
-       $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);
-       ok( expected == $('#sap').text(), "Check for appending of array of elements" );
-       
-       reset();
-       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
-       $('#sap').append($("#first, #yahoo"));
-       ok( expected == $('#sap').text(), "Check for appending of jQuery object" );
-
-       reset();
-       $("#sap").append( 5 );
-       ok( $("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" );
-
-       reset();
-       $("#sap").append( " text with spaces " );
-       ok( $("#sap")[0].innerHTML.match(/ text with spaces $/), "Check for appending text with spaces" );
-
-       reset();
-       ok( $("#sap").append([]), "Check for appending an empty array." );
-       ok( $("#sap").append(""), "Check for appending an empty string." );
-       ok( $("#sap").append(document.getElementsByTagName("foo")), "Check for appending an empty nodelist." );
-       
-       reset();
-       $("#sap").append(document.getElementById('form'));
-       ok( $("#sap>form").size() == 1, "Check for appending a form" );  // Bug #910
-
-       reset();
-       var pass = true;
-       try {
-               $( $("iframe")[0].contentWindow.document.body ).append("<div>test</div>");
-       } catch(e) {
-               pass = false;
-       }
-
-       ok( pass, "Test for appending a DOM node to the contents of an IFrame" );
-       
-       reset();
-       $('<fieldset/>').appendTo('#form').append('<legend id="legend">test</legend>');
-       t( 'Append legend', '#legend', ['legend'] );
-       
-       reset();
-       $('#select1').append('<OPTION>Test</OPTION>');
-       ok( $('#select1 option:last').text() == "Test", "Appending &lt;OPTION&gt; (all caps)" );
-       
-       $('#table').append('<colgroup></colgroup>');
-       ok( $('#table colgroup').length, "Append colgroup" );
-       
-       $('#table colgroup').append('<col/>');
-       ok( $('#table colgroup col').length, "Append col" );
-       
-       reset();
-       $('#table').append('<caption></caption>');
-       ok( $('#table caption').length, "Append caption" );
-
-       reset();
-       $('form:last')
-               .append('<select id="appendSelect1"></select>')
-               .append('<select id="appendSelect2"><option>Test</option></select>');
-       
-       t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
-});
-
-test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(6);
-       var defaultText = 'Try them out:'
-       $('<b>buga</b>').appendTo('#first');
-       ok( $("#first").text() == defaultText + 'buga', 'Check if text appending works' );
-       ok( $('<option value="appendTest">Append Test</option>').appendTo('#select3').parent().find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
-       
-       reset();
-       var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
-       $(document.getElementById('first')).appendTo('#sap');
-       ok( expected == $('#sap').text(), "Check for appending of element" );
-       
-       reset();
-       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
-       $([document.getElementById('first'), document.getElementById('yahoo')]).appendTo('#sap');
-       ok( expected == $('#sap').text(), "Check for appending of array of elements" );
-       
-       reset();
-       expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
-       $("#first, #yahoo").appendTo('#sap');
-       ok( expected == $('#sap').text(), "Check for appending of jQuery object" );
-       
-       reset();
-       $('#select1').appendTo('#foo');
-       t( 'Append select', '#foo select', ['select1'] );
-});
-
-test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(5);
-       var defaultText = 'Try them out:'
-       var result = $('#first').prepend('<b>buga</b>');
-       ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
-       ok( $('#select3').prepend('<option value="prependTest">Prepend Test</option>').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
-       
-       reset();
-       var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
-       $('#sap').prepend(document.getElementById('first'));
-       ok( expected == $('#sap').text(), "Check for prepending of element" );
-
-       reset();
-       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-       $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);
-       ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
-       
-       reset();
-       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-       $('#sap').prepend($("#first, #yahoo"));
-       ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );
-});
-
-test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(6);
-       var defaultText = 'Try them out:'
-       $('<b>buga</b>').prependTo('#first');
-       ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' );
-       ok( $('<option value="prependTest">Prepend Test</option>').prependTo('#select3').parent().find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
-       
-       reset();
-       var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
-       $(document.getElementById('first')).prependTo('#sap');
-       ok( expected == $('#sap').text(), "Check for prepending of element" );
-
-       reset();
-       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-       $([document.getElementById('yahoo'), document.getElementById('first')]).prependTo('#sap');
-       ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
-       
-       reset();
-       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-       $("#yahoo, #first").prependTo('#sap');
-       ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );
-       
-       reset();
-       $('<select id="prependSelect1"></select>').prependTo('form:last');
-       $('<select id="prependSelect2"><option>Test</option></select>').prependTo('form:last');
-       
-       t( "Prepend Select", "#prependSelect1, #prependSelect2", ["prependSelect1", "prependSelect2"] );
-});
-
-test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(4);
-       var expected = 'This is a normal link: bugaYahoo';
-       $('#yahoo').before('<b>buga</b>');
-       ok( expected == $('#en').text(), 'Insert String before' );
-       
-       reset();
-       expected = "This is a normal link: Try them out:Yahoo";
-       $('#yahoo').before(document.getElementById('first'));
-       ok( expected == $('#en').text(), "Insert element before" );
-       
-       reset();
-       expected = "This is a normal link: Try them out:diveintomarkYahoo";
-       $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);
-       ok( expected == $('#en').text(), "Insert array of elements before" );
-       
-       reset();
-       expected = "This is a normal link: Try them out:diveintomarkYahoo";
-       $('#yahoo').before($("#first, #mark"));
-       ok( expected == $('#en').text(), "Insert jQuery before" );
-});
-
-test("insertBefore(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(4);
-       var expected = 'This is a normal link: bugaYahoo';
-       $('<b>buga</b>').insertBefore('#yahoo');
-       ok( expected == $('#en').text(), 'Insert String before' );
-       
-       reset();
-       expected = "This is a normal link: Try them out:Yahoo";
-       $(document.getElementById('first')).insertBefore('#yahoo');
-       ok( expected == $('#en').text(), "Insert element before" );
-       
-       reset();
-       expected = "This is a normal link: Try them out:diveintomarkYahoo";
-       $([document.getElementById('first'), document.getElementById('mark')]).insertBefore('#yahoo');
-       ok( expected == $('#en').text(), "Insert array of elements before" );
-       
-       reset();
-       expected = "This is a normal link: Try them out:diveintomarkYahoo";
-       $("#first, #mark").insertBefore('#yahoo');
-       ok( expected == $('#en').text(), "Insert jQuery before" );
-});
-
-test("after(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(4);
-       var expected = 'This is a normal link: Yahoobuga';
-       $('#yahoo').after('<b>buga</b>');
-       ok( expected == $('#en').text(), 'Insert String after' );
-       
-       reset();
-       expected = "This is a normal link: YahooTry them out:";
-       $('#yahoo').after(document.getElementById('first'));
-       ok( expected == $('#en').text(), "Insert element after" );
-
-       reset();
-       expected = "This is a normal link: YahooTry them out:diveintomark";
-       $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);
-       ok( expected == $('#en').text(), "Insert array of elements after" );
-       
-       reset();
-       expected = "This is a normal link: YahooTry them out:diveintomark";
-       $('#yahoo').after($("#first, #mark"));
-       ok( expected == $('#en').text(), "Insert jQuery after" );
-});
-
-test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(4);
-       var expected = 'This is a normal link: Yahoobuga';
-       $('<b>buga</b>').insertAfter('#yahoo');
-       ok( expected == $('#en').text(), 'Insert String after' );
-       
-       reset();
-       expected = "This is a normal link: YahooTry them out:";
-       $(document.getElementById('first')).insertAfter('#yahoo');
-       ok( expected == $('#en').text(), "Insert element after" );
-
-       reset();
-       expected = "This is a normal link: YahooTry them out:diveintomark";
-       $([document.getElementById('mark'), document.getElementById('first')]).insertAfter('#yahoo');
-       ok( expected == $('#en').text(), "Insert array of elements after" );
-       
-       reset();
-       expected = "This is a normal link: YahooTry them out:diveintomark";
-       $("#mark, #first").insertAfter('#yahoo');
-       ok( expected == $('#en').text(), "Insert jQuery after" );
-});
-
-test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(10);
-       $('#yahoo').replaceWith('<b id="replace">buga</b>');
-       ok( $("#replace")[0], 'Replace element with string' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after string' );
-       
-       reset();
-       $('#yahoo').replaceWith(document.getElementById('first'));
-       ok( $("#first")[0], 'Replace element with element' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after element' );
-
-       reset();
-       $('#yahoo').replaceWith([document.getElementById('first'), document.getElementById('mark')]);
-       ok( $("#first")[0], 'Replace element with array of elements' );
-       ok( $("#mark")[0], 'Replace element with array of elements' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after array of elements' );
-       
-       reset();
-       $('#yahoo').replaceWith($("#first, #mark"));
-       ok( $("#first")[0], 'Replace element with set of elements' );
-       ok( $("#mark")[0], 'Replace element with set of elements' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
-});
-
-test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-       expect(10);
-       $('<b id="replace">buga</b>').replaceAll("#yahoo");
-       ok( $("#replace")[0], 'Replace element with string' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after string' );
-       
-       reset();
-       $(document.getElementById('first')).replaceAll("#yahoo");
-       ok( $("#first")[0], 'Replace element with element' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after element' );
-
-       reset();
-       $([document.getElementById('first'), document.getElementById('mark')]).replaceAll("#yahoo");
-       ok( $("#first")[0], 'Replace element with array of elements' );
-       ok( $("#mark")[0], 'Replace element with array of elements' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after array of elements' );
-       
-       reset();
-       $("#first, #mark").replaceAll("#yahoo");
-       ok( $("#first")[0], 'Replace element with set of elements' );
-       ok( $("#mark")[0], 'Replace element with set of elements' );
-       ok( !$("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
-});
-
-test("end()", function() {
-       expect(3);
-       ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' );
-       ok( $('#yahoo').end(), 'Check for end with nothing to end' );
-       
-       var x = $('#yahoo');
-       x.parent();
-       ok( 'Yahoo' == $('#yahoo').text(), 'Check for non-destructive behaviour' );
-});
-
-test("find(String)", function() {
-       expect(1);
-       ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' );
-});
-
-test("clone()", function() {
-       expect(3);
-       ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' );
-       var clone = $('#yahoo').clone();
-       ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' );
-       ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' );
-});
-
-test("is(String)", function() {
-       expect(26);
-       ok( $('#form').is('form'), 'Check for element: A form must be a form' );
-       ok( !$('#form').is('div'), 'Check for element: A form is not a div' );
-       ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' );
-       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( $('#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(':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' );
-});
-
-test("$.extend(Object, Object)", function() {
-       expect(10);
-
-       var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-               options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
-               optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
-               merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
-               deep1 = { foo: { bar: true } },
-               deep1copy = { foo: { bar: true } },
-               deep2 = { foo: { baz: true } },
-               deep2copy = { foo: { baz: true } },
-               deepmerged = { foo: { bar: true, baz: true } };
-
-       jQuery.extend(settings, options);
-       isObj( settings, merged, "Check if extended: settings must be extended" );
-       isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
-
-       jQuery.extend(settings, null, options);
-       isObj( settings, merged, "Check if extended: settings must be extended" );
-       isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
-
-       jQuery.extend(true, deep1, deep2);
-       isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
-       isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
-
-       var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-               defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-               options1 =     { xnumber2: 1, xstring2: "x" },
-               options1Copy = { xnumber2: 1, xstring2: "x" },
-               options2 =     { xstring2: "xx", xxx: "newstringx" },
-               options2Copy = { xstring2: "xx", xxx: "newstringx" },
-               merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
-
-       var settings = jQuery.extend({}, defaults, options1, options2);
-       isObj( settings, merged2, "Check if extended: settings must be extended" );
-       isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
-       isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" );
-       isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" );
-});
-
-test("val()", function() {
-       expect(2);
-       ok( $("#text1").val() == "Test", "Check for value of input element" );
-       ok( !$("#text1").val() == "", "Check for value of input element" );
-});
-
-test("val(String)", function() {
-       expect(2);
-       document.getElementById('text1').value = "bla";
-       ok( $("#text1").val() == "bla", "Check for modified value of input element" );
-       $("#text1").val('test');
-       ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
-});
-
-test("html(String)", function() {
-       expect(1);
-       var div = $("div");
-       div.html("<b>test</b>");
-       var pass = true;
-       for ( var i = 0; i < div.size(); i++ ) {
-         if ( div.get(i).childNodes.length == 0 ) pass = false;
-       }
-       ok( pass, "Set HTML" );
-
-       // Ccommented out until we can resolve it       
-       // $("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>').evalScripts();
-});
-
-test("filter()", function() {
-       expect(4);
-       isSet( $("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
-       isSet( $("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
-       isSet( $("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
-       isSet( $("p").filter(function() { return !$("a", this).length }).get(), q("sndp", "first"), "filter(Function)" );
-});
-
-test("not()", function() {
-       expect(3);
-       ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );
-       isSet( $("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
-       isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );
-});
-
-test("andSelf()", function() {
-       expect(4);
-       isSet( $("#en").siblings().andSelf().get(), q("sndp", "sap","en"), "Check for siblings and self" );
-       isSet( $("#foo").children().andSelf().get(), q("sndp", "en", "sap", "foo"), "Check for children and self" );
-       isSet( $("#en, #sndp").parent().andSelf().get(), q("foo","en","sndp"), "Check for parent and self" );
-       isSet( $("#groups").parents("p, div").andSelf().get(), q("ap", "main", "groups"), "Check for parents and self" );
-});
-
-test("siblings([String])", function() {
-       expect(5);
-       isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
-       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", "testForm", "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(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" );
-       isSet( $("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" );
-});
-
-test("parent([String])", function() {
-       expect(5);
-       ok( $("#groups").parent()[0].id == "ap", "Simple parent check" );
-       ok( $("#groups").parent("p")[0].id == "ap", "Filtered parent check" );
-       ok( $("#groups").parent("div").length == 0, "Filtered parent check, no match" );
-       ok( $("#groups").parent("div, p")[0].id == "ap", "Check for multiple filters" );
-       isSet( $("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" );
-});
-       
-test("parents([String])", function() {
-       expect(5);
-       ok( $("#groups").parents()[0].id == "ap", "Simple parents check" );
-       ok( $("#groups").parents("p")[0].id == "ap", "Filtered parents check" );
-       ok( $("#groups").parents("div")[0].id == "main", "Filtered parents check2" );
-       isSet( $("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );
-       isSet( $("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );
-});
-
-test("next([String])", function() {
-       expect(4);
-       ok( $("#ap").next()[0].id == "foo", "Simple next check" );
-       ok( $("#ap").next("div")[0].id == "foo", "Filtered next check" );
-       ok( $("#ap").next("p").length == 0, "Filtered next check, no match" );
-       ok( $("#ap").next("div, p")[0].id == "foo", "Multiple filters" );
-});
-       
-test("prev([String])", function() {
-       expect(4);
-       ok( $("#foo").prev()[0].id == "ap", "Simple prev check" );
-       ok( $("#foo").prev("p")[0].id == "ap", "Filtered prev check" );
-       ok( $("#foo").prev("div").length == 0, "Filtered prev check, no match" );
-       ok( $("#foo").prev("p, div")[0].id == "ap", "Multiple filters" );
-});
-
-test("show()", function() {
-       expect(1);
-       var pass = true, div = $("div");
-       div.show().each(function(){
-         if ( this.style.display == "none" ) pass = false;
-       });
-       ok( pass, "Show" );
-});
-
-test("addClass(String)", function() {
-       expect(1);
-       var div = $("div");
-       div.addClass("test");
-       var pass = true;
-       for ( var i = 0; i < div.size(); i++ ) {
-        if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
-       }
-       ok( pass, "Add Class" );
-});
-
-test("removeClass(String) - simple", function() {
-       expect(3);
-       var div = $("div").addClass("test").removeClass("test"),
-               pass = true;
-       for ( var i = 0; i < div.size(); i++ ) {
-               if ( div.get(i).className.indexOf("test") != -1 ) pass = false;
-       }
-       ok( pass, "Remove Class" );
-       
-       reset();
-       var div = $("div").addClass("test").addClass("foo").addClass("bar");
-       div.removeClass("test").removeClass("bar").removeClass("foo");
-       var pass = true;
-       for ( var i = 0; i < div.size(); i++ ) {
-        if ( div.get(i).className.match(/test|bar|foo/) ) pass = false;
-       }
-       ok( pass, "Remove multiple classes" );
-       
-       reset();
-       var div = $("div:eq(0)").addClass("test").removeClass("");
-       ok( div.is('.test'), "Empty string passed to removeClass" );
-       
-});
-
-test("toggleClass(String)", function() {
-       expect(3);
-       var e = $("#firstp");
-       ok( !e.is(".test"), "Assert class not present" );
-       e.toggleClass("test");
-       ok( e.is(".test"), "Assert class present" ); 
-       e.toggleClass("test");
-       ok( !e.is(".test"), "Assert class not present" );
-});
-
-test("removeAttr(String", function() {
-       expect(1);
-       ok( $('#mark').removeAttr("class")[0].className == "", "remove class" );
-});
-
-test("text(String)", function() {
-       expect(1);
-       ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
-});
-
-test("$.each(Object,Function)", function() {
-       expect(8);
-       $.each( [0,1,2], function(i, n){
-               ok( i == n, "Check array iteration" );
-       });
-       
-       $.each( [5,6,7], function(i, n){
-               ok( i == n - 5, "Check array iteration" );
-       });
-        
-       $.each( { name: "name", lang: "lang" }, function(i, n){
-               ok( i == n, "Check object iteration" );
-       });
-});
-
-test("$.prop", function() {
-       expect(2);
-       var handle = function() { return this.id };
-       ok( $.prop($("#ap")[0], handle) == "ap", "Check with Function argument" );
-       ok( $.prop($("#ap")[0], "value") == "value", "Check with value argument" );
-});
-
-test("$.className", function() {
-       expect(6);
-       var x = $("<p>Hi</p>")[0];
-       var c = $.className;
-       c.add(x, "hi");
-       ok( x.className == "hi", "Check single added class" );
-       c.add(x, "foo bar");
-       ok( x.className == "hi foo bar", "Check more added classes" );
-       c.remove(x);
-       ok( x.className == "", "Remove all classes" );
-       c.add(x, "hi foo bar");
-       c.remove(x, "foo");
-       ok( x.className == "hi bar", "Check removal of one class" );
-       ok( c.has(x, "hi"), "Check has1" );
-       ok( c.has(x, "bar"), "Check has2" );
-});
-
-test("remove()", function() {
-       expect(4);
-       $("#ap").children().remove();
-       ok( $("#ap").text().length > 10, "Check text is not removed" );
-       ok( $("#ap").children().length == 0, "Check remove" );
-       
-       reset();
-       $("#ap").children().remove("a");
-       ok( $("#ap").text().length > 10, "Check text is not removed" );
-       ok( $("#ap").children().length == 1, "Check filtered remove" );
-});
-
-test("empty()", function() {
-       expect(2);
-       ok( $("#ap").children().empty().text().length == 0, "Check text is removed" );
-       ok( $("#ap").children().length == 4, "Check elements are not removed" );
-});
-
-test("slice()", function() {
-       expect(4);
-       isSet( $("#ap a").slice(1,2), q("groups"), "slice(1,2)" );
-       isSet( $("#ap a").slice(1), q("groups", "anchor1", "mark"), "slice(1)" );
-       isSet( $("#ap a").slice(0,3), q("google", "groups", "anchor1"), "slice(0,3)" );
-       isSet( $("#ap a").slice(-1), q("mark"), "slice(-1)" );
-});
-
-test("map()", function() {
-       expect(2);
-
-       isSet(
-               $("#ap").map(function(){
-                       return $(this).find("a").get();
-               }),
-               q("google", "groups", "anchor1", "mark"),
-               "Array Map"
-       );
-
-       isSet(
-               $("#ap > a").map(function(){
-                       return this.parentNode;
-               }),
-               q("ap","ap","ap"),
-               "Single Map"
-       );
-});
-
-test("contents()", function() {
-       expect(2);
-       equals( $("#ap").contents().length, 9, "Check element contents" );
-       ok( $("#iframe").contents()[0], "Check existance of IFrame document" );
-       // Disabled, randomly fails
-       //ok( $("#iframe").contents()[0].body, "Check existance of IFrame body" );
-});
diff --git a/test/unit/event.js b/test/unit/event.js
new file mode 100644 (file)
index 0000000..334f286
--- /dev/null
@@ -0,0 +1,194 @@
+module("event");
+
+test("bind()", function() {
+       expect(15);
+
+       var handler = function(event) {
+               ok( event.data, "bind() with data, check passed data exists" );
+               ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
+       };
+       $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
+       
+       ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
+       
+       reset();
+       var handler = function(event, data) {
+               ok( event.data, "check passed data exists" );
+               ok( event.data.foo == "bar", "Check value of passed data" );
+               ok( data, "Check trigger data" );
+               ok( data.bar == "foo", "Check value of trigger data" );
+       };
+       $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
+       
+       reset();
+       var handler = function(event) {
+               ok ( !event.data, "Check that no data is added to the event object" );
+       };
+       $("#firstp").bind("click", handler).trigger("click");
+       
+       
+       // events don't work with iframes, see #939 - this test fails in IE because of contentDocument
+       // var doc = document.getElementById("iframe").contentDocument;
+       // 
+       // doc.body.innerHTML = "<input type='text'/>";
+       //  
+       // var input = doc.getElementsByTagName("input")[0];
+       //  
+       // $(input).bind("click",function() {
+       //      ok( true, "Binding to element inside iframe" );
+       // }).click();
+       
+       var counter = 0;
+       function selectOnChange(event) {
+               equals( event.data, counter++, "Event.data is not a global event object" );
+       };
+       $("#form select").each(function(i){
+               $(this).bind('change', i, selectOnChange);
+       }).trigger('change');
+
+       reset();
+
+        $("#firstp").bind("click",function(e){
+               ok(true, "Normal click triggered");
+        });
+
+        $("#firstp").bind("click.test",function(e){
+               ok(true, "Namespaced click triggered");
+        });
+
+       // Trigger both bound fn (2)
+        $("#firstp").trigger("click");
+
+       // Trigger one bound fn (1)
+        $("#firstp").trigger("click.test");
+
+       // Remove only the one fn
+        $("#firstp").unbind("click.test");
+
+       // Trigger the remaining fn (1)
+        $("#firstp").trigger("click");
+});
+
+test("click()", function() {
+       expect(4);
+       $('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
+           var close = $('spanx', this); // same with $(this).find('span');
+           ok( close.length == 0, "Context element does not exist, length must be zero" );
+           ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
+           return false;
+       }).click();
+       
+       $("#check1").click(function() {
+               ok( true, "click event handler for checkbox gets fired twice, see #815" );
+       }).click();
+       
+       var counter = 0;
+       $('#firstp')[0].onclick = function(event) {
+               counter++;
+       };
+       $('#firstp').click();
+       ok( counter == 1, "Check that click, triggers onclick event handler also" );
+});
+
+test("unbind(event)", function() {
+       expect(6);
+       var el = $("#firstp");
+       el.click(function() {
+               ok( true, "Fake normal bind" );
+       });
+       el.click(function(event) {
+               el.unbind(event);
+               ok( true, "Fake onebind" );
+       });
+       el.click().click();
+       
+       el.click(function() { return; });
+       el.unbind('click');
+       ok( !el[0].onclick, "Handler is removed" ); // Bug #964
+
+       el.click(function() { return; });
+       el.unbind('change',function(){ return; });
+       for (var ret in el[0].$events['click']) break;
+       ok( ret, "Extra handlers weren't accidentally removed." );
+
+       el.unbind('click');
+       ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
+});
+
+test("trigger(event, [data], [fn])", function() {
+       expect(40);
+
+       var handler = function(event, a, b, c) {
+               equals( event.type, "click", "check passed data" );
+               equals( a, 1, "check passed data" );
+               equals( b, "2", "check passed data" );
+               equals( c, "abc", "check passed data" );
+               return "test";
+       };
+
+       var handler2 = function(a, b, c) {
+               equals( a, 1, "check passed data" );
+               equals( b, "2", "check passed data" );
+               equals( c, "abc", "check passed data" );
+               return "test2";
+       };
+
+       // Simulate a "native" click
+       $("#firstp")[0].click = function(){
+               ok( true, "Native call was triggered" );
+       };
+
+       // Triggers handlrs and native
+       // Trigger 5
+       $("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+
+       // Triggers handlers, native, and extra fn
+       // Triggers 8
+       $("#firstp").trigger("click", [1, "2", "abc"], handler2);
+
+       // Simulate a "native" click
+       $("#firstp")[0].click = function(){
+               ok( false, "Native call was triggered" );
+       };
+
+       // Trigger only the handlers (no native)
+       // Triggers 5
+       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+
+       // Trigger only the handlers (no native) and extra fn
+       // Triggers 8
+       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), "test", "Verify handler response" );
+
+       // Build fake click event to pass in
+       var eventObj = jQuery.event.fix({ type: "click", target: document.body });
+
+       // Trigger only the handlers (no native), with external event obj
+       // Triggers 5
+       equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
+
+       // Trigger only the handlers (no native) and extra fn, with external event obj
+       // Triggers 9
+       equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+});
+
+test("toggle(Function, Function)", function() {
+       expect(4);
+       var count = 0,
+               fn1 = function(e) { count++; },
+               fn2 = function(e) { count--; },
+               preventDefault = function(e) { e.preventDefault() },
+               link = $('#mark');
+       link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
+       ok( count == 1, "Check for toggle(fn, fn)" );
+       
+       var first = 0;
+       $("#simon1").one("click", function() {
+               ok( true, "Execute event only once" );
+               $(this).toggle(function() {
+                       ok( first++ == 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
+               }, function() {
+                       ok( first == 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
+               });
+               return false;
+       }).click().click().click();
+});
diff --git a/test/unit/eventTest.js b/test/unit/eventTest.js
deleted file mode 100644 (file)
index 334f286..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-module("event");
-
-test("bind()", function() {
-       expect(15);
-
-       var handler = function(event) {
-               ok( event.data, "bind() with data, check passed data exists" );
-               ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
-       };
-       $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
-       
-       ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
-       
-       reset();
-       var handler = function(event, data) {
-               ok( event.data, "check passed data exists" );
-               ok( event.data.foo == "bar", "Check value of passed data" );
-               ok( data, "Check trigger data" );
-               ok( data.bar == "foo", "Check value of trigger data" );
-       };
-       $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
-       
-       reset();
-       var handler = function(event) {
-               ok ( !event.data, "Check that no data is added to the event object" );
-       };
-       $("#firstp").bind("click", handler).trigger("click");
-       
-       
-       // events don't work with iframes, see #939 - this test fails in IE because of contentDocument
-       // var doc = document.getElementById("iframe").contentDocument;
-       // 
-       // doc.body.innerHTML = "<input type='text'/>";
-       //  
-       // var input = doc.getElementsByTagName("input")[0];
-       //  
-       // $(input).bind("click",function() {
-       //      ok( true, "Binding to element inside iframe" );
-       // }).click();
-       
-       var counter = 0;
-       function selectOnChange(event) {
-               equals( event.data, counter++, "Event.data is not a global event object" );
-       };
-       $("#form select").each(function(i){
-               $(this).bind('change', i, selectOnChange);
-       }).trigger('change');
-
-       reset();
-
-        $("#firstp").bind("click",function(e){
-               ok(true, "Normal click triggered");
-        });
-
-        $("#firstp").bind("click.test",function(e){
-               ok(true, "Namespaced click triggered");
-        });
-
-       // Trigger both bound fn (2)
-        $("#firstp").trigger("click");
-
-       // Trigger one bound fn (1)
-        $("#firstp").trigger("click.test");
-
-       // Remove only the one fn
-        $("#firstp").unbind("click.test");
-
-       // Trigger the remaining fn (1)
-        $("#firstp").trigger("click");
-});
-
-test("click()", function() {
-       expect(4);
-       $('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
-           var close = $('spanx', this); // same with $(this).find('span');
-           ok( close.length == 0, "Context element does not exist, length must be zero" );
-           ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
-           return false;
-       }).click();
-       
-       $("#check1").click(function() {
-               ok( true, "click event handler for checkbox gets fired twice, see #815" );
-       }).click();
-       
-       var counter = 0;
-       $('#firstp')[0].onclick = function(event) {
-               counter++;
-       };
-       $('#firstp').click();
-       ok( counter == 1, "Check that click, triggers onclick event handler also" );
-});
-
-test("unbind(event)", function() {
-       expect(6);
-       var el = $("#firstp");
-       el.click(function() {
-               ok( true, "Fake normal bind" );
-       });
-       el.click(function(event) {
-               el.unbind(event);
-               ok( true, "Fake onebind" );
-       });
-       el.click().click();
-       
-       el.click(function() { return; });
-       el.unbind('click');
-       ok( !el[0].onclick, "Handler is removed" ); // Bug #964
-
-       el.click(function() { return; });
-       el.unbind('change',function(){ return; });
-       for (var ret in el[0].$events['click']) break;
-       ok( ret, "Extra handlers weren't accidentally removed." );
-
-       el.unbind('click');
-       ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
-});
-
-test("trigger(event, [data], [fn])", function() {
-       expect(40);
-
-       var handler = function(event, a, b, c) {
-               equals( event.type, "click", "check passed data" );
-               equals( a, 1, "check passed data" );
-               equals( b, "2", "check passed data" );
-               equals( c, "abc", "check passed data" );
-               return "test";
-       };
-
-       var handler2 = function(a, b, c) {
-               equals( a, 1, "check passed data" );
-               equals( b, "2", "check passed data" );
-               equals( c, "abc", "check passed data" );
-               return "test2";
-       };
-
-       // Simulate a "native" click
-       $("#firstp")[0].click = function(){
-               ok( true, "Native call was triggered" );
-       };
-
-       // Triggers handlrs and native
-       // Trigger 5
-       $("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
-
-       // Triggers handlers, native, and extra fn
-       // Triggers 8
-       $("#firstp").trigger("click", [1, "2", "abc"], handler2);
-
-       // Simulate a "native" click
-       $("#firstp")[0].click = function(){
-               ok( false, "Native call was triggered" );
-       };
-
-       // Trigger only the handlers (no native)
-       // Triggers 5
-       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
-
-       // Trigger only the handlers (no native) and extra fn
-       // Triggers 8
-       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), "test", "Verify handler response" );
-
-       // Build fake click event to pass in
-       var eventObj = jQuery.event.fix({ type: "click", target: document.body });
-
-       // Trigger only the handlers (no native), with external event obj
-       // Triggers 5
-       equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
-
-       // Trigger only the handlers (no native) and extra fn, with external event obj
-       // Triggers 9
-       equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
-});
-
-test("toggle(Function, Function)", function() {
-       expect(4);
-       var count = 0,
-               fn1 = function(e) { count++; },
-               fn2 = function(e) { count--; },
-               preventDefault = function(e) { e.preventDefault() },
-               link = $('#mark');
-       link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
-       ok( count == 1, "Check for toggle(fn, fn)" );
-       
-       var first = 0;
-       $("#simon1").one("click", function() {
-               ok( true, "Execute event only once" );
-               $(this).toggle(function() {
-                       ok( first++ == 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
-               }, function() {
-                       ok( first == 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
-               });
-               return false;
-       }).click().click().click();
-});
diff --git a/test/unit/fx.js b/test/unit/fx.js
new file mode 100644 (file)
index 0000000..1f9e674
--- /dev/null
@@ -0,0 +1,307 @@
+module("fx");
+
+test("animate(Hash, Object, Function)", function() {
+       expect(1);
+       stop();
+       var hash = {opacity: 'show'};
+       var hashCopy = $.extend({}, hash);
+       $('#foo').animate(hash, 0, function() {
+               ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
+               start();
+       });
+});
+
+test("stop()", function() {
+       expect(3);
+       stop();
+       reset();
+
+       var foo = $("#foo")[0];
+       var h = foo.style.height;
+
+       $("#foo").slideUp(1000);
+       setTimeout(function(){
+               var nh = foo.style.height;
+               ok( nh != h, "An animation occurred " + nh + " " + h );
+               $("#foo").stop();
+
+               nh = foo.style.height;
+               ok( nh != h, "Stop didn't reset the animation " + nh + " " + h );
+               setTimeout(function(){
+                       equals( nh, foo.style.height, "The animation didn't continue" );
+                       start();
+               }, 100);
+       }, 100);
+});
+
+test("toggle()", function() {
+       expect(3);
+       var x = $("#foo");
+       ok( x.is(":visible") );
+       x.toggle();
+       ok( x.is(":hidden") );
+       x.toggle();
+       ok( x.is(":visible") );
+});
+
+var visible = {
+       Normal: function(elem){},
+       "CSS Hidden": function(elem){
+               $(this).addClass("hidden");
+       },
+       "JS Hidden": function(elem){
+               $(this).hide();
+       }
+};
+
+var from = {
+       "CSS Auto": function(elem,prop){
+               $(elem).addClass("auto" + prop)
+                       .text("This is a long string of text.");
+               return "";
+       },
+       "JS Auto": function(elem,prop){
+               $(elem).css(prop,"auto")
+                       .text("This is a long string of text.");
+               return "";
+       },
+       "CSS 100": function(elem,prop){
+               $(elem).addClass("large" + prop);
+               return "";
+       },
+       "JS 100": function(elem,prop){
+               $(elem).css(prop,prop == "opacity" ? 1 : "100px");
+               return prop == "opacity" ? 1 : 100;
+       },
+       "CSS 50": function(elem,prop){
+               $(elem).addClass("med" + prop);
+               return "";
+       },
+       "JS 50": function(elem,prop){
+               $(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
+               return prop == "opacity" ? 0.5 : 50;
+       },
+       "CSS 0": function(elem,prop){
+               $(elem).addClass("no" + prop);
+               return "";
+       },
+       "JS 0": function(elem,prop){
+               $(elem).css(prop,prop == "opacity" ? 0 : "0px");
+               return 0;
+       }
+};
+
+var to = {
+       "show": function(elem,prop){
+               $(elem).hide().addClass("wide"+prop);
+               return "show";
+       },
+       "hide": function(elem,prop){
+               $(elem).addClass("wide"+prop);
+               return "hide";
+       },
+       "100": function(elem,prop){
+               $(elem).addClass("wide"+prop);
+               return prop == "opacity" ? 1 : 100;
+       },
+       "50": function(elem,prop){
+               return prop == "opacity" ? 0.50 : 50;
+       },
+       "0": function(elem,prop){
+               $(elem).addClass("noback");
+               return 0;
+       }
+};
+
+function checkOverflowDisplay(){
+       var o = jQuery.css( this, "overflow" );
+
+       ok(o == "visible", "Overflow should be visible: " + o);
+       ok(jQuery.css( this, "display" ) == "inline", "Display shouldn't be tampered with.");
+
+       start();
+}
+
+test("JS Overflow and Display", function() {
+       expect(2);
+       stop();
+       makeTest( "JS Overflow and Display" )
+               .addClass("widewidth")
+               .css({ overflow: "visible", display: "inline" })
+               .addClass("widewidth")
+               .text("Some sample text.")
+               .before("text before")
+               .after("text after")
+               .animate({ opacity: 0.5 }, "slow", checkOverflowDisplay);
+});
+               
+test("CSS Overflow and Display", function() {
+       expect(2);
+       stop();
+       makeTest( "CSS Overflow and Display" )
+               .addClass("overflow inline")
+               .addClass("widewidth")
+               .text("Some sample text.")
+               .before("text before")
+               .after("text after")
+               .animate({ opacity: 0.5 }, "slow", checkOverflowDisplay);
+});
+
+jQuery.each( from, function(fn, f){
+       jQuery.each( to, function(tn, t){
+               test(fn + " to " + tn, function() {
+                       var elem = makeTest( fn + " to " + tn );
+       
+                       var t_w = t( elem, "width" );
+                       var f_w = f( elem, "width" );
+                       var t_h = t( elem, "height" );
+                       var f_h = f( elem, "height" );
+                       var t_o = t( elem, "opacity" );
+                       var f_o = f( elem, "opacity" );
+                       
+                       var num = 0;
+                       
+                       if ( t_h == "show" ) num++;
+                       if ( t_w == "show" ) num++;
+                       if ( t_w == "hide"||t_w == "show" ) num++;
+                       if ( t_h == "hide"||t_h == "show" ) num++;
+                       if ( t_o == "hide"||t_o == "show" ) num++;
+                       if ( t_w == "hide" ) num++;
+                       if ( t_o.constructor == Number ) num += 2;
+                       if ( t_w.constructor == Number ) num += 2;
+                       if ( t_h.constructor == Number ) num +=2;
+                       
+                       expect(num);
+                       stop();
+       
+                       var anim = { width: t_w, height: t_h, opacity: t_o };
+       
+                       elem.animate(anim, 50, function(){
+                               if ( t_w == "show" )
+                                       ok( this.style.display == "block", "Showing, display should block: " + this.style.display);
+                                       
+                               if ( t_w == "hide"||t_w == "show" )
+                                       ok(this.style.width.indexOf(f_w) == 0, "Width must be reset to " + f_w + ": " + this.style.width);
+                                       
+                               if ( t_h == "hide"||t_h == "show" )
+                                       ok(this.style.height.indexOf(f_h) == 0, "Height must be reset to " + f_h + ": " + this.style.height);
+                                       
+                               var cur_o = jQuery.attr(this.style, "opacity");
+                               if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
+       
+                               if ( t_o == "hide"||t_o == "show" )
+                                       ok(cur_o == f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
+                                       
+                               if ( t_w == "hide" )
+                                       ok(this.style.display == "none", "Hiding, display should be none: " + this.style.display);
+                                       
+                               if ( t_o.constructor == Number ) {
+                                       ok(cur_o == t_o, "Final opacity should be " + t_o + ": " + cur_o);
+                                       
+                                       ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
+                               }
+                                       
+                               if ( t_w.constructor == Number ) {
+                                       ok(this.style.width == t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
+                                       
+                                       var cur_w = jQuery.css(this,"width");
+
+                                       ok(this.style.width != "" || cur_w == t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w);
+                               }
+                                       
+                               if ( t_h.constructor == Number ) {
+                                       ok(this.style.height == t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
+                                       
+                                       var cur_h = jQuery.css(this,"height");
+
+                                       ok(this.style.height != "" || cur_h == t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_w);
+                               }
+                               
+                               if ( t_h == "show" ) {
+                                       var old_h = jQuery.curCSS(this, "height");
+                                       $(elem).append("<br/>Some more text<br/>and some more...");
+                                       ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
+                               }
+       
+                               start();
+                       });
+               });
+       });
+});
+
+var check = ['opacity','height','width','display','overflow'];
+
+jQuery.fn.saveState = function(){
+       expect(check.length);
+       stop();
+       return this.each(function(){
+               var self = this;
+               self.save = {};
+               jQuery.each(check, function(i,c){
+                       self.save[c] = jQuery.css(self,c);
+               });
+       });
+};
+
+function checkState(){
+       var self = this;
+       jQuery.each(this.save, function(c,v){
+               var cur = jQuery.css(self,c);
+               ok( v == cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+       });
+       start();
+}
+
+// Chaining Tests
+test("Chain fadeOut fadeIn", function() {
+       $('#fadein div').saveState().fadeOut('fast').fadeIn('fast',checkState);
+});
+test("Chain fadeIn fadeOut", function() {
+       $('#fadeout div').saveState().fadeIn('fast').fadeOut('fast',checkState);
+});
+
+test("Chain hide show", function() {
+       $('#show div').saveState().hide('fast').show('fast',checkState);
+});
+test("Chain show hide", function() {
+       $('#hide div').saveState().show('fast').hide('fast',checkState);
+});
+
+test("Chain toggle in", function() {
+       $('#togglein div').saveState().toggle('fast').toggle('fast',checkState);
+});
+test("Chain toggle out", function() {
+       $('#toggleout div').saveState().toggle('fast').toggle('fast',checkState);
+});
+
+test("Chain slideDown slideUp", function() {
+       $('#slidedown div').saveState().slideDown('fast').slideUp('fast',checkState);
+});
+test("Chain slideUp slideDown", function() {
+       $('#slideup div').saveState().slideUp('fast').slideDown('fast',checkState);
+});
+
+test("Chain slideToggle in", function() {
+       $('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',checkState);
+});
+test("Chain slideToggle out", function() {
+       $('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',checkState);
+});
+
+function makeTest( text ){
+       var elem = $("<div></div>")
+               .attr("id", "test" + makeTest.id++)
+               .addClass("box");
+
+       $("<h4></h4>")
+               .text( text )
+               .appendTo("#fx-tests")
+               .click(function(){
+                       $(this).next().toggle();
+               })
+               .after( elem );
+
+       return elem;
+}
+
+makeTest.id = 1;
diff --git a/test/unit/fxTest.js b/test/unit/fxTest.js
deleted file mode 100644 (file)
index 1f9e674..0000000
+++ /dev/null
@@ -1,307 +0,0 @@
-module("fx");
-
-test("animate(Hash, Object, Function)", function() {
-       expect(1);
-       stop();
-       var hash = {opacity: 'show'};
-       var hashCopy = $.extend({}, hash);
-       $('#foo').animate(hash, 0, function() {
-               ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
-               start();
-       });
-});
-
-test("stop()", function() {
-       expect(3);
-       stop();
-       reset();
-
-       var foo = $("#foo")[0];
-       var h = foo.style.height;
-
-       $("#foo").slideUp(1000);
-       setTimeout(function(){
-               var nh = foo.style.height;
-               ok( nh != h, "An animation occurred " + nh + " " + h );
-               $("#foo").stop();
-
-               nh = foo.style.height;
-               ok( nh != h, "Stop didn't reset the animation " + nh + " " + h );
-               setTimeout(function(){
-                       equals( nh, foo.style.height, "The animation didn't continue" );
-                       start();
-               }, 100);
-       }, 100);
-});
-
-test("toggle()", function() {
-       expect(3);
-       var x = $("#foo");
-       ok( x.is(":visible") );
-       x.toggle();
-       ok( x.is(":hidden") );
-       x.toggle();
-       ok( x.is(":visible") );
-});
-
-var visible = {
-       Normal: function(elem){},
-       "CSS Hidden": function(elem){
-               $(this).addClass("hidden");
-       },
-       "JS Hidden": function(elem){
-               $(this).hide();
-       }
-};
-
-var from = {
-       "CSS Auto": function(elem,prop){
-               $(elem).addClass("auto" + prop)
-                       .text("This is a long string of text.");
-               return "";
-       },
-       "JS Auto": function(elem,prop){
-               $(elem).css(prop,"auto")
-                       .text("This is a long string of text.");
-               return "";
-       },
-       "CSS 100": function(elem,prop){
-               $(elem).addClass("large" + prop);
-               return "";
-       },
-       "JS 100": function(elem,prop){
-               $(elem).css(prop,prop == "opacity" ? 1 : "100px");
-               return prop == "opacity" ? 1 : 100;
-       },
-       "CSS 50": function(elem,prop){
-               $(elem).addClass("med" + prop);
-               return "";
-       },
-       "JS 50": function(elem,prop){
-               $(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
-               return prop == "opacity" ? 0.5 : 50;
-       },
-       "CSS 0": function(elem,prop){
-               $(elem).addClass("no" + prop);
-               return "";
-       },
-       "JS 0": function(elem,prop){
-               $(elem).css(prop,prop == "opacity" ? 0 : "0px");
-               return 0;
-       }
-};
-
-var to = {
-       "show": function(elem,prop){
-               $(elem).hide().addClass("wide"+prop);
-               return "show";
-       },
-       "hide": function(elem,prop){
-               $(elem).addClass("wide"+prop);
-               return "hide";
-       },
-       "100": function(elem,prop){
-               $(elem).addClass("wide"+prop);
-               return prop == "opacity" ? 1 : 100;
-       },
-       "50": function(elem,prop){
-               return prop == "opacity" ? 0.50 : 50;
-       },
-       "0": function(elem,prop){
-               $(elem).addClass("noback");
-               return 0;
-       }
-};
-
-function checkOverflowDisplay(){
-       var o = jQuery.css( this, "overflow" );
-
-       ok(o == "visible", "Overflow should be visible: " + o);
-       ok(jQuery.css( this, "display" ) == "inline", "Display shouldn't be tampered with.");
-
-       start();
-}
-
-test("JS Overflow and Display", function() {
-       expect(2);
-       stop();
-       makeTest( "JS Overflow and Display" )
-               .addClass("widewidth")
-               .css({ overflow: "visible", display: "inline" })
-               .addClass("widewidth")
-               .text("Some sample text.")
-               .before("text before")
-               .after("text after")
-               .animate({ opacity: 0.5 }, "slow", checkOverflowDisplay);
-});
-               
-test("CSS Overflow and Display", function() {
-       expect(2);
-       stop();
-       makeTest( "CSS Overflow and Display" )
-               .addClass("overflow inline")
-               .addClass("widewidth")
-               .text("Some sample text.")
-               .before("text before")
-               .after("text after")
-               .animate({ opacity: 0.5 }, "slow", checkOverflowDisplay);
-});
-
-jQuery.each( from, function(fn, f){
-       jQuery.each( to, function(tn, t){
-               test(fn + " to " + tn, function() {
-                       var elem = makeTest( fn + " to " + tn );
-       
-                       var t_w = t( elem, "width" );
-                       var f_w = f( elem, "width" );
-                       var t_h = t( elem, "height" );
-                       var f_h = f( elem, "height" );
-                       var t_o = t( elem, "opacity" );
-                       var f_o = f( elem, "opacity" );
-                       
-                       var num = 0;
-                       
-                       if ( t_h == "show" ) num++;
-                       if ( t_w == "show" ) num++;
-                       if ( t_w == "hide"||t_w == "show" ) num++;
-                       if ( t_h == "hide"||t_h == "show" ) num++;
-                       if ( t_o == "hide"||t_o == "show" ) num++;
-                       if ( t_w == "hide" ) num++;
-                       if ( t_o.constructor == Number ) num += 2;
-                       if ( t_w.constructor == Number ) num += 2;
-                       if ( t_h.constructor == Number ) num +=2;
-                       
-                       expect(num);
-                       stop();
-       
-                       var anim = { width: t_w, height: t_h, opacity: t_o };
-       
-                       elem.animate(anim, 50, function(){
-                               if ( t_w == "show" )
-                                       ok( this.style.display == "block", "Showing, display should block: " + this.style.display);
-                                       
-                               if ( t_w == "hide"||t_w == "show" )
-                                       ok(this.style.width.indexOf(f_w) == 0, "Width must be reset to " + f_w + ": " + this.style.width);
-                                       
-                               if ( t_h == "hide"||t_h == "show" )
-                                       ok(this.style.height.indexOf(f_h) == 0, "Height must be reset to " + f_h + ": " + this.style.height);
-                                       
-                               var cur_o = jQuery.attr(this.style, "opacity");
-                               if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
-       
-                               if ( t_o == "hide"||t_o == "show" )
-                                       ok(cur_o == f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
-                                       
-                               if ( t_w == "hide" )
-                                       ok(this.style.display == "none", "Hiding, display should be none: " + this.style.display);
-                                       
-                               if ( t_o.constructor == Number ) {
-                                       ok(cur_o == t_o, "Final opacity should be " + t_o + ": " + cur_o);
-                                       
-                                       ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
-                               }
-                                       
-                               if ( t_w.constructor == Number ) {
-                                       ok(this.style.width == t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
-                                       
-                                       var cur_w = jQuery.css(this,"width");
-
-                                       ok(this.style.width != "" || cur_w == t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w);
-                               }
-                                       
-                               if ( t_h.constructor == Number ) {
-                                       ok(this.style.height == t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
-                                       
-                                       var cur_h = jQuery.css(this,"height");
-
-                                       ok(this.style.height != "" || cur_h == t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_w);
-                               }
-                               
-                               if ( t_h == "show" ) {
-                                       var old_h = jQuery.curCSS(this, "height");
-                                       $(elem).append("<br/>Some more text<br/>and some more...");
-                                       ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
-                               }
-       
-                               start();
-                       });
-               });
-       });
-});
-
-var check = ['opacity','height','width','display','overflow'];
-
-jQuery.fn.saveState = function(){
-       expect(check.length);
-       stop();
-       return this.each(function(){
-               var self = this;
-               self.save = {};
-               jQuery.each(check, function(i,c){
-                       self.save[c] = jQuery.css(self,c);
-               });
-       });
-};
-
-function checkState(){
-       var self = this;
-       jQuery.each(this.save, function(c,v){
-               var cur = jQuery.css(self,c);
-               ok( v == cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
-       });
-       start();
-}
-
-// Chaining Tests
-test("Chain fadeOut fadeIn", function() {
-       $('#fadein div').saveState().fadeOut('fast').fadeIn('fast',checkState);
-});
-test("Chain fadeIn fadeOut", function() {
-       $('#fadeout div').saveState().fadeIn('fast').fadeOut('fast',checkState);
-});
-
-test("Chain hide show", function() {
-       $('#show div').saveState().hide('fast').show('fast',checkState);
-});
-test("Chain show hide", function() {
-       $('#hide div').saveState().show('fast').hide('fast',checkState);
-});
-
-test("Chain toggle in", function() {
-       $('#togglein div').saveState().toggle('fast').toggle('fast',checkState);
-});
-test("Chain toggle out", function() {
-       $('#toggleout div').saveState().toggle('fast').toggle('fast',checkState);
-});
-
-test("Chain slideDown slideUp", function() {
-       $('#slidedown div').saveState().slideDown('fast').slideUp('fast',checkState);
-});
-test("Chain slideUp slideDown", function() {
-       $('#slideup div').saveState().slideUp('fast').slideDown('fast',checkState);
-});
-
-test("Chain slideToggle in", function() {
-       $('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',checkState);
-});
-test("Chain slideToggle out", function() {
-       $('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',checkState);
-});
-
-function makeTest( text ){
-       var elem = $("<div></div>")
-               .attr("id", "test" + makeTest.id++)
-               .addClass("box");
-
-       $("<h4></h4>")
-               .text( text )
-               .appendTo("#fx-tests")
-               .click(function(){
-                       $(this).next().toggle();
-               })
-               .after( elem );
-
-       return elem;
-}
-
-makeTest.id = 1;
diff --git a/test/unit/selector.js b/test/unit/selector.js
new file mode 100644 (file)
index 0000000..d6121f2
--- /dev/null
@@ -0,0 +1,202 @@
+module("selector");
+
+test("element", function() {
+       expect(9);
+       ok( $("*").size() >= 30, "Select all" );
+       var all = $("*"), good = true;
+       for ( var i = 0; i < all.length; i++ )
+               if ( all[i].nodeType == 8 )
+                       good = false;
+       ok( good, "Select all elements, no comment nodes" );
+       t( "Element Selector", "p", ["firstp","ap","sndp","en","sap","first"] );
+       t( "Element Selector", "body", ["body"] );
+       t( "Element Selector", "html", ["html"] );
+       t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
+       ok( $("param", "#object1").length == 2, "Object/param as context" );
+       
+       ok( $("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
+       ok( $("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
+});
+
+if ( location.protocol != "file:" ) {
+       test("Element Selector with underscore", function() {
+               expect(1);
+               stop();
+               $.get("data/with_fries.xml", function(xml) {
+                       ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
+                       start();
+               });
+       });
+}
+
+test("broken", function() {
+       expect(7);
+       t( "Broken Selector", "[", [] );
+       t( "Broken Selector", "(", [] );
+       t( "Broken Selector", "{", [] );
+       t( "Broken Selector", "<", [] );
+       t( "Broken Selector", "()", [] );
+       t( "Broken Selector", "<>", [] );
+       t( "Broken Selector", "{}", [] );
+});
+
+test("id", function() {
+       expect(25);
+       t( "ID Selector", "#body", ["body"] );
+       t( "ID Selector w/ Element", "body#body", ["body"] );
+       t( "ID Selector w/ Element", "ul#first", [] );
+       t( "ID selector with existing ID descendant", "#firstp #simon1", ["simon1"] );
+       t( "ID selector with non-existant descendant", "#firstp #foobar", [] );
+       t( "ID selector using UTF8", "#台北Táiběi", ["台北Táiběi"] );
+       t( "Multiple ID selectors using UTF8", "#台北Táiběi, #台北", ["台北Táiběi","台北"] );
+       t( "Descendant ID selector using UTF8", "div #台北", ["台北"] );
+       t( "Child ID selector using UTF8", "form > #台北", ["台北"] );
+       
+       t( "Escaped ID", "#foo\\:bar", ["foo:bar"] );
+       t( "Escaped ID", "#test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
+       t( "Descendant escaped ID", "div #foo\\:bar", ["foo:bar"] );
+       t( "Descendant escaped ID", "div #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
+       t( "Child escaped ID", "form > #foo\\:bar", ["foo:bar"] );
+       t( "Child escaped ID", "form > #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
+       
+       t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] );  // bug #267
+       t( "ID Selector, not an ancestor ID", "#form  #first", [] );
+       t( "ID Selector, not a child ID", "#form > #option1a", [] );
+       
+       t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
+       t( "All Children of ID with no children", "#firstUL/*", [] );
+       
+       $('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
+       ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" );
+       ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" );
+       t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
+       
+       t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
+
+       isSet( $("body").find("div#form"), [], "ID selector within the context of another element" );
+});
+
+test("class", function() {
+       expect(16);
+       t( "Class Selector", ".blog", ["mark","simon"] );
+       t( "Class Selector", ".blog.link", ["simon"] );
+       t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
+       t( "Parent Class Selector", "p .blog", ["mark","simon"] );
+       
+       t( "Class selector using UTF8", ".台北Táiběi", ["utf8class1"] );
+       t( "Class selector using UTF8", ".台北", ["utf8class1","utf8class2"] );
+       t( "Class selector using UTF8", ".台北Táiběi.台北", ["utf8class1"] );
+       t( "Class selector using UTF8", ".台北Táiběi, .台北", ["utf8class1","utf8class2"] );
+       t( "Descendant class selector using UTF8", "div .台北Táiběi", ["utf8class1"] );
+       t( "Child class selector using UTF8", "form > .台北Táiběi", ["utf8class1"] );
+       
+       t( "Escaped Class", ".foo\\:bar", ["foo:bar"] );
+       t( "Escaped Class", ".test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
+       t( "Descendant scaped Class", "div .foo\\:bar", ["foo:bar"] );
+       t( "Descendant scaped Class", "div .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
+       t( "Child escaped Class", "form > .foo\\:bar", ["foo:bar"] );
+       t( "Child escaped Class", "form > .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
+});
+
+test("multiple", function() {
+       expect(4);
+       t( "Comma Support", "a.blog, p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+       t( "Comma Support", "a.blog , p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+       t( "Comma Support", "a.blog ,p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+       t( "Comma Support", "a.blog,p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
+});
+
+test("child and adjacent", function() {
+       expect(19);
+       t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
+       t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
+       t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
+       t( "Child", "p>a", ["simon1","google","groups","mark","yahoo","simon"] );
+       t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
+       t( "All Children", "code > *", ["anchor1","anchor2"] );
+       t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
+       t( "Adjacent", "a + a", ["groups"] );
+       t( "Adjacent", "a +a", ["groups"] );
+       t( "Adjacent", "a+ a", ["groups"] );
+       t( "Adjacent", "a+a", ["groups"] );
+       t( "Adjacent", "p + p", ["ap","en","sap"] );
+       t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
+       
+       t( "First Child", "p:first-child", ["firstp","sndp"] );
+       t( "Nth Child", "p:nth-child(1)", ["firstp","sndp"] );
+       
+       t( "Last Child", "p:last-child", ["sap"] );
+       t( "Last Child", "a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon"] );
+       
+       t( "Nth-child", "#main form#form > *:nth-child(2)", ["text2"] );
+       t( "Nth-child", "#main form#form > :nth-child(2)", ["text2"] );
+});
+
+test("attributes", function() {
+       expect(20);
+       t( "Attribute Exists", "a[title]", ["google"] );
+       t( "Attribute Exists", "*[title]", ["google"] );
+       t( "Attribute Exists", "[title]", ["google"] );
+       
+       t( "Attribute Equals", "a[rel='bookmark']", ["simon1"] );
+       t( "Attribute Equals", 'a[rel="bookmark"]', ["simon1"] );
+       t( "Attribute Equals", "a[rel=bookmark]", ["simon1"] );
+       t( "Multiple Attribute Equals", "#form input[type='hidden'],#form input[type='radio']", ["hidden1","radio1","radio2"] );
+       t( "Multiple Attribute Equals", "#form input[type=\"hidden\"],#form input[type='radio']", ["hidden1","radio1","radio2"] );
+       t( "Multiple Attribute Equals", "#form input[type=hidden],#form input[type=radio]", ["hidden1","radio1","radio2"] );
+       
+       t( "Attribute selector using UTF8", "span[lang=中文]", ["台北"] );
+       
+       t( "Attribute Begins With", "a[href ^= 'http://www']", ["google","yahoo"] );
+       t( "Attribute Ends With", "a[href $= 'org/']", ["mark"] );
+       t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
+       
+       t("Select options via [selected]", "#select1 option[selected]", ["option1a"] );
+       t("Select options via [selected]", "#select2 option[selected]", ["option2d"] );
+       t("Select options via [selected]", "#select3 option[selected]", ["option3b", "option3c"] );
+       
+       t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
+       
+       t( ":not() Existing attribute", "#form select:not([multiple])", ["select1", "select2"]);
+       t( ":not() Equals attribute", "#form select:not([name=select1])", ["select2", "select3"]);
+       t( ":not() Equals quoted attribute", "#form select:not([name='select1'])", ["select2", "select3"]);
+});
+
+test("pseudo (:) selectors", function() {
+       expect(32);
+       t( "First Child", "p:first-child", ["firstp","sndp"] );
+       t( "Last Child", "p:last-child", ["sap"] );
+       t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
+       t( "Empty", "ul:empty", ["firstUL"] );
+       t( "Enabled UI Element", "#form input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name"] );
+       t( "Disabled UI Element", "#form input:disabled", ["text2"] );
+       t( "Checked UI Element", "#form input:checked", ["radio2","check1"] );
+       t( "Selected Option Element", "#form option:selected", ["option1a","option2d","option3b","option3c"] );
+       t( "Text Contains", "a:contains('Google')", ["google","groups"] );
+       t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
+       t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests"] );
+       t( "Not", "a.blog:not(.link)", ["mark"] );
+       
+       t( "nth Element", "p:nth(1)", ["ap"] );
+       t( "First Element", "p:first", ["firstp"] );
+       t( "Last Element", "p:last", ["first"] );
+       t( "Even Elements", "p:even", ["firstp","sndp","sap"] );
+       t( "Odd Elements", "p:odd", ["ap","en","first"] );
+       t( "Position Equals", "p:eq(1)", ["ap"] );
+       t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] );
+       t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
+       t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
+       t( "Is Visible", "#form input:visible", ["text1","text2","radio1","radio2","check1","check2","name"] );
+       t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] );
+       
+       t( "Form element :input", "#form :input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3"] );
+       t( "Form element :radio", "#form :radio", ["radio1", "radio2"] );
+       t( "Form element :checkbox", "#form :checkbox", ["check1", "check2"] );
+       t( "Form element :text", "#form :text", ["text1", "text2", "hidden2", "name"] );
+       t( "Form element :radio:checked", "#form :radio:checked", ["radio2"] );
+       t( "Form element :checkbox:checked", "#form :checkbox:checked", ["check1"] );
+       t( "Form element :checkbox:checked, :radio:checked", "#form :checkbox:checked, #form :radio:checked", ["check1", "radio2"] );
+
+       t( "Headers", ":header", ["header", "banner", "userAgent"] );
+       t( "Has Children - :has()", "p:has(a)", ["firstp","ap","en","sap"] );
+});
diff --git a/test/unit/selectorTest.js b/test/unit/selectorTest.js
deleted file mode 100644 (file)
index d6121f2..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-module("selector");
-
-test("element", function() {
-       expect(9);
-       ok( $("*").size() >= 30, "Select all" );
-       var all = $("*"), good = true;
-       for ( var i = 0; i < all.length; i++ )
-               if ( all[i].nodeType == 8 )
-                       good = false;
-       ok( good, "Select all elements, no comment nodes" );
-       t( "Element Selector", "p", ["firstp","ap","sndp","en","sap","first"] );
-       t( "Element Selector", "body", ["body"] );
-       t( "Element Selector", "html", ["html"] );
-       t( "Parent Element", "div p", ["firstp","ap","sndp","en","sap","first"] );
-       ok( $("param", "#object1").length == 2, "Object/param as context" );
-       
-       ok( $("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
-       ok( $("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
-});
-
-if ( location.protocol != "file:" ) {
-       test("Element Selector with underscore", function() {
-               expect(1);
-               stop();
-               $.get("data/with_fries.xml", function(xml) {
-                       ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
-                       start();
-               });
-       });
-}
-
-test("broken", function() {
-       expect(7);
-       t( "Broken Selector", "[", [] );
-       t( "Broken Selector", "(", [] );
-       t( "Broken Selector", "{", [] );
-       t( "Broken Selector", "<", [] );
-       t( "Broken Selector", "()", [] );
-       t( "Broken Selector", "<>", [] );
-       t( "Broken Selector", "{}", [] );
-});
-
-test("id", function() {
-       expect(25);
-       t( "ID Selector", "#body", ["body"] );
-       t( "ID Selector w/ Element", "body#body", ["body"] );
-       t( "ID Selector w/ Element", "ul#first", [] );
-       t( "ID selector with existing ID descendant", "#firstp #simon1", ["simon1"] );
-       t( "ID selector with non-existant descendant", "#firstp #foobar", [] );
-       t( "ID selector using UTF8", "#台北Táiběi", ["台北Táiběi"] );
-       t( "Multiple ID selectors using UTF8", "#台北Táiběi, #台北", ["台北Táiběi","台北"] );
-       t( "Descendant ID selector using UTF8", "div #台北", ["台北"] );
-       t( "Child ID selector using UTF8", "form > #台北", ["台北"] );
-       
-       t( "Escaped ID", "#foo\\:bar", ["foo:bar"] );
-       t( "Escaped ID", "#test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-       t( "Descendant escaped ID", "div #foo\\:bar", ["foo:bar"] );
-       t( "Descendant escaped ID", "div #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-       t( "Child escaped ID", "form > #foo\\:bar", ["foo:bar"] );
-       t( "Child escaped ID", "form > #test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-       
-       t( "ID Selector, child ID present", "#form > #radio1", ["radio1"] );  // bug #267
-       t( "ID Selector, not an ancestor ID", "#form  #first", [] );
-       t( "ID Selector, not a child ID", "#form > #option1a", [] );
-       
-       t( "All Children of ID", "#foo > *", ["sndp", "en", "sap"] );
-       t( "All Children of ID with no children", "#firstUL/*", [] );
-       
-       $('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
-       ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" );
-       ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" );
-       t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
-       
-       t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
-
-       isSet( $("body").find("div#form"), [], "ID selector within the context of another element" );
-});
-
-test("class", function() {
-       expect(16);
-       t( "Class Selector", ".blog", ["mark","simon"] );
-       t( "Class Selector", ".blog.link", ["simon"] );
-       t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
-       t( "Parent Class Selector", "p .blog", ["mark","simon"] );
-       
-       t( "Class selector using UTF8", ".台北Táiběi", ["utf8class1"] );
-       t( "Class selector using UTF8", ".台北", ["utf8class1","utf8class2"] );
-       t( "Class selector using UTF8", ".台北Táiběi.台北", ["utf8class1"] );
-       t( "Class selector using UTF8", ".台北Táiběi, .台北", ["utf8class1","utf8class2"] );
-       t( "Descendant class selector using UTF8", "div .台北Táiběi", ["utf8class1"] );
-       t( "Child class selector using UTF8", "form > .台北Táiběi", ["utf8class1"] );
-       
-       t( "Escaped Class", ".foo\\:bar", ["foo:bar"] );
-       t( "Escaped Class", ".test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-       t( "Descendant scaped Class", "div .foo\\:bar", ["foo:bar"] );
-       t( "Descendant scaped Class", "div .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-       t( "Child escaped Class", "form > .foo\\:bar", ["foo:bar"] );
-       t( "Child escaped Class", "form > .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
-});
-
-test("multiple", function() {
-       expect(4);
-       t( "Comma Support", "a.blog, p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
-       t( "Comma Support", "a.blog , p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
-       t( "Comma Support", "a.blog ,p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
-       t( "Comma Support", "a.blog,p", ["mark","simon","firstp","ap","sndp","en","sap","first"] );
-});
-
-test("child and adjacent", function() {
-       expect(19);
-       t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
-       t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
-       t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
-       t( "Child", "p>a", ["simon1","google","groups","mark","yahoo","simon"] );
-       t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
-       t( "All Children", "code > *", ["anchor1","anchor2"] );
-       t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
-       t( "Adjacent", "a + a", ["groups"] );
-       t( "Adjacent", "a +a", ["groups"] );
-       t( "Adjacent", "a+ a", ["groups"] );
-       t( "Adjacent", "a+a", ["groups"] );
-       t( "Adjacent", "p + p", ["ap","en","sap"] );
-       t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
-       
-       t( "First Child", "p:first-child", ["firstp","sndp"] );
-       t( "Nth Child", "p:nth-child(1)", ["firstp","sndp"] );
-       
-       t( "Last Child", "p:last-child", ["sap"] );
-       t( "Last Child", "a:last-child", ["simon1","anchor1","mark","yahoo","anchor2","simon"] );
-       
-       t( "Nth-child", "#main form#form > *:nth-child(2)", ["text2"] );
-       t( "Nth-child", "#main form#form > :nth-child(2)", ["text2"] );
-});
-
-test("attributes", function() {
-       expect(20);
-       t( "Attribute Exists", "a[title]", ["google"] );
-       t( "Attribute Exists", "*[title]", ["google"] );
-       t( "Attribute Exists", "[title]", ["google"] );
-       
-       t( "Attribute Equals", "a[rel='bookmark']", ["simon1"] );
-       t( "Attribute Equals", 'a[rel="bookmark"]', ["simon1"] );
-       t( "Attribute Equals", "a[rel=bookmark]", ["simon1"] );
-       t( "Multiple Attribute Equals", "#form input[type='hidden'],#form input[type='radio']", ["hidden1","radio1","radio2"] );
-       t( "Multiple Attribute Equals", "#form input[type=\"hidden\"],#form input[type='radio']", ["hidden1","radio1","radio2"] );
-       t( "Multiple Attribute Equals", "#form input[type=hidden],#form input[type=radio]", ["hidden1","radio1","radio2"] );
-       
-       t( "Attribute selector using UTF8", "span[lang=中文]", ["台北"] );
-       
-       t( "Attribute Begins With", "a[href ^= 'http://www']", ["google","yahoo"] );
-       t( "Attribute Ends With", "a[href $= 'org/']", ["mark"] );
-       t( "Attribute Contains", "a[href *= 'google']", ["google","groups"] );
-       
-       t("Select options via [selected]", "#select1 option[selected]", ["option1a"] );
-       t("Select options via [selected]", "#select2 option[selected]", ["option2d"] );
-       t("Select options via [selected]", "#select3 option[selected]", ["option3b", "option3c"] );
-       
-       t( "Grouped Form Elements", "input[name='foo[bar]']", ["hidden2"] );
-       
-       t( ":not() Existing attribute", "#form select:not([multiple])", ["select1", "select2"]);
-       t( ":not() Equals attribute", "#form select:not([name=select1])", ["select2", "select3"]);
-       t( ":not() Equals quoted attribute", "#form select:not([name='select1'])", ["select2", "select3"]);
-});
-
-test("pseudo (:) selectors", function() {
-       expect(32);
-       t( "First Child", "p:first-child", ["firstp","sndp"] );
-       t( "Last Child", "p:last-child", ["sap"] );
-       t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
-       t( "Empty", "ul:empty", ["firstUL"] );
-       t( "Enabled UI Element", "#form input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name"] );
-       t( "Disabled UI Element", "#form input:disabled", ["text2"] );
-       t( "Checked UI Element", "#form input:checked", ["radio2","check1"] );
-       t( "Selected Option Element", "#form option:selected", ["option1a","option2d","option3b","option3c"] );
-       t( "Text Contains", "a:contains('Google')", ["google","groups"] );
-       t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
-       t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests"] );
-       t( "Not", "a.blog:not(.link)", ["mark"] );
-       
-       t( "nth Element", "p:nth(1)", ["ap"] );
-       t( "First Element", "p:first", ["firstp"] );
-       t( "Last Element", "p:last", ["first"] );
-       t( "Even Elements", "p:even", ["firstp","sndp","sap"] );
-       t( "Odd Elements", "p:odd", ["ap","en","first"] );
-       t( "Position Equals", "p:eq(1)", ["ap"] );
-       t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] );
-       t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
-       t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
-       t( "Is Visible", "#form input:visible", ["text1","text2","radio1","radio2","check1","check2","name"] );
-       t( "Is Hidden", "#form input:hidden", ["hidden1","hidden2"] );
-       
-       t( "Form element :input", "#form :input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3"] );
-       t( "Form element :radio", "#form :radio", ["radio1", "radio2"] );
-       t( "Form element :checkbox", "#form :checkbox", ["check1", "check2"] );
-       t( "Form element :text", "#form :text", ["text1", "text2", "hidden2", "name"] );
-       t( "Form element :radio:checked", "#form :radio:checked", ["radio2"] );
-       t( "Form element :checkbox:checked", "#form :checkbox:checked", ["check1"] );
-       t( "Form element :checkbox:checked, :radio:checked", "#form :checkbox:checked, #form :radio:checked", ["check1", "radio2"] );
-
-       t( "Headers", ":header", ["header", "banner", "userAgent"] );
-       t( "Has Children - :has()", "p:has(a)", ["firstp","ap","en","sap"] );
-});