RubyGems - merb_screw_unit - Versions diffs - 0.9.7 → 0.9.8 - Mend

merb_screw_unit 0.9.7 → 0.9.8

Files changed (4) hide show

data/Rakefile +27 -18
data/public/javascripts/{jquery-1.2.3.js → jquery-1.2.6.js} +723 -582
data/public/javascripts/screw.matchers.js +37 -4
metadata +5 -5

data/Rakefile CHANGED

@@ -18,7 +18,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 GEM_NAME    = "merb_screw_unit"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.8") + PKG_BUILD
 RELEASE_NAME    = "REL #{GEM_VERSION}"
@@ -36,8 +36,8 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.7')
-  s.add_dependency('merb-slices', '>= 0.9.7')
+  s.add_dependency('merb-core', '>= 0.9.8')
+  s.add_dependency('merb-slices', '>= 0.9.8')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
 end
@@ -46,25 +46,34 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+desc "Install the gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
-##############################################################################
-# Installation
-##############################################################################
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
-desc "Install the gem"
-task :install => [:package] do
-  sh install_command(GEM_NAME, GEM_VERSION)
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
 end
-namespace :jruby do
-"Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh jinstall_command(GEM_NAME, GEM_VERSION)
+desc "Run all examples (or a specific spec with TASK=xxxx)"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts  = ["-cfs"]
+  t.spec_files = begin
+    if ENV["TASK"]
+      ENV["TASK"].split(',').map { |task| "spec/**/#{task}_spec.rb" }
+    else
+      FileList['spec/**/*_spec.rb']
+    end
   end
 end
+desc 'Default: run spec examples'
+task :default => 'spec'

data/public/javascripts/{jquery-1.2.3.js → jquery-1.2.6.js} RENAMED

@@ -1,37 +1,34 @@
 (function(){
 /*
- * jQuery 1.2.3 - New Wave Javascript
+ * jQuery 1.2.6 - New Wave Javascript
  *
  * Copyright (c) 2008 John Resig (jquery.com)
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
  *
- * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $
- * $Rev: 4663 $
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
  */
 // Map over jQuery in case of overwrite
-if ( window.jQuery )
-	var _jQuery = window.jQuery;
+var _jQuery = window.jQuery,
+// Map over the $ in case of overwrite
+	_$ = window.$;
-var jQuery = window.jQuery = function( selector, context ) {
+var jQuery = window.jQuery = window.$ = function( selector, context ) {
 	// The jQuery object is actually just the init constructor 'enhanced'
-	return new jQuery.prototype.init( selector, context );
+	return new jQuery.fn.init( selector, context );
 };
-// Map over the $ in case of overwrite
-if ( window.$ )
-	var _$ = window.$;
-// Map the jQuery namespace to the '$' one
-window.$ = jQuery;
 // A simple way to check for HTML strings or ID strings
 // (both of which we optimize for)
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,
 // Is it a simple selector
-var isSimple = /^.[^:#\[\.]*$/;
+	isSimple = /^.[^:#\[\.]*$/,
+// Will speed up references to undefined, and allows munging its name.
+	undefined;
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -43,9 +40,9 @@ jQuery.fn = jQuery.prototype = {
 			this[0] = selector;
 			this.length = 1;
 			return this;
+		}
 		// Handle HTML strings
-		} else if ( typeof selector == "string" ) {
+		if ( typeof selector == "string" ) {
 			// Are we dealing with HTML string or an ID?
 			var match = quickExpr.exec( selector );
@@ -61,53 +58,39 @@ jQuery.fn = jQuery.prototype = {
 					var elem = document.getElementById( match[3] );
 					// Make sure an element was located
-					if ( elem )
+					if ( elem ){
 						// Handle the case where IE and Opera return items
 						// by name instead of ID
 						if ( elem.id != match[3] )
 							return jQuery().find( selector );
 						// Otherwise, we inject the element directly into the jQuery object
-						else {
-							this[0] = elem;
-							this.length = 1;
-							return this;
-						}
-					else
-						selector = [];
+						return jQuery( elem );
+					}
+					selector = [];
 				}
 			// HANDLE: $(expr, [context])
 			// (which is just equivalent to: $(content).find(expr)
 			} else
-				return new jQuery( context ).find( selector );
+				return jQuery( context ).find( selector );
 		// HANDLE: $(function)
 		// Shortcut for document ready
 		} else if ( jQuery.isFunction( selector ) )
-			return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
+			return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
-		return this.setArray(
-			// HANDLE: $(array)
-			selector.constructor == Array && selector ||
-			// HANDLE: $(arraylike)
-			// Watch for when an array-like object, contains DOM nodes, is passed in as the selector
-			(selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
-			// HANDLE: $(*)
-			[ selector ] );
+		return this.setArray(jQuery.makeArray(selector));
 	},
 	// The current version of jQuery being used
-	jquery: "1.2.3",
+	jquery: "1.2.6",
 	// The number of elements contained in the matched element set
 	size: function() {
 		return this.length;
 	},
 	// The number of elements contained in the matched element set
 	length: 0,
@@ -122,7 +105,7 @@ jQuery.fn = jQuery.prototype = {
 			// Return just the object
 			this[ num ];
 	},
 	// Take an array of elements and push it onto the stack
 	// (returning the new matched element set)
 	pushStack: function( elems ) {
@@ -135,7 +118,7 @@ jQuery.fn = jQuery.prototype = {
 		// Return the newly-formed element set
 		return ret;
 	},
 	// Force the current matched set of elements to become
 	// the specified array of elements (destroying the stack in the process)
 	// You should use pushStack() in order to do this, but maintain the stack
@@ -144,7 +127,7 @@ jQuery.fn = jQuery.prototype = {
 		// is a super-fast way to populate an object with array-like properties
 		this.length = 0;
 		Array.prototype.push.apply( this, elems );
 		return this;
 	},
@@ -155,33 +138,31 @@ jQuery.fn = jQuery.prototype = {
 		return jQuery.each( this, callback, args );
 	},
-	// Determine the position of an element within
+	// Determine the position of an element within
 	// the matched set of elements
 	index: function( elem ) {
 		var ret = -1;
 		// Locate the position of the desired element
-		this.each(function(i){
-			if ( this == elem )
-				ret = i;
-		});
-		return ret;
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem && elem.jquery ? elem[0] : elem
+		, this );
 	},
 	attr: function( name, value, type ) {
 		var options = name;
 		// Look for the case where we're accessing a style value
 		if ( name.constructor == String )
-			if ( value == undefined )
-				return this.length && jQuery[ type || "attr" ]( this[0], name ) || undefined;
+			if ( value === undefined )
+				return this[0] && jQuery[ type || "attr" ]( this[0], name );
 			else {
 				options = {};
 				options[ name ] = value;
 			}
 		// Check to see if we're setting style values
 		return this.each(function(i){
 			// Set all the styles
@@ -264,7 +245,7 @@ jQuery.fn = jQuery.prototype = {
 				this.insertBefore( elem, this.firstChild );
 		});
 	},
 	before: function() {
 		return this.domManip(arguments, false, false, function(elem){
 			this.parentNode.insertBefore( elem, this );
@@ -299,8 +280,8 @@ jQuery.fn = jQuery.prototype = {
 				// using cloneNode. Calling detachEvent on the
 				// clone will also remove the events from the orignal
 				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
+				// Unfortunately, this means some modifications to
+				// attributes in IE that are actually only stored
 				// as properties will not be copied (such as the
 				// the name attribute on an input).
 				var clone = this.cloneNode(true),
@@ -318,7 +299,7 @@ jQuery.fn = jQuery.prototype = {
 			if ( this[ expando ] != undefined )
 				this[ expando ] = null;
 		});
 		// Copy the events from the original to the clone
 		if ( events === true )
 			this.find("*").andSelf().each(function(i){
@@ -360,24 +341,22 @@ jQuery.fn = jQuery.prototype = {
 	},
 	add: function( selector ) {
-		return !selector ? this : this.pushStack( jQuery.merge(
+		return this.pushStack( jQuery.unique( jQuery.merge(
 			this.get(),
-			selector.constructor == String ?
-				jQuery( selector ).get() :
-				selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ?
-					selector : [selector] ) );
+			typeof selector == 'string' ?
+				jQuery( selector ) :
+				jQuery.makeArray( selector )
+		)));
 	},
 	is: function( selector ) {
-		return selector ?
-			jQuery.multiFilter( selector, this ).length > 0 :
-			false;
+		return !!selector && jQuery.multiFilter( selector, this ).length > 0;
 	},
 	hasClass: function( selector ) {
 		return this.is( "." + selector );
 	},
 	val: function( value ) {
 		if ( value == undefined ) {
@@ -390,7 +369,7 @@ jQuery.fn = jQuery.prototype = {
 						values = [],
 						options = elem.options,
 						one = elem.type == "select-one";
 					// Nothing was selected
 					if ( index < 0 )
 						return null;
@@ -402,18 +381,18 @@ jQuery.fn = jQuery.prototype = {
 						if ( option.selected ) {
 							// Get the specifc value for the option
 							value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
 							// We don't need an array for one selects
 							if ( one )
 								return value;
 							// Multi-Selects return an array
 							values.push( value );
 						}
 					}
 					return values;
 				// Everything else, we just grab the value
 				} else
 					return (this[0].value || "").replace(/\r/g, "");
@@ -423,6 +402,9 @@ jQuery.fn = jQuery.prototype = {
 			return undefined;
 		}
+		if( value.constructor == Number )
+			value += '';
 		return this.each(function(){
 			if ( this.nodeType != 1 )
 				return;
@@ -432,9 +414,7 @@ jQuery.fn = jQuery.prototype = {
 					jQuery.inArray(this.name, value) >= 0);
 			else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = value.constructor == Array ?
-					value :
-					[ value ];
+				var values = jQuery.makeArray(value);
 				jQuery( "option", this ).each(function(){
 					this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
@@ -448,10 +428,10 @@ jQuery.fn = jQuery.prototype = {
 				this.value = value;
 		});
 	},
 	html: function( value ) {
 		return value == undefined ?
-			(this.length ?
+			(this[0] ?
 				this[0].innerHTML :
 				null) :
 			this.empty().append( value );
@@ -483,13 +463,13 @@ jQuery.fn = jQuery.prototype = {
 		var parts = key.split(".");
 		parts[1] = parts[1] ? "." + parts[1] : "";
-		if ( value == null ) {
+		if ( value === undefined ) {
 			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-			if ( data == undefined && this.length )
+			if ( data === undefined && this.length )
 				data = jQuery.data( this[0], key );
-			return data == null && parts[1] ?
+			return data === undefined && parts[1] ?
 				this.data( parts[0] ) :
 				data;
 		} else
@@ -503,9 +483,9 @@ jQuery.fn = jQuery.prototype = {
 			jQuery.removeData( this, key );
 		});
 	},
 	domManip: function( args, table, reverse, callback ) {
-		var clone = this.length > 1, elems;
+		var clone = this.length > 1, elems;
 		return this.each(function(){
 			if ( !elems ) {
@@ -528,9 +508,9 @@ jQuery.fn = jQuery.prototype = {
 					this;
 				// execute all scripts after the elements have been injected
-				if ( jQuery.nodeName( elem, "script" ) ) {
+				if ( jQuery.nodeName( elem, "script" ) )
 					scripts = scripts.add( elem );
-				} else {
+				else {
 					// Remove any inner scripts for later evaluation
 					if ( elem.nodeType == 1 )
 						scripts = scripts.add( jQuery( "script", elem ).remove() );
@@ -546,7 +526,7 @@ jQuery.fn = jQuery.prototype = {
 };
 // Give the init function the jQuery prototype for later instantiation
-jQuery.prototype.init.prototype = jQuery.prototype;
+jQuery.fn.init.prototype = jQuery.fn;
 function evalScript( i, elem ) {
 	if ( elem.src )
@@ -563,6 +543,10 @@ function evalScript( i, elem ) {
 		elem.parentNode.removeChild( elem );
 }
+function now(){
+	return +new Date;
+}
 jQuery.extend = jQuery.fn.extend = function() {
 	// copy reference to target object
 	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
@@ -580,9 +564,9 @@ jQuery.extend = jQuery.fn.extend = function() {
 		target = {};
 	// extend jQuery itself if only one argument is passed
-	if ( length == 1 ) {
+	if ( length == i ) {
 		target = this;
-		i = 0;
+		--i;
 	}
 	for ( ; i < length; i++ )
@@ -590,17 +574,22 @@ jQuery.extend = jQuery.fn.extend = function() {
 		if ( (options = arguments[ i ]) != null )
 			// Extend the base object
 			for ( var name in options ) {
+				var src = target[ name ], copy = options[ name ];
 				// Prevent never-ending loop
-				if ( target === options[ name ] )
+				if ( target === copy )
 					continue;
 				// Recurse if we're merging object values
-				if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
-					target[ name ] = jQuery.extend( target[ name ], options[ name ] );
+				if ( deep && copy && typeof copy == "object" && !copy.nodeType )
+					target[ name ] = jQuery.extend( deep,
+						// Never move original objects, clone them
+						src || ( copy.length != null ? [ ] : { } )
+					, copy );
 				// Don't bring in undefined values
-				else if ( options[ name ] != undefined )
-					target[ name ] = options[ name ];
+				else if ( copy !== undefined )
+					target[ name ] = copy;
 			}
@@ -608,10 +597,11 @@ jQuery.extend = jQuery.fn.extend = function() {
 	return target;
 };
-var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {};
-// exclude the following css properties to add px
-var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+var expando = "jQuery" + now(), uuid = 0, windowData = {},
+	// exclude the following css properties to add px
+	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+	// cache defaultView
+	defaultView = document.defaultView || {};
 jQuery.extend({
 	noConflict: function( deep ) {
@@ -625,10 +615,10 @@ jQuery.extend({
 	// See test/unit/core.js for details concerning this function.
 	isFunction: function( fn ) {
-		return !!fn && typeof fn != "string" && !fn.nodeName &&
-			fn.constructor != Array && /function/i.test( fn + "" );
+		return !!fn && typeof fn != "string" && !fn.nodeName &&
+			fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
 	},
 	// check if an element is in a (or is an) XML document
 	isXMLDoc: function( elem ) {
 		return elem.documentElement && !elem.body ||
@@ -651,7 +641,9 @@ jQuery.extend({
 			else
 				script.appendChild( document.createTextNode( data ) );
-			head.appendChild( script );
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
 			head.removeChild( script );
 		}
 	},
@@ -659,9 +651,9 @@ jQuery.extend({
 	nodeName: function( elem, name ) {
 		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
 	},
 	cache: {},
 	data: function( elem, name, data ) {
 		elem = elem == window ?
 			windowData :
@@ -670,24 +662,24 @@ jQuery.extend({
 		var id = elem[ expando ];
 		// Compute a unique ID for the element
-		if ( !id )
+		if ( !id )
 			id = elem[ expando ] = ++uuid;
 		// Only generate the data cache if we're
 		// trying to access or manipulate it
 		if ( name && !jQuery.cache[ id ] )
 			jQuery.cache[ id ] = {};
 		// Prevent overriding the named cache with undefined values
-		if ( data != undefined )
+		if ( data !== undefined )
 			jQuery.cache[ id ][ name ] = data;
-		// Return the named cache data, or the ID for the element
+		// Return the named cache data, or the ID for the element
 		return name ?
 			jQuery.cache[ id ][ name ] :
 			id;
 	},
 	removeData: function( elem, name ) {
 		elem = elem == window ?
 			windowData :
@@ -730,39 +722,41 @@ jQuery.extend({
 	// args is for internal usage only
 	each: function( object, callback, args ) {
+		var name, i = 0, length = object.length;
 		if ( args ) {
-			if ( object.length == undefined ) {
-				for ( var name in object )
+			if ( length == undefined ) {
+				for ( name in object )
 					if ( callback.apply( object[ name ], args ) === false )
 						break;
 			} else
-				for ( var i = 0, length = object.length; i < length; i++ )
-					if ( callback.apply( object[ i ], args ) === false )
+				for ( ; i < length; )
+					if ( callback.apply( object[ i++ ], args ) === false )
 						break;
 		// A special, fast, case for the most common use of each
 		} else {
-			if ( object.length == undefined ) {
-				for ( var name in object )
+			if ( length == undefined ) {
+				for ( name in object )
 					if ( callback.call( object[ name ], name, object[ name ] ) === false )
 						break;
 			} else
-				for ( var i = 0, length = object.length, value = object[0];
+				for ( var value = object[0];
 					i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
 		}
 		return object;
 	},
 	prop: function( elem, value, type, i, name ) {
-			// Handle executable functions
-			if ( jQuery.isFunction( value ) )
-				value = value.call( elem, i );
-			// Handle passing in a number to a CSS property
-			return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
-				value + "px" :
-				value;
+		// Handle executable functions
+		if ( jQuery.isFunction( value ) )
+			value = value.call( elem, i );
+		// Handle passing in a number to a CSS property
+		return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
+			value + "px" :
+			value;
 	},
 	className: {
@@ -779,12 +773,12 @@ jQuery.extend({
 			if (elem.nodeType == 1)
 				elem.className = classNames != undefined ?
 					jQuery.grep(elem.className.split(/\s+/), function(className){
-						return !jQuery.className.has( classNames, className );
+						return !jQuery.className.has( classNames, className );
 					}).join(" ") :
 					"";
 		},
-		// internal only, use is(".class")
+		// internal only, use hasClass("class")
 		has: function( elem, className ) {
 			return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
 		}
@@ -809,7 +803,7 @@ jQuery.extend({
 	css: function( elem, name, force ) {
 		if ( name == "width" || name == "height" ) {
 			var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ];
 			function getWH() {
 				val = name == "width" ? elem.offsetWidth : elem.offsetHeight;
 				var padding = 0, border = 0;
@@ -819,33 +813,34 @@ jQuery.extend({
 				});
 				val -= Math.round(padding + border);
 			}
 			if ( jQuery(elem).is(":visible") )
 				getWH();
 			else
 				jQuery.swap( elem, props, getWH );
 			return Math.max(0, val);
 		}
 		return jQuery.curCSS( elem, name, force );
 	},
 	curCSS: function( elem, name, force ) {
-		var ret;
+		var ret, style = elem.style;
 		// A helper method for determining if an element's values are broken
 		function color( elem ) {
 			if ( !jQuery.browser.safari )
 				return false;
-			var ret = document.defaultView.getComputedStyle( elem, null );
+			// defaultView is cached
+			var ret = defaultView.getComputedStyle( elem, null );
 			return !ret || ret.getPropertyValue("color") == "";
 		}
 		// We need to handle opacity special in IE
 		if ( name == "opacity" && jQuery.browser.msie ) {
-			ret = jQuery.attr( elem.style, "opacity" );
+			ret = jQuery.attr( style, "opacity" );
 			return ret == "" ?
 				"1" :
@@ -853,19 +848,19 @@ jQuery.extend({
 		}
 		// Opera sometimes will give the wrong display answer, this fixes it, see #2037
 		if ( jQuery.browser.opera && name == "display" ) {
-			var save = elem.style.outline;
-			elem.style.outline = "0 solid black";
-			elem.style.outline = save;
+			var save = style.outline;
+			style.outline = "0 solid black";
+			style.outline = save;
 		}
 		// Make sure we're using the right name for getting the float value
 		if ( name.match( /float/i ) )
 			name = styleFloat;
-		if ( !force && elem.style && elem.style[ name ] )
-			ret = elem.style[ name ];
+		if ( !force && style && style[ name ] )
+			ret = style[ name ];
-		else if ( document.defaultView && document.defaultView.getComputedStyle ) {
+		else if ( defaultView.getComputedStyle ) {
 			// Only "float" is needed here
 			if ( name.match( /float/i ) )
@@ -873,23 +868,23 @@ jQuery.extend({
 			name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
-			var getComputedStyle = document.defaultView.getComputedStyle( elem, null );
+			var computedStyle = defaultView.getComputedStyle( elem, null );
-			if ( getComputedStyle && !color( elem ) )
-				ret = getComputedStyle.getPropertyValue( name );
+			if ( computedStyle && !color( elem ) )
+				ret = computedStyle.getPropertyValue( name );
 			// If the element isn't reporting its values properly in Safari
 			// then some display: none elements are involved
 			else {
-				var swap = [], stack = [];
+				var swap = [], stack = [], a = elem, i = 0;
 				// Locate all of the parent display: none elements
-				for ( var a = elem; a && color(a); a = a.parentNode )
+				for ( ; 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 ( var i = 0; i < stack.length; i++ )
+				for ( ; i < stack.length; i++ )
 					if ( color( stack[ i ] ) ) {
 						swap[ i ] = stack[ i ].style.display;
 						stack[ i ].style.display = "block";
@@ -899,10 +894,10 @@ jQuery.extend({
 				// one special, otherwise get the value
 				ret = name == "display" && swap[ stack.length - 1 ] != null ?
 					"none" :
-					( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || "";
+					( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
 				// Finally, revert the display styles back
-				for ( var i = 0; i < swap.length; i++ )
+				for ( i = 0; i < swap.length; i++ )
 					if ( swap[ i ] != null )
 						stack[ i ].style.display = swap[ i ];
 			}
@@ -925,27 +920,27 @@ jQuery.extend({
 			// but a number that has a weird ending, we need to convert it to pixels
 			if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) {
 				// Remember the original values
-				var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left;
+				var left = style.left, rsLeft = elem.runtimeStyle.left;
 				// Put in the new values to get a computed value out
 				elem.runtimeStyle.left = elem.currentStyle.left;
-				elem.style.left = ret || 0;
-				ret = elem.style.pixelLeft + "px";
+				style.left = ret || 0;
+				ret = style.pixelLeft + "px";
 				// Revert the changed values
-				elem.style.left = style;
-				elem.runtimeStyle.left = runtimeStyle;
+				style.left = left;
+				elem.runtimeStyle.left = rsLeft;
 			}
 		}
 		return ret;
 	},
 	clean: function( elems, context ) {
 		var ret = [];
 		context = context || document;
 		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if (typeof context.createElement == 'undefined')
+		if (typeof context.createElement == 'undefined')
 			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 		jQuery.each(elems, function(i, elem){
@@ -953,8 +948,8 @@ jQuery.extend({
 				return;
 			if ( elem.constructor == Number )
-				elem = elem.toString();
+				elem += '';
 			// Convert html string into DOM nodes
 			if ( typeof elem == "string" ) {
 				// Fix "XHTML"-style tags in all browsers
@@ -971,58 +966,58 @@ jQuery.extend({
 					// option or optgroup
 					!tags.indexOf("<opt") &&
 					[ 1, "<select multiple='multiple'>", "</select>" ] ||
 					!tags.indexOf("<leg") &&
 					[ 1, "<fieldset>", "</fieldset>" ] ||
 					tags.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
 					[ 1, "<table>", "</table>" ] ||
 					!tags.indexOf("<tr") &&
 					[ 2, "<table><tbody>", "</tbody></table>" ] ||
-				 	// <thead> matched above
+					// <thead> matched above
 					(!tags.indexOf("<td") || !tags.indexOf("<th")) &&
 					[ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
 					!tags.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] + elem + 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>
 					var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ?
 						div.firstChild && div.firstChild.childNodes :
 						// String was a bare <thead> or <tfoot>
 						wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ?
 							div.childNodes :
 							[];
 					for ( var j = tbody.length - 1; j >= 0 ; --j )
 						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
 							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( /^\s/.test( elem ) )
+					// IE completely kills leading whitespace when innerHTML is used
+					if ( /^\s/.test( elem ) )
 						div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
 				}
 				elem = jQuery.makeArray( div.childNodes );
 			}
@@ -1039,81 +1034,94 @@ jQuery.extend({
 		return ret;
 	},
 	attr: function( elem, name, value ) {
 		// don't set attributes on text and comment nodes
 		if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
 			return undefined;
-		var fix = jQuery.isXMLDoc( elem ) ?
-			{} :
-			jQuery.props;
+		var notxml = !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined,
+			msie = jQuery.browser.msie;
-		// 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;
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
-			return elem[ fix[ name ] ];
+		// Only do all the following if this is a node (faster for style)
+		// IE elem.getAttribute passes even for style
+		if ( elem.tagName ) {
-		} else if ( jQuery.browser.msie && name == "style" )
-			return jQuery.attr( elem.style, "cssText", value );
+			// These attributes require special treatment
+			var special = /href|src|style/.test( name );
-		else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName( elem, "form" ) && (name == "action" || name == "method") )
-			return elem.getAttributeNode( name ).nodeValue;
+			// 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;
-		// IE elem.getAttribute passes even for style
-		else if ( elem.tagName ) {
+			// If applicable, access the attribute via the DOM 0 way
+			if ( name in elem && notxml && !special ) {
+				if ( set ){
+					// We can't allow the type property to be changed (since it causes problems in IE)
+					if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
+						throw "type property can't be changed";
-			if ( value != undefined ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
-					throw "type property can't be changed";
+					elem[ name ] = value;
+				}
+				// browsers index elements by id/name on forms, give priority to attributes.
+				if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
+					return elem.getAttributeNode( name ).nodeValue;
+				return elem[ name ];
+			}
+			if ( msie && notxml &&  name == "style" )
+				return jQuery.attr( elem.style, "cssText", value );
+			if ( set )
 				// convert the value to a string (all browsers do this but IE) see #1070
 				elem.setAttribute( name, "" + value );
-			}
-			if ( jQuery.browser.msie && /href|src/.test( name ) && !jQuery.isXMLDoc( elem ) )
-				return elem.getAttribute( name, 2 );
+			var attr = msie && notxml && special
+					// Some attributes require a special call on IE
+					? elem.getAttribute( name, 2 )
+					: elem.getAttribute( name );
-			return elem.getAttribute( name );
+			// Non-existent attributes return null, we normalize to undefined
+			return attr === null ? undefined : attr;
+		}
 		// 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 && elem.filter.indexOf("opacity=") >= 0 ?
-					(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() :
-					"";
-			}
-			name = name.replace(/-([a-z])/ig, function(all, letter){
-				return letter.toUpperCase();
-			});
+		// IE uses filters for opacity
+		if ( msie && name == "opacity" ) {
+			if ( set ) {
+				// IE has trouble with opacity if it does not have layout
+				// Force it by setting the zoom level
+				elem.zoom = 1;
-			if ( value != undefined )
-				elem[ name ] = value;
+				// Set the alpha filter to set the opacity
+				elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) +
+					(parseInt( value ) + '' == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+			}
-			return elem[ name ];
+			return elem.filter && elem.filter.indexOf("opacity=") >= 0 ?
+				(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100) + '':
+				"";
 		}
+		name = name.replace(/-([a-z])/ig, function(all, letter){
+			return letter.toUpperCase();
+		});
+		if ( set )
+			elem[ name ] = value;
+		return elem[ name ];
 	},
 	trim: function( text ) {
 		return (text || "").replace( /^\s+|\s+$/g, "" );
 	},
@@ -1121,19 +1129,23 @@ jQuery.extend({
 	makeArray: function( array ) {
 		var ret = [];
-		// Need to use typeof to fight Safari childNodes crashes
-		if ( typeof array != "array" )
-			for ( var i = 0, length = array.length; i < length; i++ )
-				ret.push( array[ i ] );
-		else
-			ret = array.slice( 0 );
+		if( array != null ){
+			var i = array.length;
+			//the window, strings and functions also have 'length'
+			if( i == null || array.split || array.setInterval || array.call )
+				ret[0] = array;
+			else
+				while( i )
+					ret[--i] = array[i];
+		}
 		return ret;
 	},
 	inArray: function( elem, array ) {
 		for ( var i = 0, length = array.length; i < length; i++ )
-			if ( array[ i ] == elem )
+		// Use === because on IE, window == document
+			if ( array[ i ] === elem )
 				return i;
 		return -1;
@@ -1142,17 +1154,17 @@ jQuery.extend({
 	merge: function( first, second ) {
 		// We have to loop this way because IE & Opera overwrite the length
 		// expando of getElementsByTagName
+		var i = 0, elem, pos = first.length;
 		// 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 ] );
+			while ( elem = second[ i++ ] )
+				if ( elem.nodeType != 8 )
+					first[ pos++ ] = elem;
 		} else
-			for ( var i = 0; second[ i ]; i++ )
-				first.push( second[ i ] );
+			while ( elem = second[ i++ ] )
+				first[ pos++ ] = elem;
 		return first;
 	},
@@ -1184,7 +1196,7 @@ jQuery.extend({
 		// Go through the array, only saving the items
 		// that pass the validator function
 		for ( var i = 0, length = elems.length; i < length; i++ )
-			if ( !inv && callback( elems[ i ], i ) || inv && !callback( elems[ i ], i ) )
+			if ( !inv != !callback( elems[ i ], i ) )
 				ret.push( elems[ i ] );
 		return ret;
@@ -1198,15 +1210,11 @@ jQuery.extend({
 		for ( var i = 0, length = elems.length; i < length; i++ ) {
 			var value = callback( elems[ i ], i );
-			if ( value !== null && value != undefined ) {
-				if ( value.constructor != Array )
-					value = [ value ];
-				ret = ret.concat( value );
-			}
+			if ( value != null )
+				ret[ ret.length ] = value;
 		}
-		return ret;
+		return ret.concat.apply( [], ret );
 	}
 });
@@ -1224,29 +1232,20 @@ jQuery.browser = {
 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",
 	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",
-		selectedIndex: "selectedIndex",
-		defaultValue: "defaultValue",
-		tagName: "tagName",
-		nodeName: "nodeName"
+		cellspacing: "cellSpacing"
 	}
 });
@@ -1291,7 +1290,7 @@ jQuery.each({
 jQuery.each({
 	removeAttr: function( name ) {
 		jQuery.attr( this, name, "" );
-		if (this.nodeType == 1)
+		if (this.nodeType == 1)
 			this.removeAttribute( name );
 	},
@@ -1322,7 +1321,7 @@ jQuery.each({
 	empty: function() {
 		// Remove element nodes and prevent memory leaks
 		jQuery( ">*", this ).remove();
 		// Remove any remaining nodes
 		while ( this.firstChild )
 			this.removeChild( this.firstChild );
@@ -1335,25 +1334,25 @@ jQuery.each({
 jQuery.each([ "Height", "Width" ], function(i, name){
 	var type = name.toLowerCase();
 	jQuery.fn[ type ] = function( size ) {
 		// Get window width or height
 		return this[0] == window ?
 			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
-			jQuery.browser.opera && document.body[ "client" + name ] ||
+			jQuery.browser.opera && document.body[ "client" + name ] ||
 			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
 			jQuery.browser.safari && window[ "inner" + name ] ||
 			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
 			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
 			// Get document width or height
 			this[0] == document ?
 				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
-					Math.max(document.body["offset" + name], document.documentElement["offset" + name])
+				Math.max(
+					Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
+					Math.max(document.body["offset" + name], document.documentElement["offset" + name])
 				) :
 				// Get or set width or height on the element
@@ -1366,7 +1365,10 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 	};
 });
-var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
 		"(?:[\\w*_-]|\\\\.)" :
 		"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
 	quickChild = new RegExp("^>\\s*(" + chars + "+)"),
@@ -1432,7 +1434,7 @@ jQuery.extend({
 			animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}
 		}
 	},
 	// The regular expressions that power the parsing engine
 	parse: [
 		// Match: [@value='test'], [@foo]
@@ -1441,7 +1443,7 @@ jQuery.extend({
 		// Match: :contains('foo')
 		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
-		// Match: :even, :last-chlid, #id, .class
+		// Match: :even, :last-child, #id, .class
 		new RegExp("^([:.#]*)(" + chars + "+)")
 	],
@@ -1481,12 +1483,13 @@ jQuery.extend({
 			t = jQuery.trim(t);
-			var foundToken = false;
+			var foundToken = false,
 			// An attempt at speeding up child selectors that
 			// point to a specific element tag
-			var re = quickChild;
-			var m = re.exec(t);
+				re = quickChild,
+				m = re.exec(t);
 			if ( m ) {
 				nodeName = m[1].toUpperCase();
@@ -1518,12 +1521,12 @@ jQuery.extend({
 								var id = jQuery.data(n);
 								if ( m == "~" && merge[id] ) break;
 								if (!nodeName || n.nodeName.toUpperCase() == nodeName ) {
 									if ( m == "~" ) merge[id] = true;
 									r.push( n );
 								}
 								if ( m == "+" ) break;
 							}
 					}
@@ -1557,7 +1560,7 @@ jQuery.extend({
 					// Optimize for the case nodeName#idName
 					var re2 = quickID;
 					var m = re2.exec(t);
 					// Re-organize the results, so that they're consistent
 					if ( m ) {
 						m = [ 0, m[2], m[3], m[1] ];
@@ -1577,7 +1580,7 @@ jQuery.extend({
 					if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
 						// Optimization for HTML document case
 						var oid = elem.getElementById(m[2]);
 						// Do a quick check for the existence of the actual ID attribute
 						// to avoid selecting by the name attribute in IE
 						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
@@ -1699,10 +1702,10 @@ jQuery.extend({
 			else if ( m[1] == "[" ) {
 				var tmp = [], type = m[3];
 				for ( var i = 0, rl = r.length; i < rl; i++ ) {
 					var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
 					if ( z == null || /href|src|selected/.test(m[2]) )
 						z = jQuery.attr(a,m[2]) || '';
@@ -1714,7 +1717,7 @@ jQuery.extend({
 						 (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
 							tmp.push( a );
 				}
 				r = tmp;
 			// We can get a speed boost by handling nth-child here
@@ -1726,7 +1729,7 @@ jQuery.extend({
 						!/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
 					// calculate the numbers (first)n+(last) including if they are negative
 					first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
 				// loop through all the elements left in the jQuery object
 				for ( var i = 0, rl = r.length; i < rl; i++ ) {
 					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
@@ -1777,8 +1780,8 @@ jQuery.extend({
 	},
 	dir: function( elem, dir ){
-		var matched = [];
-		var cur = elem[dir];
+		var matched = [],
+			cur = elem[dir];
 		while ( cur && cur != document ) {
 			if ( cur.nodeType == 1 )
 				matched.push( cur );
@@ -1786,7 +1789,7 @@ jQuery.extend({
 		}
 		return matched;
 	},
 	nth: function(cur,result,dir,elem){
 		result = result || 1;
 		var num = 0;
@@ -1797,22 +1800,21 @@ jQuery.extend({
 		return cur;
 	},
 	sibling: function( n, elem ) {
 		var r = [];
 		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType == 1 && (!elem || n != elem) )
+			if ( n.nodeType == 1 && n != elem )
 				r.push( n );
 		}
 		return r;
 	}
 });
 /*
  * A number of helper functions used for managing events.
- * Many of the ideas behind this code orignated from
+ * Many of the ideas behind this code orignated from
  * Dean Edwards' addEvent library.
  */
 jQuery.event = {
@@ -1825,85 +1827,75 @@ jQuery.event = {
 		// For whatever reason, IE has trouble passing the window object
 		// around, causing it to be cloned in the process
-		if ( jQuery.browser.msie && elem.setInterval != undefined )
+		if ( jQuery.browser.msie && elem.setInterval )
 			elem = window;
 		// Make sure that the function being executed has a unique ID
 		if ( !handler.guid )
 			handler.guid = this.guid++;
-		// if data is passed, bind to handler
-		if( data != undefined ) {
-			// Create temporary function pointer to original handler
-			var fn = handler;
-			// Create unique handler function, wrapped around original handler
-			handler = function() {
-				// Pass arguments and context to original handler
-				return fn.apply(this, arguments);
-			};
-			// Store data in unique handler
-			handler.data = data;
+		// if data is passed, bind to handler
+		if( data != undefined ) {
+			// Create temporary function pointer to original handler
+			var fn = handler;
+			// Create unique handler function, wrapped around original handler
+			handler = this.proxy( fn, function() {
+				// Pass arguments and context to original handler
+				return fn.apply(this, arguments);
+			});
-			// Set the guid of unique handler to the same of original handler, so it can be removed
-			handler.guid = fn.guid;
+			// Store data in unique handler
+			handler.data = data;
 		}
 		// Init the element's event structure
 		var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
 			handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
-				// returned undefined or false
-				var val;
 				// Handle the second event of a trigger and when
-				// an event is called after a page has unload
-				if ( typeof jQuery == "undefined" || jQuery.event.triggered )
-					return val;
-				val = jQuery.event.handle.apply(arguments.callee.elem, arguments);
-				return val;
+				// an event is called after a page has unloaded
+				if ( typeof jQuery != "undefined" && !jQuery.event.triggered )
+					return jQuery.event.handle.apply(arguments.callee.elem, arguments);
 			});
 		// Add elem as a property of the handle function
 		// This is to prevent a memory leak with non-native
 		// event in IE.
 		handle.elem = elem;
-			// Handle multiple events seperated by a space
-			// jQuery(...).bind("mouseover mouseout", fn);
-			jQuery.each(types.split(/\s+/), function(index, type) {
-				// Namespaced event handlers
-				var parts = type.split(".");
-				type = parts[0];
-				handler.type = parts[1];
-				// Get the current list of functions bound to this event
-				var handlers = events[type];
-				// Init the event handler queue
-				if (!handlers) {
-					handlers = events[type] = {};
-					// Check for a special event handler
-					// Only use addEventListener/attachEvent if the special
-					// events handler returns false
-					if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
-						// Bind the global event handler to the element
-						if (elem.addEventListener)
-							elem.addEventListener(type, handle, false);
-						else if (elem.attachEvent)
-							elem.attachEvent("on" + type, handle);
-					}
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		jQuery.each(types.split(/\s+/), function(index, type) {
+			// Namespaced event handlers
+			var parts = type.split(".");
+			type = parts[0];
+			handler.type = parts[1];
+			// Get the current list of functions bound to this event
+			var handlers = events[type];
+			// Init the event handler queue
+			if (!handlers) {
+				handlers = events[type] = {};
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
+					// Bind the global event handler to the element
+					if (elem.addEventListener)
+						elem.addEventListener(type, handle, false);
+					else if (elem.attachEvent)
+						elem.attachEvent("on" + type, handle);
 				}
+			}
-				// Add the function to the element's handler list
-				handlers[handler.guid] = handler;
+			// Add the function to the element's handler list
+			handlers[handler.guid] = handler;
+			// Keep track of which events have been used, for global triggering
+			jQuery.event.global[type] = true;
+		});
-				// Keep track of which events have been used, for global triggering
-				jQuery.event.global[type] = true;
-			});
 		// Nullify elem to prevent memory leaks in IE
 		elem = null;
 	},
@@ -1930,19 +1922,19 @@ jQuery.event = {
 					handler = types.handler;
 					types = types.type;
 				}
 				// Handle multiple events seperated by a space
 				// jQuery(...).unbind("mouseover mouseout", fn);
 				jQuery.each(types.split(/\s+/), function(index, type){
 					// Namespaced event handlers
 					var parts = type.split(".");
 					type = parts[0];
 					if ( events[type] ) {
 						// remove the given handler for the given type
 						if ( handler )
 							delete events[type][handler.guid];
 						// remove all handlers for the given type
 						else
 							for ( handler in events[type] )
@@ -1979,7 +1971,7 @@ jQuery.event = {
 	trigger: function(type, data, elem, donative, extra) {
 		// Clone the incoming data, if any
-		data = jQuery.makeArray(data || []);
+		data = jQuery.makeArray(data);
 		if ( type.indexOf("!") >= 0 ) {
 			type = type.slice(0, -1);
@@ -2001,22 +1993,31 @@ jQuery.event = {
 			var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
 				// Check to see if we need to provide a fake event, or not
 				event = !data[0] || !data[0].preventDefault;
 			// Pass along a fake event
-			if ( event )
-				data.unshift( this.fix({ type: type, target: elem }) );
+			if ( event ) {
+				data.unshift({
+					type: type,
+					target: elem,
+					preventDefault: function(){},
+					stopPropagation: function(){},
+					timeStamp: now()
+				});
+				data[0][expando] = true; // no need to fix fake event
+			}
 			// Enforce the right trigger type
 			data[0].type = type;
 			if ( exclusive )
 				data[0].exclusive = true;
-			// Trigger the event
-			if ( jQuery.isFunction( jQuery.data(elem, "handle") ) )
-				val = jQuery.data(elem, "handle").apply( elem, data );
+			// Trigger the event, it is assumed that "handle" is a function
+			var handle = jQuery.data(elem, "handle");
+			if ( handle )
+				val = handle.apply( elem, data );
-			// Handle triggering native .onfoo handlers
-			if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+			// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+			if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
 				val = false;
 			// Extra functions don't get the custom event object
@@ -2049,28 +2050,30 @@ jQuery.event = {
 	handle: function(event) {
 		// returned undefined or false
-		var val;
+		var val, ret, namespace, all, handlers;
-		// Empty object is for triggered events with no data
-		event = jQuery.event.fix( event || window.event || {} );
+		event = arguments[0] = jQuery.event.fix( event || window.event );
 		// Namespaced event handlers
-		var parts = event.type.split(".");
-		event.type = parts[0];
+		namespace = event.type.split(".");
+		event.type = namespace[0];
+		namespace = namespace[1];
+		// Cache this now, all = true means, any handler
+		all = !namespace && !event.exclusive;
-		var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
-		args.unshift( event );
+		handlers = ( jQuery.data(this, "events") || {} )[event.type];
 		for ( var j in handlers ) {
 			var handler = handlers[j];
-			// Pass in a reference to the handler function itself
-			// So that we can later remove it
-			args[0].handler = handler;
-			args[0].data = handler.data;
 			// Filter the functions by class
-			if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) {
-				var ret = handler.apply( this, args );
+			if ( all || handler.type == namespace ) {
+				// Pass in a reference to the handler function itself
+				// So that we can later remove it
+				event.handler = handler;
+				event.data = handler.data;
+				ret = handler.apply( this, arguments );
 				if ( val !== false )
 					val = ret;
@@ -2082,21 +2085,25 @@ jQuery.event = {
 			}
 		}
-		// Clean up added properties in IE to prevent memory leak
-		if (jQuery.browser.msie)
-			event.target = event.preventDefault = event.stopPropagation =
-				event.handler = event.data = null;
 		return val;
 	},
 	fix: function(event) {
-		// store a copy of the original event object
-		// and clone to set read-only properties
+		if ( event[expando] == true )
+			return event;
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
 		var originalEvent = event;
-		event = jQuery.extend({}, originalEvent);
-		// add preventDefault and stopPropagation since
+		event = { originalEvent: originalEvent };
+		var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
+		for ( var i=props.length; i; i-- )
+			event[ props[i] ] = originalEvent[ props[i] ];
+		// Mark it as fixed
+		event[expando] = true;
+		// add preventDefault and stopPropagation since
 		// they will not work on the clone
 		event.preventDefault = function() {
 			// if preventDefault exists run it on the original event
@@ -2112,14 +2119,17 @@ jQuery.event = {
 			// otherwise set the cancelBubble property of the original event to true (IE)
 			originalEvent.cancelBubble = true;
 		};
+		// Fix timeStamp
+		event.timeStamp = event.timeStamp || now();
 		// Fix target property, if necessary
 		if ( !event.target )
 			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
 		// check if target is a textnode (safari)
 		if ( event.target.nodeType == 3 )
-			event.target = originalEvent.target.parentNode;
+			event.target = event.target.parentNode;
 		// Add relatedTarget, if necessary
 		if ( !event.relatedTarget && event.fromElement )
@@ -2131,11 +2141,11 @@ jQuery.event = {
 			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0);
 			event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0);
 		}
 		// Add which for key events
 		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
 			event.which = event.charCode || event.keyCode;
 		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
 		if ( !event.metaKey && event.ctrlKey )
 			event.metaKey = event.ctrlKey;
@@ -2144,10 +2154,17 @@ jQuery.event = {
 		// Note: button is not normalized, so don't use it
 		if ( !event.which && event.button )
 			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
 		return event;
 	},
+	proxy: function( fn, proxy ){
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
+		// So proxy can be declared as an argument
+		return proxy;
+	},
 	special: {
 		ready: {
 			setup: function() {
@@ -2155,50 +2172,50 @@ jQuery.event = {
 				bindReady();
 				return;
 			},
 			teardown: function() { return; }
 		},
 		mouseenter: {
 			setup: function() {
 				if ( jQuery.browser.msie ) return false;
 				jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
 				return true;
 			},
 			teardown: function() {
 				if ( jQuery.browser.msie ) return false;
 				jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
 				return true;
 			},
 			handler: function(event) {
 				// If we actually just moused on to a sub-element, ignore it
 				if ( withinElement(event, this) ) return true;
 				// Execute the right handlers by setting the event type to mouseenter
-				arguments[0].type = "mouseenter";
+				event.type = "mouseenter";
 				return jQuery.event.handle.apply(this, arguments);
 			}
 		},
 		mouseleave: {
 			setup: function() {
 				if ( jQuery.browser.msie ) return false;
 				jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
 				return true;
 			},
 			teardown: function() {
 				if ( jQuery.browser.msie ) return false;
 				jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
 				return true;
 			},
 			handler: function(event) {
 				// If we actually just moused on to a sub-element, ignore it
 				if ( withinElement(event, this) ) return true;
 				// Execute the right handlers by setting the event type to mouseleave
-				arguments[0].type = "mouseleave";
+				event.type = "mouseleave";
 				return jQuery.event.handle.apply(this, arguments);
 			}
 		}
@@ -2211,13 +2228,14 @@ jQuery.fn.extend({
 			jQuery.event.add( this, type, fn || data, fn && data );
 		});
 	},
 	one: function( type, data, fn ) {
+		var one = jQuery.event.proxy( fn || data, function(event) {
+			jQuery(this).unbind(event, one);
+			return (fn || data).apply( this, arguments );
+		});
 		return this.each(function(){
-			jQuery.event.add( this, type, function(event) {
-				jQuery(this).unbind(event);
-				return (fn || data).apply( this, arguments);
-			}, fn && data);
+			jQuery.event.add( this, type, one, fn && data);
 		});
 	},
@@ -2234,31 +2252,33 @@ jQuery.fn.extend({
 	},
 	triggerHandler: function( type, data, fn ) {
-		if ( this[0] )
-			return jQuery.event.trigger( type, data, this[0], false, fn );
-		return undefined;
+		return this[0] && jQuery.event.trigger( type, data, this[0], false, fn );
 	},
-	toggle: function() {
+	toggle: function( fn ) {
 		// Save reference to arguments for access in closure
-		var args = arguments;
+		var args = arguments, i = 1;
-		return this.click(function(event) {
+		// link all the functions, so any of them can unbind this click handler
+		while( i < args.length )
+			jQuery.event.proxy( fn, args[i++] );
+		return this.click( jQuery.event.proxy( fn, function(event) {
 			// Figure out which function to execute
-			this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+			this.lastToggle = ( this.lastToggle || 0 ) % i;
 			// Make sure that clicks stop
 			event.preventDefault();
 			// and execute the function
-			return args[this.lastToggle].apply( this, arguments ) || false;
-		});
+			return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+		}));
 	},
 	hover: function(fnOver, fnOut) {
 		return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
 	},
 	ready: function(fn) {
 		// Attach the listeners
 		bindReady();
@@ -2267,12 +2287,12 @@ jQuery.fn.extend({
 		if ( jQuery.isReady )
 			// Execute the function immediately
 			fn.call( document, jQuery );
 		// Otherwise, remember the function for later
 		else
 			// Add the function to the wait list
 			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
 		return this;
 	}
 });
@@ -2282,22 +2302,22 @@ jQuery.extend({
 	readyList: [],
 	// Handle when the DOM is ready
 	ready: function() {
-		// Make sure that the DOM is not already load
+		// Make sure that the DOM is not already loaded
 		if ( !jQuery.isReady ) {
 			// Remember that the DOM is ready
 			jQuery.isReady = true;
 			// If there are functions bound, to execute
 			if ( jQuery.readyList ) {
 				// Execute all of them
 				jQuery.each( jQuery.readyList, function(){
-					this.apply( document );
+					this.call( document );
 				});
 				// Reset the list of functions
 				jQuery.readyList = null;
 			}
 			// Trigger any bound ready events
 			jQuery(document).triggerHandler("ready");
 		}
@@ -2314,7 +2334,7 @@ function bindReady(){
 	if ( document.addEventListener && !jQuery.browser.opera)
 		// Use the handy event callback
 		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
 	// If IE is used and is not in a frame
 	// Continually check to see if the document is ready
 	if ( jQuery.browser.msie && window == top ) (function(){
@@ -2347,7 +2367,7 @@ function bindReady(){
 		var numStyles;
 		(function(){
 			if (jQuery.isReady) return;
-			if ( document.readyState != "load" && document.readyState != "complete" ) {
+			if ( document.readyState != "loaded" && document.readyState != "complete" ) {
 				setTimeout( arguments.callee, 0 );
 				return;
 			}
@@ -2367,9 +2387,9 @@ function bindReady(){
 }
 jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," +
+	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," +
 	"submit,keydown,keypress,keyup,error").split(","), function(i, name){
 	// Handle event binding
 	jQuery.fn[name] = function(fn){
 		return fn ? this.bind(name, fn) : this.trigger(name);
@@ -2394,9 +2414,12 @@ jQuery(window).bind("unload", function() {
 	jQuery("*").add(document).unbind();
 });
 jQuery.fn.extend({
+	// Keep a copy of the old load
+	_load: jQuery.fn.load,
 	load: function( url, params, callback ) {
-		if ( jQuery.isFunction( url ) )
-			return this.bind("load", url);
+		if ( typeof url != 'string' )
+			return this._load( url );
 		var off = url.indexOf(" ");
 		if ( off >= 0 ) {
@@ -2463,8 +2486,8 @@ jQuery.fn.extend({
 				jQuery.makeArray(this.elements) : this;
 		})
 		.filter(function(){
-			return this.name && !this.disabled &&
-				(this.checked || /select|textarea/i.test(this.nodeName) ||
+			return this.name && !this.disabled &&
+				(this.checked || /select|textarea/i.test(this.nodeName) ||
 					/text|hidden|password/i.test(this.type));
 		})
 		.map(function(i, elem){
@@ -2486,7 +2509,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
 	};
 });
-var jsc = (new Date).getTime();
+var jsc = now();
 jQuery.extend({
 	get: function( url, data, callback, type ) {
@@ -2495,7 +2518,7 @@ jQuery.extend({
 			callback = data;
 			data = null;
 		}
 		return jQuery.ajax({
 			type: "GET",
 			url: url,
@@ -2533,6 +2556,7 @@ jQuery.extend({
 	},
 	ajaxSettings: {
+		url: location.href,
 		global: true,
 		type: "GET",
 		timeout: 0,
@@ -2551,24 +2575,25 @@ jQuery.extend({
 			_default: "*/*"
 		}
 	},
 	// Last-Modified header cache for next request
 	lastModified: {},
 	ajax: function( s ) {
-		var jsonp, jsre = /=\?(&|$)/g, status, data;
 		// Extend the settings, but re-extend 's' so that it can be
 		// checked again later (in the test suite, specifically)
 		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+		var jsonp, jsre = /=\?(&|$)/g, status, data,
+			type = s.type.toUpperCase();
 		// convert data if not already a string
 		if ( s.data && s.processData && typeof s.data != "string" )
 			s.data = jQuery.param(s.data);
 		// Handle JSONP Parameter Callbacks
 		if ( s.dataType == "jsonp" ) {
-			if ( s.type.toLowerCase() == "get" ) {
+			if ( type == "GET" ) {
 				if ( !s.url.match(jsre) )
 					s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?";
 			} else if ( !s.data || !s.data.match(jsre) )
@@ -2605,8 +2630,8 @@ jQuery.extend({
 		if ( s.dataType == "script" && s.cache == null )
 			s.cache = false;
-		if ( s.cache === false && s.type.toLowerCase() == "get" ) {
-			var ts = (new Date()).getTime();
+		if ( s.cache === false && type == "GET" ) {
+			var ts = now();
 			// try replacing _= if it is there
 			var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
 			// if nothing was replaced, add timestamp to the end
@@ -2614,7 +2639,7 @@ jQuery.extend({
 		}
 		// If data is available, append data to url for get requests
-		if ( s.data && s.type.toLowerCase() == "get" ) {
+		if ( s.data && type == "GET" ) {
 			s.url += (s.url.match(/\?/) ? "&" : "?") + s.data;
 			// IE likes to send both get and post data, prevent this
@@ -2625,9 +2650,13 @@ jQuery.extend({
 		if ( s.global && ! jQuery.active++ )
 			jQuery.event.trigger( "ajaxStart" );
+		// Matches an absolute URL, and saves the domain
+		var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
 		// If we're requesting a remote document
 		// and trying to load JSON or Script with a GET
-		if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
+		if ( s.dataType == "script" && type == "GET"
+				&& remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
 			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;
@@ -2640,8 +2669,8 @@ jQuery.extend({
 				// Attach handlers for all browsers
 				script.onload = script.onreadystatechange = function(){
-					if ( !done && (!this.readyState ||
-							this.readyState == "load" || this.readyState == "complete") ) {
+					if ( !done && (!this.readyState ||
+							this.readyState == "loaded" || this.readyState == "complete") ) {
 						done = true;
 						success();
 						complete();
@@ -2660,60 +2689,69 @@ jQuery.extend({
 		// Create the request object; Microsoft failed to properly
 		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-		var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+		var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
 		// Open the socket
-		xml.open(s.type, s.url, s.async, s.username, s.password);
+		// Passing null username, generates a login popup on Opera (#2865)
+		if( s.username )
+			xhr.open(type, s.url, s.async, s.username, s.password);
+		else
+			xhr.open(type, s.url, s.async);
 		// Need an extra try/catch for cross domain requests in Firefox 3
 		try {
 			// Set the correct header, if data is being sent
 			if ( s.data )
-				xml.setRequestHeader("Content-Type", s.contentType);
+				xhr.setRequestHeader("Content-Type", s.contentType);
 			// Set the If-Modified-Since header, if ifModified mode.
 			if ( s.ifModified )
-				xml.setRequestHeader("If-Modified-Since",
+				xhr.setRequestHeader("If-Modified-Since",
 					jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
 			// Set header so the called script knows that it's an XMLHttpRequest
-			xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+			xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
 			// Set the Accepts header for the server, depending on the dataType
-			xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
 				s.accepts[ s.dataType ] + ", */*" :
 				s.accepts._default );
 		} catch(e){}
 		// Allow custom headers/mimetypes
-		if ( s.beforeSend )
-			s.beforeSend(xml);
+		if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
+			// cleanup active request counter
+			s.global && jQuery.active--;
+			// close opended socket
+			xhr.abort();
+			return false;
+		}
 		if ( s.global )
-			jQuery.event.trigger("ajaxSend", [xml, s]);
+			jQuery.event.trigger("ajaxSend", [xhr, s]);
 		// Wait for a response to come back
 		var onreadystatechange = function(isTimeout){
 			// The transfer is complete and the data is available, or the request timed out
-			if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
+			if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
 				requestDone = true;
 				// clear poll interval
 				if (ival) {
 					clearInterval(ival);
 					ival = null;
 				}
 				status = isTimeout == "timeout" && "timeout" ||
-					!jQuery.httpSuccess( xml ) && "error" ||
-					s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
+					!jQuery.httpSuccess( xhr ) && "error" ||
+					s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" ||
 					"success";
 				if ( status == "success" ) {
 					// Watch for, and catch, XML document parse errors
 					try {
 						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xml, s.dataType );
+						data = jQuery.httpData( xhr, s.dataType, s.dataFilter );
 					} catch(e) {
 						status = "parsererror";
 					}
@@ -2724,52 +2762,52 @@ jQuery.extend({
 					// Cache Last-Modified header, if ifModified mode.
 					var modRes;
 					try {
-						modRes = xml.getResponseHeader("Last-Modified");
+						modRes = xhr.getResponseHeader("Last-Modified");
 					} catch(e) {} // swallow exception thrown by FF if header is not available
 					if ( s.ifModified && modRes )
 						jQuery.lastModified[s.url] = modRes;
 					// JSONP handles its own success callback
 					if ( !jsonp )
-						success();
+						success();
 				} else
-					jQuery.handleError(s, xml, status);
+					jQuery.handleError(s, xhr, status);
 				// Fire the complete handlers
 				complete();
 				// Stop memory leaks
 				if ( s.async )
-					xml = null;
+					xhr = null;
 			}
 		};
 		if ( s.async ) {
 			// don't attach the handler to the request, just poll it instead
-			var ival = setInterval(onreadystatechange, 13);
+			var ival = setInterval(onreadystatechange, 13);
 			// Timeout checker
 			if ( s.timeout > 0 )
 				setTimeout(function(){
 					// Check to see if the request is still happening
-					if ( xml ) {
+					if ( xhr ) {
 						// Cancel the request
-						xml.abort();
+						xhr.abort();
 						if( !requestDone )
 							onreadystatechange( "timeout" );
 					}
 				}, s.timeout);
 		}
 		// Send the data
 		try {
-			xml.send(s.data);
+			xhr.send(s.data);
 		} catch(e) {
-			jQuery.handleError(s, xml, null, e);
+			jQuery.handleError(s, xhr, null, e);
 		}
 		// firefox 1.5 doesn't fire statechange for sync requests
 		if ( !s.async )
 			onreadystatechange();
@@ -2781,70 +2819,74 @@ jQuery.extend({
 			// Fire the global callback
 			if ( s.global )
-				jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+				jQuery.event.trigger( "ajaxSuccess", [xhr, s] );
 		}
 		function complete(){
 			// Process result
 			if ( s.complete )
-				s.complete(xml, status);
+				s.complete(xhr, status);
 			// The request was completed
 			if ( s.global )
-				jQuery.event.trigger( "ajaxComplete", [xml, s] );
+				jQuery.event.trigger( "ajaxComplete", [xhr, s] );
 			// Handle the global AJAX counter
 			if ( s.global && ! --jQuery.active )
 				jQuery.event.trigger( "ajaxStop" );
 		}
 		// return XMLHttpRequest to allow aborting the request etc.
-		return xml;
+		return xhr;
 	},
-	handleError: function( s, xml, status, e ) {
+	handleError: function( s, xhr, status, e ) {
 		// If a local callback was specified, fire it
-		if ( s.error ) s.error( xml, status, e );
+		if ( s.error ) s.error( xhr, status, e );
 		// Fire the global callback
 		if ( s.global )
-			jQuery.event.trigger( "ajaxError", [xml, s, e] );
+			jQuery.event.trigger( "ajaxError", [xhr, s, e] );
 	},
 	// Counter for holding the number of active queries
 	active: 0,
 	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( r ) {
+	httpSuccess: function( xhr ) {
 		try {
 			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !r.status && location.protocol == "file:" ||
-				( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 ||
-				jQuery.browser.safari && r.status == undefined;
+			return !xhr.status && location.protocol == "file:" ||
+				( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
+				jQuery.browser.safari && xhr.status == undefined;
 		} catch(e){}
 		return false;
 	},
 	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xml, url ) {
+	httpNotModified: function( xhr, url ) {
 		try {
-			var xmlRes = xml.getResponseHeader("Last-Modified");
+			var xhrRes = xhr.getResponseHeader("Last-Modified");
 			// Firefox always returns 200. check Last-Modified date
-			return xml.status == 304 || xmlRes == jQuery.lastModified[url] ||
-				jQuery.browser.safari && xml.status == undefined;
+			return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
+				jQuery.browser.safari && xhr.status == undefined;
 		} catch(e){}
 		return false;
 	},
-	httpData: function( r, type ) {
-		var ct = r.getResponseHeader("content-type");
-		var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
-		var data = xml ? r.responseXML : r.responseText;
+	httpData: function( xhr, type, filter ) {
+		var ct = xhr.getResponseHeader("content-type"),
+			xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
+			data = xml ? xhr.responseXML : xhr.responseText;
 		if ( xml && data.documentElement.tagName == "parsererror" )
 			throw "parsererror";
+		// Allow a pre-filtering function to sanitize the response
+		if( filter )
+			data = filter( data, type );
 		// If the type is "script", eval it in global context
 		if ( type == "script" )
 			jQuery.globalEval( data );
@@ -2879,7 +2921,7 @@ jQuery.extend({
 						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
 					});
 				else
-					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
+					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
 		// Return the resulting serialization
 		return s.join("&").replace(/%20/g, "+");
@@ -2892,7 +2934,7 @@ jQuery.fn.extend({
 			this.animate({
 				height: "show", width: "show", opacity: "show"
 			}, speed, callback) :
 			this.filter(":hidden").each(function(){
 				this.style.display = this.oldblock || "";
 				if ( jQuery.css(this,"display") == "none" ) {
@@ -2905,13 +2947,13 @@ jQuery.fn.extend({
 				}
 			}).end();
 	},
 	hide: function(speed,callback){
 		return speed ?
 			this.animate({
 				height: "hide", width: "hide", opacity: "hide"
 			}, speed, callback) :
 			this.filter(":visible").each(function(){
 				this.oldblock = this.oldblock || jQuery.css(this,"display");
 				this.style.display = "none";
@@ -2920,10 +2962,10 @@ jQuery.fn.extend({
 	// Save the old toggle function
 	_toggle: jQuery.fn.toggle,
 	toggle: function( fn, fn2 ){
 		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
-			this._toggle( fn, fn2 ) :
+			this._toggle.apply( this, arguments ) :
 			fn ?
 				this.animate({
 					height: "toggle", width: "toggle", opacity: "toggle"
@@ -2932,11 +2974,11 @@ jQuery.fn.extend({
 					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
 				});
 	},
 	slideDown: function(speed,callback){
 		return this.animate({height: "show"}, speed, callback);
 	},
 	slideUp: function(speed,callback){
 		return this.animate({height: "hide"}, speed, callback);
 	},
@@ -2944,19 +2986,19 @@ jQuery.fn.extend({
 	slideToggle: function(speed, callback){
 		return this.animate({height: "toggle"}, speed, callback);
 	},
 	fadeIn: function(speed, callback){
 		return this.animate({opacity: "show"}, speed, callback);
 	},
 	fadeOut: function(speed, callback){
 		return this.animate({opacity: "hide"}, speed, callback);
 	},
 	fadeTo: function(speed,to,callback){
 		return this.animate({opacity: to}, speed, callback);
 	},
 	animate: function( prop, speed, easing, callback ) {
 		var optall = jQuery.speed(speed, easing, callback);
@@ -2964,12 +3006,12 @@ jQuery.fn.extend({
 			if ( this.nodeType != 1)
 				return false;
-			var opt = jQuery.extend({}, optall);
-			var hidden = jQuery(this).is(":hidden"), self = this;
-			for ( var p in prop ) {
+			var opt = jQuery.extend({}, optall), p,
+				hidden = jQuery(this).is(":hidden"), self = this;
+			for ( p in prop ) {
 				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
-					return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+					return opt.complete.call(this);
 				if ( p == "height" || p == "width" ) {
 					// Store display property
@@ -2984,7 +3026,7 @@ jQuery.fn.extend({
 				this.style.overflow = "hidden";
 			opt.curAnim = jQuery.extend({}, prop);
 			jQuery.each( prop, function(name, val){
 				var e = new jQuery.fx( self, opt, name );
@@ -3019,7 +3061,7 @@ jQuery.fn.extend({
 			return true;
 		});
 	},
 	queue: function(type, fn){
 		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
 			fn = type;
@@ -3034,9 +3076,9 @@ jQuery.fn.extend({
 				queue(this, type, fn);
 			else {
 				queue(this, type).push( fn );
 				if ( queue(this, type).length == 1 )
-					fn.apply(this);
+					fn.call(this);
 			}
 		});
 	},
@@ -3068,17 +3110,16 @@ jQuery.fn.extend({
 });
 var queue = function( elem, type, array ) {
-	if ( !elem )
-		return undefined;
+	if ( elem ){
-	type = type || "fx";
+		type = type || "fx";
-	var q = jQuery.data( elem, type + "queue" );
+		var q = jQuery.data( elem, type + "queue" );
-	if ( !q || array )
-		q = jQuery.data( elem, type + "queue",
-			array ? jQuery.makeArray(array) : [] );
+		if ( !q || array )
+			q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
+	}
 	return q;
 };
@@ -3091,36 +3132,36 @@ jQuery.fn.dequeue = function(type){
 		q.shift();
 		if ( q.length )
-			q[0].apply( this );
+			q[0].call( this );
 	});
 };
 jQuery.extend({
 	speed: function(speed, easing, fn) {
 		var opt = speed && speed.constructor == Object ? speed : {
-			complete: fn || !fn && easing ||
+			complete: fn || !fn && easing ||
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
 			easing: fn && easing || easing && easing.constructor != Function && easing
 		};
-		opt.duration = (opt.duration && opt.duration.constructor == Number ?
-			opt.duration :
-			{ slow: 600, fast: 200 }[opt.duration]) || 400;
+		opt.duration = (opt.duration && opt.duration.constructor == Number ?
+			opt.duration :
+			jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
 		// Queueing
 		opt.old = opt.complete;
 		opt.complete = function(){
 			if ( opt.queue !== false )
 				jQuery(this).dequeue();
 			if ( jQuery.isFunction( opt.old ) )
-				opt.old.apply( this );
+				opt.old.call( this );
 		};
 		return opt;
 	},
 	easing: {
 		linear: function( p, n, firstNum, diff ) {
 			return firstNum + diff * p;
@@ -3129,7 +3170,7 @@ jQuery.extend({
 			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
 		}
 	},
 	timers: [],
 	timerId: null,
@@ -3149,7 +3190,7 @@ jQuery.fx.prototype = {
 	// Simple function for setting a style value
 	update: function(){
 		if ( this.options.step )
-			this.options.step.apply( this.elem, [ this.now, this ] );
+			this.options.step.call( this.elem, this.now, this );
 		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
@@ -3169,7 +3210,7 @@ jQuery.fx.prototype = {
 	// Start an animation from one number to another
 	custom: function(from, to, unit){
-		this.startTime = (new Date()).getTime();
+		this.startTime = now();
 		this.start = from;
 		this.end = to;
 		this.unit = unit || this.unit || "px";
@@ -3189,7 +3230,7 @@ jQuery.fx.prototype = {
 		if ( jQuery.timerId == null ) {
 			jQuery.timerId = setInterval(function(){
 				var timers = jQuery.timers;
 				for ( var i = 0; i < timers.length; i++ )
 					if ( !timers[i]() )
 						timers.splice(i--, 1);
@@ -3215,7 +3256,7 @@ jQuery.fx.prototype = {
 		// flash of content
 		if ( this.prop == "width" || this.prop == "height" )
 			this.elem.style[this.prop] = "1px";
 		// Start by showing the element
 		jQuery(this.elem).show();
 	},
@@ -3232,7 +3273,7 @@ jQuery.fx.prototype = {
 	// Each step of an animation
 	step: function(gotoEnd){
-		var t = (new Date()).getTime();
+		var t = now();
 		if ( gotoEnd || t > this.options.duration + this.startTime ) {
 			this.now = this.end;
@@ -3250,7 +3291,7 @@ jQuery.fx.prototype = {
 				if ( this.options.display != null ) {
 					// Reset the overflow
 					this.elem.style.overflow = this.options.overflow;
 					// Reset the display
 					this.elem.style.display = this.options.display;
 					if ( jQuery.css(this.elem, "display") == "none" )
@@ -3267,10 +3308,9 @@ jQuery.fx.prototype = {
 						jQuery.attr(this.elem.style, p, this.options.orig[p]);
 			}
-			// If a callback was provided, execute it
-			if ( done && jQuery.isFunction( this.options.complete ) )
+			if ( done )
 				// Execute the complete function
-				this.options.complete.apply( this.elem );
+				this.options.complete.call( this.elem );
 			return false;
 		} else {
@@ -3290,45 +3330,54 @@ jQuery.fx.prototype = {
 };
-jQuery.fx.step = {
-	scrollLeft: function(fx){
-		fx.elem.scrollLeft = fx.now;
+jQuery.extend( jQuery.fx, {
+	speeds:{
+		slow: 600,
+		fast: 200,
+		// Default speed
+		def: 400
 	},
+	step: {
+		scrollLeft: function(fx){
+			fx.elem.scrollLeft = fx.now;
+		},
-	scrollTop: function(fx){
-		fx.elem.scrollTop = fx.now;
-	},
+		scrollTop: function(fx){
+			fx.elem.scrollTop = fx.now;
+		},
-	opacity: function(fx){
-		jQuery.attr(fx.elem.style, "opacity", fx.now);
-	},
+		opacity: function(fx){
+			jQuery.attr(fx.elem.style, "opacity", fx.now);
+		},
-	_default: function(fx){
-		fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+		_default: function(fx){
+			fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+		}
 	}
-};
+});
 // The Offset Method
 // Originally By Brandon Aaron, part of the Dimension Plugin
 // http://jquery.com/plugins/project/dimensions
 jQuery.fn.offset = function() {
 	var left = 0, top = 0, elem = this[0], results;
 	if ( elem ) with ( jQuery.browser ) {
-		var parent       = elem.parentNode,
+		var parent       = elem.parentNode,
 		    offsetChild  = elem,
-		    offsetParent = elem.offsetParent,
+		    offsetParent = elem.offsetParent,
 		    doc          = elem.ownerDocument,
 		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
-		    fixed        = jQuery.css(elem, "position") == "fixed";
+		    css          = jQuery.curCSS,
+		    fixed        = css(elem, "position") == "fixed";
 		// Use getBoundingClientRect if available
 		if ( elem.getBoundingClientRect ) {
 			var box = elem.getBoundingClientRect();
 			// Add the document scroll offsets
 			add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
 				box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
 			// IE adds the HTML element's border, by default it is medium which is 2px
 			// IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
 			// IE 7 standards mode, the border is always 2px
@@ -3336,54 +3385,54 @@ jQuery.fn.offset = function() {
 			// However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
 			// Therefore this method will be off by 2px in IE while in quirksmode
 			add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
 		// Otherwise loop through the offsetParents and parentNodes
 		} else {
 			// Initial element offsets
 			add( elem.offsetLeft, elem.offsetTop );
 			// Get parent offsets
 			while ( offsetParent ) {
 				// Add offsetParent offsets
 				add( offsetParent.offsetLeft, offsetParent.offsetTop );
 				// Mozilla and Safari > 2 does not include the border on offset parents
 				// However Mozilla adds the border for table or table cells
 				if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 )
 					border( offsetParent );
 				// Add the document scroll offsets if position is fixed on any offsetParent
-				if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" )
+				if ( !fixed && css(offsetParent, "position") == "fixed" )
 					fixed = true;
 				// Set offsetChild to previous offsetParent unless it is the body element
 				offsetChild  = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent;
 				// Get next offsetParent
 				offsetParent = offsetParent.offsetParent;
 			}
 			// Get parent scroll offsets
 			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
 				// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-				if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
+				if ( !/^inline|table.*$/i.test(css(parent, "display")) )
 					// Subtract parent scroll offsets
 					add( -parent.scrollLeft, -parent.scrollTop );
 				// Mozilla does not add the border for a parent that has overflow != visible
-				if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
+				if ( mozilla && css(parent, "overflow") != "visible" )
 					border( parent );
 				// Get next parent
 				parent = parent.parentNode;
 			}
 			// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
 			// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-			if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) ||
-				(mozilla && jQuery.css(offsetChild, "position") != "absolute") )
+			if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) ||
+				(mozilla && css(offsetChild, "position") != "absolute") )
 					add( -doc.body.offsetLeft, -doc.body.offsetTop );
 			// Add the document scroll offsets if position is fixed
 			if ( fixed )
 				add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
@@ -3399,10 +3448,102 @@ jQuery.fn.offset = function() {
 	}
 	function add(l, t) {
-		left += parseInt(l) || 0;
-		top += parseInt(t) || 0;
+		left += parseInt(l, 10) || 0;
+		top += parseInt(t, 10) || 0;
 	}
 	return results;
 };
-})();
+jQuery.fn.extend({
+	position: function() {
+		var left = 0, top = 0, results;
+		if ( this[0] ) {
+			// Get *real* offsetParent
+			var offsetParent = this.offsetParent(),
+			// Get correct offsets
+			offset       = this.offset(),
+			parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+			// Subtract element margins
+			// note: when an element has margin: auto the offsetLeft and marginLeft
+			// are the same in Safari causing offset.left to incorrectly be 0
+			offset.top  -= num( this, 'marginTop' );
+			offset.left -= num( this, 'marginLeft' );
+			// Add offsetParent borders
+			parentOffset.top  += num( offsetParent, 'borderTopWidth' );
+			parentOffset.left += num( offsetParent, 'borderLeftWidth' );
+			// Subtract the two offsets
+			results = {
+				top:  offset.top  - parentOffset.top,
+				left: offset.left - parentOffset.left
+			};
+		}
+		return results;
+	},
+	offsetParent: function() {
+		var offsetParent = this[0].offsetParent;
+		while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+			offsetParent = offsetParent.offsetParent;
+		return jQuery(offsetParent);
+	}
+});
+// Create scrollLeft and scrollTop methods
+jQuery.each( ['Left', 'Top'], function(i, name) {
+	var method = 'scroll' + name;
+	jQuery.fn[ method ] = function(val) {
+		if (!this[0]) return;
+		return val != undefined ?
+			// Set the scroll offset
+			this.each(function() {
+				this == window || this == document ?
+					window.scrollTo(
+						!i ? val : jQuery(window).scrollLeft(),
+						 i ? val : jQuery(window).scrollTop()
+					) :
+					this[ method ] = val;
+			}) :
+			// Return the scroll offset
+			this[0] == window || this[0] == document ?
+				self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+					jQuery.boxModel && document.documentElement[ method ] ||
+					document.body[ method ] :
+				this[0][ method ];
+	};
+});
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function(i, name){
+	var tl = i ? "Left"  : "Top",  // top or left
+		br = i ? "Right" : "Bottom"; // bottom or right
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function(){
+		return this[ name.toLowerCase() ]() +
+			num(this, "padding" + tl) +
+			num(this, "padding" + br);
+	};
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function(margin) {
+		return this["inner" + name]() +
+			num(this, "border" + tl + "Width") +
+			num(this, "border" + br + "Width") +
+			(margin ?
+				num(this, "margin" + tl) + num(this, "margin" + br) : 0);
+	};
+});})();