compass-jquery-plugin 0.3.0.0 → 0.3.1.beta.2

data/templates/jqgrid/manifest.rb

@@ -0,0 +1,72 @@
+# Generated by compass-jquery-plugin/gem-tasks/jqgrid.rake
+# Install with: compass install jquery/jqgrid
+
+file 'config/initializers/jqgrid.rb'
+file 'config/locales/jquery/jqgrid/de.yml'
+file 'config/locales/jquery/jqgrid/en.yml'
+javascript 'jquery.jqGrid.js'
+javascript 'jquery.jqGrid.min.js'
+javascript 'i18n/jqgrid/locale-bg.js'
+javascript 'i18n/jqgrid/locale-bg.min.js'
+javascript 'i18n/jqgrid/locale-bg1251.js'
+javascript 'i18n/jqgrid/locale-bg1251.min.js'
+javascript 'i18n/jqgrid/locale-cat.js'
+javascript 'i18n/jqgrid/locale-cat.min.js'
+javascript 'i18n/jqgrid/locale-cn.js'
+javascript 'i18n/jqgrid/locale-cn.min.js'
+javascript 'i18n/jqgrid/locale-cs.js'
+javascript 'i18n/jqgrid/locale-cs.min.js'
+javascript 'i18n/jqgrid/locale-da.js'
+javascript 'i18n/jqgrid/locale-da.min.js'
+javascript 'i18n/jqgrid/locale-de.js'
+javascript 'i18n/jqgrid/locale-de.min.js'
+javascript 'i18n/jqgrid/locale-el.js'
+javascript 'i18n/jqgrid/locale-el.min.js'
+javascript 'i18n/jqgrid/locale-en.js'
+javascript 'i18n/jqgrid/locale-en.min.js'
+javascript 'i18n/jqgrid/locale-es.js'
+javascript 'i18n/jqgrid/locale-es.min.js'
+javascript 'i18n/jqgrid/locale-fa.js'
+javascript 'i18n/jqgrid/locale-fa.min.js'
+javascript 'i18n/jqgrid/locale-fi.js'
+javascript 'i18n/jqgrid/locale-fi.min.js'
+javascript 'i18n/jqgrid/locale-fr.js'
+javascript 'i18n/jqgrid/locale-fr.min.js'
+javascript 'i18n/jqgrid/locale-gl.js'
+javascript 'i18n/jqgrid/locale-gl.min.js'
+javascript 'i18n/jqgrid/locale-he.js'
+javascript 'i18n/jqgrid/locale-he.min.js'
+javascript 'i18n/jqgrid/locale-hu.js'
+javascript 'i18n/jqgrid/locale-hu.min.js'
+javascript 'i18n/jqgrid/locale-is.js'
+javascript 'i18n/jqgrid/locale-is.min.js'
+javascript 'i18n/jqgrid/locale-it.js'
+javascript 'i18n/jqgrid/locale-it.min.js'
+javascript 'i18n/jqgrid/locale-ja.js'
+javascript 'i18n/jqgrid/locale-ja.min.js'
+javascript 'i18n/jqgrid/locale-nl.js'
+javascript 'i18n/jqgrid/locale-nl.min.js'
+javascript 'i18n/jqgrid/locale-no.js'
+javascript 'i18n/jqgrid/locale-no.min.js'
+javascript 'i18n/jqgrid/locale-pl.js'
+javascript 'i18n/jqgrid/locale-pl.min.js'
+javascript 'i18n/jqgrid/locale-pt-br.js'
+javascript 'i18n/jqgrid/locale-pt-br.min.js'
+javascript 'i18n/jqgrid/locale-pt.js'
+javascript 'i18n/jqgrid/locale-pt.min.js'
+javascript 'i18n/jqgrid/locale-ro.js'
+javascript 'i18n/jqgrid/locale-ro.min.js'
+javascript 'i18n/jqgrid/locale-ru.js'
+javascript 'i18n/jqgrid/locale-ru.min.js'
+javascript 'i18n/jqgrid/locale-sk.js'
+javascript 'i18n/jqgrid/locale-sk.min.js'
+javascript 'i18n/jqgrid/locale-sr.js'
+javascript 'i18n/jqgrid/locale-sr.min.js'
+javascript 'i18n/jqgrid/locale-sv.js'
+javascript 'i18n/jqgrid/locale-sv.min.js'
+javascript 'i18n/jqgrid/locale-tr.js'
+javascript 'i18n/jqgrid/locale-tr.min.js'
+javascript 'i18n/jqgrid/locale-ua.js'
+javascript 'i18n/jqgrid/locale-ua.min.js'
+stylesheet 'jquery/jqGrid.scss'
+file 'public/stylesheets/ellipsis-xbl.xml'

data/templates/jqgrid/public/stylesheets/ellipsis-xbl.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<bindings
+    xmlns="http://www.mozilla.org/xbl"
+    xmlns:xbl="http://www.mozilla.org/xbl"
+    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <binding id="ellipsis">
+        <content>
+            <xul:window><!-- xul:window tag required for FF2 -->
+                <xul:description crop="end" xbl:inherits="value=xbl:text"><children/></xul:description>
+            </xul:window>
+        </content>
+    </binding>
+</bindings>

data/templates/jqtouch/jquery/touch/apple.scss

@@ -39,7 +39,7 @@ body {
   &.landscape .toolbar > h1 {
     margin-left: -125px;
     width: 250px; }
-  .button, .back, .cancel, .add {
+  .button, .back, .cancel, .add, .backRemote {
     position: absolute;
     overflow: hidden;
     top: 8px;
@@ -65,15 +65,15 @@ body {
   .blueButton {
     -webkit-border-image: image_url("jquery/touch/apple/activeButton.png") 0 5 0 5;
     border-width: 0 5px; }
-  .back {
+  .back, .backRemote {
     left: 6px;
     right: auto;
     padding: 0;
     max-width: 55px;
     border-width: 0 8px 0 14px;
-    -webkit-border-image: image_url("jquery/touch/apple/backButton.png") 0 8 0 14;
-    &.active {
-      -webkit-border-image: image_url("jquery/touch/apple/backButton.png") 0 8 0 14; } }
+    -webkit-border-image: image_url("jquery/touch/apple/backButton.png") 0 8 0 14; }
+  .back.active, .backRemote.active {
+    -webkit-border-image: image_url("jquery/touch/apple/backButton.png") 0 8 0 14; }
   .leftButton, .cancel {
     left: 6px;
     right: auto; }

data/templates/jqtouch/jquery/touch/default.scss

@@ -40,7 +40,7 @@ body {
   &.landscape .toolbar > h1 {
     margin-left: -125px;
     width: 250px; }
-  .button, .back, .cancel, .add {
+  .button, .back, .cancel, .add, .backRemote {
     position: absolute;
     overflow: hidden;
     top: 8px;
@@ -63,15 +63,15 @@ body {
     -webkit-border-image: image_url("jquery/touch/default/button.png") 0 5 0 5; }
   .button.active, .cancel.active, .add.active {
     -webkit-border-image: image_url("jquery/touch/default/buttonActive.png") 0 5 0 5; }
-  .back {
+  .back, .backRemote {
     left: 6px;
     right: auto;
     padding: 0;
     max-width: 55px;
     border-width: 0 8px 0 14px;
-    -webkit-border-image: image_url("jquery/touch/default/backButton.png") 0 8 0 14;
-    &.active {
-      -webkit-border-image: image_url("jquery/touch/default/backButtonActive.png") 0 8 0 14; } }
+    -webkit-border-image: image_url("jquery/touch/default/backButton.png") 0 8 0 14; }
+  .back.active, .backRemote.active {
+    -webkit-border-image: image_url("jquery/touch/default/backButtonActive.png") 0 8 0 14; }
   .leftButton, .cancel {
     left: 6px;
     right: auto; }

data/templates/jqtouch/jquery/touch/jqt.scss

@@ -40,7 +40,7 @@ body {
   &.landscape .toolbar > h1 {
     margin-left: -125px;
     width: 250px; }
-  .button, .back, .cancel, .add {
+  .button, .back, .cancel, .add, .backRemote {
     position: absolute;
     overflow: hidden;
     top: 8px;
@@ -67,15 +67,15 @@ body {
   .blueButton {
     -webkit-border-image: image_url("jquery/touch/jqt/blueButton.png") 0 5 0 5;
     border-width: 0 5px; }
-  .back {
+  .back, .backRemote {
     left: 6px;
     right: auto;
     padding: 0;
     max-width: 55px;
     border-width: 0 8px 0 14px;
-    -webkit-border-image: image_url("jquery/touch/jqt/back_button.png") 0 8 0 14;
-    &.active {
-      -webkit-border-image: image_url("jquery/touch/jqt/back_button_clicked.png") 0 8 0 14; } }
+    -webkit-border-image: image_url("jquery/touch/jqt/back_button.png") 0 8 0 14; }
+  .back.active, .backRemote.active {
+    -webkit-border-image: image_url("jquery/touch/jqt/back_button_clicked.png") 0 8 0 14; }
   .leftButton, .cancel {
     left: 6px;
     right: auto; }

data/templates/jrails/config/initializers/jrails.rb

@@ -33,8 +33,11 @@ ActionView::Helpers::AssetTagHelper.register_javascript_expansion :layout => ['j
 ActionView::Helpers::AssetTagHelper.register_javascript_expansion :pngFix => ['jquery.pngFix.min']
 ActionView::Helpers::AssetTagHelper.register_javascript_expansion :sparklines => ['jquery.sparkline.min']
 ActionView::Helpers::AssetTagHelper.register_javascript_expansion :themeSwitcher => ['jquery.themeswitchertool.min']
+ActionView::Helpers::AssetTagHelper.register_javascript_expansion :tmpl => ['jquery.tmpl.min']
+ActionView::Helpers::AssetTagHelper.register_javascript_expansion :tmpl_plus => ['jquery.tmplPlus.min']
 
 require 'jquery/jrails'
+require 'handle_attributes'
 require 'jquery/jquery_selector_assertions' if RAILS_ENV == 'test'
 require 'jquery/jquery_auto_complete'
 require 'jquery/flash_messages'

data/templates/jrails/jquery-ui.js

@@ -20587,13 +20587,19 @@ $.widget("ui.selectmenu", {
 	eventPrefix: "selectmenu",
 	options: {
 		transferClasses: true,
-		style: 'popup',
+		style: 'dropdown',
+		positionOptions: {
+			my: "left top",
+			at: "left bottom",
+			offset: null
+		},
 		width: null, 
 		menuWidth: null, 
 		handleWidth: 26, 
 		maxHeight: null,
 		icons: null, 
-		format: null
+		format: null,
+		bgImage: function() {}
 	},	
 	
 	_create: function() {
@@ -20671,17 +20677,17 @@ $.widget("ui.selectmenu", {
 						ret = true;
 						break;	
 					default:
-						ret = false;
+						ret = true;
 						self._typeAhead(event.keyCode, 'mouseup');
 						break;	
 				}
 				return ret;
 			})
 			.bind('mouseover focus', function(){ 
-				$(this).addClass(self.widgetBaseClass+'-focus ui-state-hover'); 
+				if (!o.disabled) $(this).addClass(self.widgetBaseClass+'-focus ui-state-hover'); 
 			})
 			.bind('mouseout blur', function(){  
-				$(this).removeClass(self.widgetBaseClass+'-focus ui-state-hover'); 
+				if (!o.disabled) $(this).removeClass(self.widgetBaseClass+'-focus ui-state-hover'); 
 			});
 		
 		//document click closes menu
@@ -20709,7 +20715,8 @@ $.widget("ui.selectmenu", {
 					text: self._formatText(jQuery(this).text()),
 					selected: $(this).attr('selected'),
 					classes: $(this).attr('class'),
-					parentOptGroup: $(this).parent('optgroup').attr('label')
+					parentOptGroup: $(this).parent('optgroup').attr('label'),
+					bgImage: o.bgImage.call($(this))
 				});
 			});		
 				
@@ -20741,7 +20748,7 @@ $.widget("ui.selectmenu", {
 					$(this).removeClass('ui-state-active').addClass(self.widgetBaseClass + '-item-focus ui-state-hover'); 
 				})
 				.bind('mouseout blur', function(){ 
-					if($(this).is( self._selectedOptionLi() )){ $(this).addClass(activeClass); }
+					if ($(this).is( self._selectedOptionLi().selector )){ $(this).addClass(activeClass); }
 					$(this).removeClass(self.widgetBaseClass + '-item-focus ui-state-hover'); 
 				});
 				
@@ -20773,11 +20780,13 @@ $.widget("ui.selectmenu", {
 						thisLi
 							.data('optionClasses', selectOptionData[i].classes + ' ' + self.widgetBaseClass + '-hasIcon')
 							.addClass(self.widgetBaseClass + '-hasIcon');
-						var iconClass = o.icons[j].icon || "";
-						
+						var iconClass = o.icons[j].icon || "";						
 						thisLi
 							.find('a:eq(0)')
-							.prepend('<span class="'+self.widgetBaseClass+'-item-icon ui-icon '+iconClass + '"></span>');
+							.prepend('<span class="'+self.widgetBaseClass+'-item-icon ui-icon ' +iconClass + '"></span>');
+						if (selectOptionData[i].bgImage) {
+							thisLi.find('span').css('background-image', selectOptionData[i].bgImage);
+						}
 					}
 				}
 			}
@@ -20803,9 +20812,16 @@ $.widget("ui.selectmenu", {
 		if(o.style == 'dropdown'){ this.list.width( (o.menuWidth) ? o.menuWidth : ((o.width) ? o.width : selectWidth)); }
 		else { this.list.width( (o.menuWidth) ? o.menuWidth : ((o.width) ? o.width - o.handleWidth : selectWidth - o.handleWidth)); }	
 		
-		//set max height from option 
-		if(o.maxHeight && o.maxHeight < this.list.height()){ this.list.height(o.maxHeight); }	
-		
+		// calculate default max height
+		if(o.maxHeight) {
+			//set max height from option 
+			 if (o.maxHeight < this.list.height()){ this.list.height(o.maxHeight); }
+		} else {
+			if (!o.format && ($(window).height() / 3) < this.list.height()) {
+				o.maxHeight = $(window).height() / 3;
+				this.list.height(o.maxHeight);
+			}
+		}
 		//save reference to actionable li's (not group label li's)
 		this._optionLis = this.list.find('li:not(.'+ self.widgetBaseClass +'-group)');
 				
@@ -20814,8 +20830,6 @@ $.widget("ui.selectmenu", {
 			.keydown(function(event){
 				var ret = true;
 				switch (event.keyCode) {
-					// this needs to be fixed as _moveFocus doesnt work correctly
-					/*
 					case $.ui.keyCode.UP:
 					case $.ui.keyCode.LEFT:
 						ret = false;
@@ -20826,7 +20840,6 @@ $.widget("ui.selectmenu", {
 						ret = false;
 						self._moveFocus(1);
 						break;	
-					*/
 					case $.ui.keyCode.HOME:
 						ret = false;
 						self._moveFocus(':first');
@@ -20856,11 +20869,7 @@ $.widget("ui.selectmenu", {
 					case $.ui.keyCode.ESCAPE:
 						ret = false;
 						self.close(event,true);
-						break;	
-					default:
-						ret = false;
-						self._typeAhead(event.keyCode,'focus');
-						break;		
+						break;
 				}
 				return ret;
 			});
@@ -21013,7 +21022,7 @@ $.widget("ui.selectmenu", {
 	},
 	_moveFocus: function(amt){
 		if(!isNaN(amt)){
-			var currIndex = parseInt(this._focusedOptionLi().data('index'), 10);
+			var currIndex = parseInt(this._focusedOptionLi().data('index') || 0, 10);
 			var newIndex = currIndex + amt;
 		}
 		else { var newIndex = parseInt(this._optionLis.filter(amt).data('index'), 10); }
@@ -21025,7 +21034,7 @@ $.widget("ui.selectmenu", {
 		var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
 		
 		this._focusedOptionLi().find('a:eq(0)').attr('id','');
-		this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID)[0].focus();
+		this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID).focus();
 		this.list.attr('aria-activedescendant', activeID);
 	},
 	_scrollPage: function(direction){
@@ -21088,46 +21097,20 @@ $.widget("ui.selectmenu", {
 		this.list.attr('aria-activedescendant', activeID);
 	},
 	_refreshPosition: function(){	
-		var self = this, o = this.options;
-		
-		// get some vars
-		var pageScroll = self._pageScroll();
-		var menuTop = this.newelement.offset().top;
-		var viewportHeight = $(window).height();
-		var listHeight = $(this.list[0]).outerHeight();
-		
-		// check if there's enough room to expand to the bottom
-		if ((menuTop + listHeight) > (viewportHeight + pageScroll)) {
-			menuTop -= listHeight;
-		} else {
-			if (this.newelement.is('.'+this.widgetBaseClass+'-popup')) {
-				var scrolledAmt = this.list[0].scrollTop;
-				this.list.find('li:lt('+this._selectedIndex()+')').each(function() {
-					scrolledAmt -= $(this).outerHeight();
-				});
-				menuTop+=scrolledAmt; 
-			} else { 
-				menuTop += this.newelement.height();
-			}
-		}
-		// set values
-		this.list.css({
-			top: menuTop,	
-			left: this.newelement.offset().left
+		var o = this.options;		
+		// if its a native pop-up we need to calculate the position of the selected li
+		if (o.style == "popup" && !o.positionOptions.offset) {
+			var selected = this.list.find('li:not(.ui-selectmenu-group):eq('+this._selectedIndex()+')');
+			// var _offset = "0 -" + (selected.outerHeight() + selected.offset().top - this.list.offset().top);
+			var _offset = "0 -" + (selected.outerHeight() + selected.offset().top - this.list.offset().top);
+		}
+		this.list.position({
+			// set options for position plugin
+			of: o.positionOptions.of || this.newelement,
+			my: o.positionOptions.my,
+			at: o.positionOptions.at,
+			offset: o.positionOptions.offset || _offset
 		});
-	},	
-	_pageScroll: function() {
-		var yScroll;
-		if (self.pageYOffset) {
-			yScroll = self.pageYOffset;
-		// Explorer 6 Strict
-		} else if (document.documentElement && document.documentElement.scrollTop) {
-			yScroll = document.documentElement.scrollTop;
-		// all other Explorers
-		} else if (document.body) { 
-			yScroll = document.body.scrollTop;
-		}
-		return yScroll;
 	}
 });
 })(jQuery);

data/templates/jrails/jquery-ui.min.js

@@ -708,28 +708,28 @@ this.options,e=this.opos[0],a=this.opos[1],f=d.pageX,i=d.pageY;if(e>f){var k=f;f
 l.unselecting=false}if(!l.selecting){l.$element.addClass("ui-selecting");l.selecting=true;h._trigger("selecting",d,{selecting:l.element})}}else{if(l.selecting)if(d.metaKey&&l.startselected){l.$element.removeClass("ui-selecting");l.selecting=false;l.$element.addClass("ui-selected");l.selected=true}else{l.$element.removeClass("ui-selecting");l.selecting=false;if(l.startselected){l.$element.addClass("ui-unselecting");l.unselecting=true}h._trigger("unselecting",d,{unselecting:l.element})}if(l.selected)if(!d.metaKey&&
 !l.startselected){l.$element.removeClass("ui-selected");l.selected=false;l.$element.addClass("ui-unselecting");l.unselecting=true;h._trigger("unselecting",d,{unselecting:l.element})}}}});return false}},_mouseStop:function(d){var h=this;this.dragged=false;b(".ui-unselecting",this.element[0]).each(function(){var g=b.data(this,"selectable-item");g.$element.removeClass("ui-unselecting");g.unselecting=false;g.startselected=false;h._trigger("unselected",d,{unselected:g.element})});b(".ui-selecting",this.element[0]).each(function(){var g=
 b.data(this,"selectable-item");g.$element.removeClass("ui-selecting").addClass("ui-selected");g.selecting=false;g.selected=true;g.startselected=true;h._trigger("selected",d,{selected:g.element})});this._trigger("stop",d);this.helper.remove();return false}});b.extend(b.ui.selectable,{version:"1.8.6"})})(jQuery);
-(function(b){b.widget("ui.selectmenu",{getter:"value",version:"1.8",eventPrefix:"selectmenu",options:{transferClasses:true,style:"popup",width:null,menuWidth:null,handleWidth:26,maxHeight:null,icons:null,format:null},_create:function(){var d=this,h=this.options,g=this.element.attr("id")||"ui-selectmenu-"+Math.random().toString(16).slice(2,10);this.ids=[g+"-button",g+"-menu"];this._safemouseup=true;this.newelement=b('<a class="'+this.widgetBaseClass+' ui-widget ui-state-default ui-corner-all" id="'+
-this.ids[0]+'" role="button" href="#" aria-haspopup="true" aria-owns="'+this.ids[1]+'"></a>').insertAfter(this.element);(g=this.element.attr("tabindex"))&&this.newelement.attr("tabindex",g);this.newelement.data("selectelement",this.element);this.selectmenuIcon=b('<span class="'+this.widgetBaseClass+'-icon ui-icon"></span>').prependTo(this.newelement).addClass(h.style=="popup"?"ui-icon-triangle-2-n-s":"ui-icon-triangle-1-s");b("label[for="+this.element.attr("id")+"]").attr("for",this.ids[0]).bind("click",
-function(){d.newelement[0].focus();return false});this.newelement.bind("mousedown",function(l){d._toggle(l);if(h.style=="popup"){d._safemouseup=false;setTimeout(function(){d._safemouseup=true},300)}return false}).bind("click",function(){return false}).keydown(function(l){var o=true;switch(l.keyCode){case b.ui.keyCode.ENTER:o=true;break;case b.ui.keyCode.SPACE:o=false;d._toggle(l);break;case b.ui.keyCode.UP:case b.ui.keyCode.LEFT:o=false;d._moveSelection(-1);break;case b.ui.keyCode.DOWN:case b.ui.keyCode.RIGHT:o=
-false;d._moveSelection(1);break;case b.ui.keyCode.TAB:o=true;break;default:o=false;d._typeAhead(l.keyCode,"mouseup")}return o}).bind("mouseover focus",function(){b(this).addClass(d.widgetBaseClass+"-focus ui-state-hover")}).bind("mouseout blur",function(){b(this).removeClass(d.widgetBaseClass+"-focus ui-state-hover")});b(document).mousedown(function(l){d.close(l)});this.element.click(function(){this._refreshValue()}).focus(function(){this.newelement&&this.newelement[0].focus()});this.list=b('<ul class="'+
-d.widgetBaseClass+"-menu ui-widget ui-widget-content"+(h.style=="dropdown"?" ui-corner-bottom":" ui-corner-all")+'" aria-hidden="true" role="listbox" aria-labelledby="'+this.ids[0]+'" id="'+this.ids[1]+'"></ul>').appendTo("body");var e=[];this.element.find("option").each(function(){e.push({value:b(this).attr("value"),text:d._formatText(jQuery(this).text()),selected:b(this).attr("selected"),classes:b(this).attr("class"),parentOptGroup:b(this).parent("optgroup").attr("label")})});var a=d.options.style==
-"popup"?" ui-state-active":"";for(g=0;g<e.length;g++){var f=b('<li role="presentation"><a href="#" tabindex="-1" role="option" aria-selected="false">'+e[g].text+"</a></li>").data("index",g).addClass(e[g].classes).data("optionClasses",e[g].classes||"").mouseup(function(l){if(d._safemouseup){var o=b(this).data("index")!=d._selectedIndex();d.value(b(this).data("index"));d.select(l);o&&d.change(l);d.close(l,true)}return false}).click(function(){return false}).bind("mouseover focus",function(){d._selectedOptionLi().addClass(a);
-d._focusedOptionLi().removeClass(d.widgetBaseClass+"-item-focus ui-state-hover");b(this).removeClass("ui-state-active").addClass(d.widgetBaseClass+"-item-focus ui-state-hover")}).bind("mouseout blur",function(){b(this).is(d._selectedOptionLi())&&b(this).addClass(a);b(this).removeClass(d.widgetBaseClass+"-item-focus ui-state-hover")});if(e[g].parentOptGroup){var i=d.widgetBaseClass+"-group-"+e[g].parentOptGroup.replace(/[^a-zA-Z0-9]/g,"");this.list.find("li."+i).size()?this.list.find("li."+i+":last ul").append(f):
-b('<li role="presentation" class="'+d.widgetBaseClass+"-group "+i+'"><span class="'+d.widgetBaseClass+'-group-label">'+e[g].parentOptGroup+"</span><ul></ul></li>").appendTo(this.list).find("ul").append(f)}else f.appendTo(this.list);this.list.bind("mousedown mouseup",function(){return false});if(h.icons)for(var k in h.icons)if(f.is(h.icons[k].find)){f.data("optionClasses",e[g].classes+" "+d.widgetBaseClass+"-hasIcon").addClass(d.widgetBaseClass+"-hasIcon");i=h.icons[k].icon||"";f.find("a:eq(0)").prepend('<span class="'+
-d.widgetBaseClass+"-item-icon ui-icon "+i+'"></span>')}}this.list.find("li:last").addClass("ui-corner-bottom");h.style=="popup"&&this.list.find("li:first").addClass("ui-corner-top");if(h.transferClasses){k=this.element.attr("class")||"";this.newelement.add(this.list).addClass(k)}k=this.element.width();this.newelement.width(h.width?h.width:k);h.style=="dropdown"?this.list.width(h.menuWidth?h.menuWidth:h.width?h.width:k):this.list.width(h.menuWidth?h.menuWidth:h.width?h.width-h.handleWidth:k-h.handleWidth);
-h.maxHeight&&h.maxHeight<this.list.height()&&this.list.height(h.maxHeight);this._optionLis=this.list.find("li:not(."+d.widgetBaseClass+"-group)");this.list.keydown(function(l){var o=true;switch(l.keyCode){case b.ui.keyCode.HOME:o=false;d._moveFocus(":first");break;case b.ui.keyCode.PAGE_UP:o=false;d._scrollPage("up");break;case b.ui.keyCode.PAGE_DOWN:o=false;d._scrollPage("down");break;case b.ui.keyCode.END:o=false;d._moveFocus(":last");break;case b.ui.keyCode.ENTER:case b.ui.keyCode.SPACE:o=false;
-d.close(l,true);b(l.target).parents("li:eq(0)").trigger("mouseup");break;case b.ui.keyCode.TAB:o=true;d.close(l,true);break;case b.ui.keyCode.ESCAPE:o=false;d.close(l,true);break;default:o=false;d._typeAhead(l.keyCode,"focus")}return o});if(h.style=="dropdown"){this.newelement.addClass(d.widgetBaseClass+"-dropdown");this.list.addClass(d.widgetBaseClass+"-menu-dropdown")}else{this.newelement.addClass(d.widgetBaseClass+"-popup");this.list.addClass(d.widgetBaseClass+"-menu-popup")}this.newelement.prepend('<span class="'+
-d.widgetBaseClass+'-status">'+e[this._selectedIndex()].text+"</span>");this.element.hide();this.element.attr("disabled")==true&&this.disable();this.value(this._selectedIndex());b(window).resize(function(){d._refreshPosition()})},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled").unbind("click");b("label[for="+this.newelement.attr("id")+"]").attr("for",this.element.attr("id")).unbind("click");
-this.newelement.remove();this.list.remove();this.element.show();b.Widget.prototype.destroy.apply(this,arguments)},_typeAhead:function(d,h){var g=this;if(!g._prevChar)g._prevChar=["",0];var e=String.fromCharCode(d);c=e.toLowerCase();var a=false;this.list.find("li a").each(function(f){if(!a){var i=b(this).text();if(i.indexOf(e)==0||i.indexOf(c)==0)if(g._prevChar[0]==e){if(g._prevChar[1]<f){a=true;b(this).trigger(h);g._prevChar[1]=f}}else{a=true;b(this).trigger(h);g._prevChar[1]=f}}});this._prevChar[0]=
-e},_uiHash:function(){var d=this.value();return{index:d,option:b("option",this.element).get(d),value:this.element[0].value}},open:function(d){if(this.newelement.attr("aria-disabled")!="true"){this._refreshPosition();this._closeOthers(d);this.newelement.addClass("ui-state-active");this.list.appendTo("body").addClass(this.widgetBaseClass+"-open").attr("aria-hidden",false).find("li:not(."+this.widgetBaseClass+"-group):eq("+this._selectedIndex()+") a")[0].focus();this.options.style=="dropdown"&&this.newelement.removeClass("ui-corner-all").addClass("ui-corner-top");
-this._refreshPosition();this._trigger("open",d,this._uiHash())}},close:function(d,h){if(this.newelement.is(".ui-state-active")){this.newelement.removeClass("ui-state-active");this.list.attr("aria-hidden",true).removeClass(this.widgetBaseClass+"-open");this.options.style=="dropdown"&&this.newelement.removeClass("ui-corner-top").addClass("ui-corner-all");h&&this.newelement[0].focus();this._trigger("close",d,this._uiHash())}},change:function(d){this.element.trigger("change");this._trigger("change",d,
-this._uiHash())},select:function(d){this._trigger("select",d,this._uiHash())},_closeOthers:function(d){b("."+this.widgetBaseClass+".ui-state-active").not(this.newelement).each(function(){b(this).data("selectelement").selectmenu("close",d)});b("."+this.widgetBaseClass+".ui-state-hover").trigger("mouseout")},_toggle:function(d,h){this.list.is("."+this.widgetBaseClass+"-open")?this.close(d,h):this.open(d)},_formatText:function(d){return this.options.format?this.options.format(d):d},_selectedIndex:function(){return this.element[0].selectedIndex},
-_selectedOptionLi:function(){return this._optionLis.eq(this._selectedIndex())},_focusedOptionLi:function(){return this.list.find("."+this.widgetBaseClass+"-item-focus")},_moveSelection:function(d){return this._optionLis.eq(parseInt(this._selectedOptionLi().data("index"),10)+d).trigger("mouseup")},_moveFocus:function(d){d=isNaN(d)?parseInt(this._optionLis.filter(d).data("index"),10):parseInt(this._focusedOptionLi().data("index"),10)+d;if(d<0)d=0;if(d>this._optionLis.size()-1)d=this._optionLis.size()-
-1;var h=this.widgetBaseClass+"-item-"+Math.round(Math.random()*1E3);this._focusedOptionLi().find("a:eq(0)").attr("id","");this._optionLis.eq(d).find("a:eq(0)").attr("id",h)[0].focus();this.list.attr("aria-activedescendant",h)},_scrollPage:function(d){var h=Math.floor(this.list.outerHeight()/this.list.find("li:first").outerHeight());h=d=="up"?-h:h;this._moveFocus(h)},_setOption:function(d,h){this.options[d]=h;if(d=="disabled"){this.close();this.element.add(this.newelement).add(this.list)[h?"addClass":
-"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",h)}},value:function(d){if(arguments.length){this.element[0].selectedIndex=d;this._refreshValue();this._refreshPosition()}return this.element[0].selectedIndex},_refreshValue:function(){var d=this.options.style=="popup"?" ui-state-active":"",h=this.widgetBaseClass+"-item-"+Math.round(Math.random()*1E3);this.list.find("."+this.widgetBaseClass+"-item-selected").removeClass(this.widgetBaseClass+"-item-selected"+
-d).find("a").attr("aria-selected","false").attr("id","");this._selectedOptionLi().addClass(this.widgetBaseClass+"-item-selected"+d).find("a").attr("aria-selected","true").attr("id",h);d=this.newelement.data("optionClasses")?this.newelement.data("optionClasses"):"";var g=this._selectedOptionLi().data("optionClasses")?this._selectedOptionLi().data("optionClasses"):"";this.newelement.removeClass(d).data("optionClasses",g).addClass(g).find("."+this.widgetBaseClass+"-status").html(this._selectedOptionLi().find("a:eq(0)").html());
-this.list.attr("aria-activedescendant",h)},_refreshPosition:function(){var d=this._pageScroll(),h=this.newelement.offset().top,g=b(window).height(),e=b(this.list[0]).outerHeight();if(h+e>g+d)h-=e;else if(this.newelement.is("."+this.widgetBaseClass+"-popup")){var a=this.list[0].scrollTop;this.list.find("li:lt("+this._selectedIndex()+")").each(function(){a-=b(this).outerHeight()});h+=a}else h+=this.newelement.height();this.list.css({top:h,left:this.newelement.offset().left})},_pageScroll:function(){var d;
-if(self.pageYOffset)d=self.pageYOffset;else if(document.documentElement&&document.documentElement.scrollTop)d=document.documentElement.scrollTop;else if(document.body)d=document.body.scrollTop;return d}})})(jQuery);
+(function(b){b.widget("ui.selectmenu",{getter:"value",version:"1.8",eventPrefix:"selectmenu",options:{transferClasses:true,style:"dropdown",positionOptions:{my:"left top",at:"left bottom",offset:null},width:null,menuWidth:null,handleWidth:26,maxHeight:null,icons:null,format:null,bgImage:function(){}},_create:function(){var d=this,h=this.options,g=this.element.attr("id")||"ui-selectmenu-"+Math.random().toString(16).slice(2,10);this.ids=[g+"-button",g+"-menu"];this._safemouseup=true;this.newelement=
+b('<a class="'+this.widgetBaseClass+' ui-widget ui-state-default ui-corner-all" id="'+this.ids[0]+'" role="button" href="#" aria-haspopup="true" aria-owns="'+this.ids[1]+'"></a>').insertAfter(this.element);(g=this.element.attr("tabindex"))&&this.newelement.attr("tabindex",g);this.newelement.data("selectelement",this.element);this.selectmenuIcon=b('<span class="'+this.widgetBaseClass+'-icon ui-icon"></span>').prependTo(this.newelement).addClass(h.style=="popup"?"ui-icon-triangle-2-n-s":"ui-icon-triangle-1-s");
+b("label[for="+this.element.attr("id")+"]").attr("for",this.ids[0]).bind("click",function(){d.newelement[0].focus();return false});this.newelement.bind("mousedown",function(l){d._toggle(l);if(h.style=="popup"){d._safemouseup=false;setTimeout(function(){d._safemouseup=true},300)}return false}).bind("click",function(){return false}).keydown(function(l){var o=true;switch(l.keyCode){case b.ui.keyCode.ENTER:o=true;break;case b.ui.keyCode.SPACE:o=false;d._toggle(l);break;case b.ui.keyCode.UP:case b.ui.keyCode.LEFT:o=
+false;d._moveSelection(-1);break;case b.ui.keyCode.DOWN:case b.ui.keyCode.RIGHT:o=false;d._moveSelection(1);break;case b.ui.keyCode.TAB:o=true;break;default:o=true;d._typeAhead(l.keyCode,"mouseup")}return o}).bind("mouseover focus",function(){h.disabled||b(this).addClass(d.widgetBaseClass+"-focus ui-state-hover")}).bind("mouseout blur",function(){h.disabled||b(this).removeClass(d.widgetBaseClass+"-focus ui-state-hover")});b(document).mousedown(function(l){d.close(l)});this.element.click(function(){this._refreshValue()}).focus(function(){this.newelement&&
+this.newelement[0].focus()});this.list=b('<ul class="'+d.widgetBaseClass+"-menu ui-widget ui-widget-content"+(h.style=="dropdown"?" ui-corner-bottom":" ui-corner-all")+'" aria-hidden="true" role="listbox" aria-labelledby="'+this.ids[0]+'" id="'+this.ids[1]+'"></ul>').appendTo("body");var e=[];this.element.find("option").each(function(){e.push({value:b(this).attr("value"),text:d._formatText(jQuery(this).text()),selected:b(this).attr("selected"),classes:b(this).attr("class"),parentOptGroup:b(this).parent("optgroup").attr("label"),
+bgImage:h.bgImage.call(b(this))})});var a=d.options.style=="popup"?" ui-state-active":"";for(g=0;g<e.length;g++){var f=b('<li role="presentation"><a href="#" tabindex="-1" role="option" aria-selected="false">'+e[g].text+"</a></li>").data("index",g).addClass(e[g].classes).data("optionClasses",e[g].classes||"").mouseup(function(l){if(d._safemouseup){var o=b(this).data("index")!=d._selectedIndex();d.value(b(this).data("index"));d.select(l);o&&d.change(l);d.close(l,true)}return false}).click(function(){return false}).bind("mouseover focus",
+function(){d._selectedOptionLi().addClass(a);d._focusedOptionLi().removeClass(d.widgetBaseClass+"-item-focus ui-state-hover");b(this).removeClass("ui-state-active").addClass(d.widgetBaseClass+"-item-focus ui-state-hover")}).bind("mouseout blur",function(){b(this).is(d._selectedOptionLi().selector)&&b(this).addClass(a);b(this).removeClass(d.widgetBaseClass+"-item-focus ui-state-hover")});if(e[g].parentOptGroup){var i=d.widgetBaseClass+"-group-"+e[g].parentOptGroup.replace(/[^a-zA-Z0-9]/g,"");this.list.find("li."+
+i).size()?this.list.find("li."+i+":last ul").append(f):b('<li role="presentation" class="'+d.widgetBaseClass+"-group "+i+'"><span class="'+d.widgetBaseClass+'-group-label">'+e[g].parentOptGroup+"</span><ul></ul></li>").appendTo(this.list).find("ul").append(f)}else f.appendTo(this.list);this.list.bind("mousedown mouseup",function(){return false});if(h.icons)for(var k in h.icons)if(f.is(h.icons[k].find)){f.data("optionClasses",e[g].classes+" "+d.widgetBaseClass+"-hasIcon").addClass(d.widgetBaseClass+
+"-hasIcon");i=h.icons[k].icon||"";f.find("a:eq(0)").prepend('<span class="'+d.widgetBaseClass+"-item-icon ui-icon "+i+'"></span>');e[g].bgImage&&f.find("span").css("background-image",e[g].bgImage)}}this.list.find("li:last").addClass("ui-corner-bottom");h.style=="popup"&&this.list.find("li:first").addClass("ui-corner-top");if(h.transferClasses){k=this.element.attr("class")||"";this.newelement.add(this.list).addClass(k)}k=this.element.width();this.newelement.width(h.width?h.width:k);h.style=="dropdown"?
+this.list.width(h.menuWidth?h.menuWidth:h.width?h.width:k):this.list.width(h.menuWidth?h.menuWidth:h.width?h.width-h.handleWidth:k-h.handleWidth);if(h.maxHeight)h.maxHeight<this.list.height()&&this.list.height(h.maxHeight);else if(!h.format&&b(window).height()/3<this.list.height()){h.maxHeight=b(window).height()/3;this.list.height(h.maxHeight)}this._optionLis=this.list.find("li:not(."+d.widgetBaseClass+"-group)");this.list.keydown(function(l){var o=true;switch(l.keyCode){case b.ui.keyCode.UP:case b.ui.keyCode.LEFT:o=
+false;d._moveFocus(-1);break;case b.ui.keyCode.DOWN:case b.ui.keyCode.RIGHT:o=false;d._moveFocus(1);break;case b.ui.keyCode.HOME:o=false;d._moveFocus(":first");break;case b.ui.keyCode.PAGE_UP:o=false;d._scrollPage("up");break;case b.ui.keyCode.PAGE_DOWN:o=false;d._scrollPage("down");break;case b.ui.keyCode.END:o=false;d._moveFocus(":last");break;case b.ui.keyCode.ENTER:case b.ui.keyCode.SPACE:o=false;d.close(l,true);b(l.target).parents("li:eq(0)").trigger("mouseup");break;case b.ui.keyCode.TAB:o=
+true;d.close(l,true);break;case b.ui.keyCode.ESCAPE:o=false;d.close(l,true)}return o});if(h.style=="dropdown"){this.newelement.addClass(d.widgetBaseClass+"-dropdown");this.list.addClass(d.widgetBaseClass+"-menu-dropdown")}else{this.newelement.addClass(d.widgetBaseClass+"-popup");this.list.addClass(d.widgetBaseClass+"-menu-popup")}this.newelement.prepend('<span class="'+d.widgetBaseClass+'-status">'+e[this._selectedIndex()].text+"</span>");this.element.hide();this.element.attr("disabled")==true&&this.disable();
+this.value(this._selectedIndex());b(window).resize(function(){d._refreshPosition()})},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled").unbind("click");b("label[for="+this.newelement.attr("id")+"]").attr("for",this.element.attr("id")).unbind("click");this.newelement.remove();this.list.remove();this.element.show();b.Widget.prototype.destroy.apply(this,arguments)},_typeAhead:function(d,
+h){var g=this;if(!g._prevChar)g._prevChar=["",0];var e=String.fromCharCode(d);c=e.toLowerCase();var a=false;this.list.find("li a").each(function(f){if(!a){var i=b(this).text();if(i.indexOf(e)==0||i.indexOf(c)==0)if(g._prevChar[0]==e){if(g._prevChar[1]<f){a=true;b(this).trigger(h);g._prevChar[1]=f}}else{a=true;b(this).trigger(h);g._prevChar[1]=f}}});this._prevChar[0]=e},_uiHash:function(){var d=this.value();return{index:d,option:b("option",this.element).get(d),value:this.element[0].value}},open:function(d){if(this.newelement.attr("aria-disabled")!=
+"true"){this._refreshPosition();this._closeOthers(d);this.newelement.addClass("ui-state-active");this.list.appendTo("body").addClass(this.widgetBaseClass+"-open").attr("aria-hidden",false).find("li:not(."+this.widgetBaseClass+"-group):eq("+this._selectedIndex()+") a")[0].focus();this.options.style=="dropdown"&&this.newelement.removeClass("ui-corner-all").addClass("ui-corner-top");this._refreshPosition();this._trigger("open",d,this._uiHash())}},close:function(d,h){if(this.newelement.is(".ui-state-active")){this.newelement.removeClass("ui-state-active");
+this.list.attr("aria-hidden",true).removeClass(this.widgetBaseClass+"-open");this.options.style=="dropdown"&&this.newelement.removeClass("ui-corner-top").addClass("ui-corner-all");h&&this.newelement[0].focus();this._trigger("close",d,this._uiHash())}},change:function(d){this.element.trigger("change");this._trigger("change",d,this._uiHash())},select:function(d){this._trigger("select",d,this._uiHash())},_closeOthers:function(d){b("."+this.widgetBaseClass+".ui-state-active").not(this.newelement).each(function(){b(this).data("selectelement").selectmenu("close",
+d)});b("."+this.widgetBaseClass+".ui-state-hover").trigger("mouseout")},_toggle:function(d,h){this.list.is("."+this.widgetBaseClass+"-open")?this.close(d,h):this.open(d)},_formatText:function(d){return this.options.format?this.options.format(d):d},_selectedIndex:function(){return this.element[0].selectedIndex},_selectedOptionLi:function(){return this._optionLis.eq(this._selectedIndex())},_focusedOptionLi:function(){return this.list.find("."+this.widgetBaseClass+"-item-focus")},_moveSelection:function(d){return this._optionLis.eq(parseInt(this._selectedOptionLi().data("index"),
+10)+d).trigger("mouseup")},_moveFocus:function(d){d=isNaN(d)?parseInt(this._optionLis.filter(d).data("index"),10):parseInt(this._focusedOptionLi().data("index")||0,10)+d;if(d<0)d=0;if(d>this._optionLis.size()-1)d=this._optionLis.size()-1;var h=this.widgetBaseClass+"-item-"+Math.round(Math.random()*1E3);this._focusedOptionLi().find("a:eq(0)").attr("id","");this._optionLis.eq(d).find("a:eq(0)").attr("id",h).focus();this.list.attr("aria-activedescendant",h)},_scrollPage:function(d){var h=Math.floor(this.list.outerHeight()/
+this.list.find("li:first").outerHeight());h=d=="up"?-h:h;this._moveFocus(h)},_setOption:function(d,h){this.options[d]=h;if(d=="disabled"){this.close();this.element.add(this.newelement).add(this.list)[h?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",h)}},value:function(d){if(arguments.length){this.element[0].selectedIndex=d;this._refreshValue();this._refreshPosition()}return this.element[0].selectedIndex},_refreshValue:function(){var d=
+this.options.style=="popup"?" ui-state-active":"",h=this.widgetBaseClass+"-item-"+Math.round(Math.random()*1E3);this.list.find("."+this.widgetBaseClass+"-item-selected").removeClass(this.widgetBaseClass+"-item-selected"+d).find("a").attr("aria-selected","false").attr("id","");this._selectedOptionLi().addClass(this.widgetBaseClass+"-item-selected"+d).find("a").attr("aria-selected","true").attr("id",h);d=this.newelement.data("optionClasses")?this.newelement.data("optionClasses"):"";var g=this._selectedOptionLi().data("optionClasses")?
+this._selectedOptionLi().data("optionClasses"):"";this.newelement.removeClass(d).data("optionClasses",g).addClass(g).find("."+this.widgetBaseClass+"-status").html(this._selectedOptionLi().find("a:eq(0)").html());this.list.attr("aria-activedescendant",h)},_refreshPosition:function(){var d=this.options;if(d.style=="popup"&&!d.positionOptions.offset){var h=this.list.find("li:not(.ui-selectmenu-group):eq("+this._selectedIndex()+")");h="0 -"+(h.outerHeight()+h.offset().top-this.list.offset().top)}this.list.position({of:d.positionOptions.of||
+this.newelement,my:d.positionOptions.my,at:d.positionOptions.at,offset:d.positionOptions.offset||h})}})})(jQuery);
 (function(b){b.widget("ui.slider",b.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var d=this,h=this.options;this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");h.disabled&&this.element.addClass("ui-slider-disabled ui-disabled");
 this.range=b([]);if(h.range){if(h.range===true){this.range=b("<div></div>");if(!h.values)h.values=[this._valueMin(),this._valueMin()];if(h.values.length&&h.values.length!==2)h.values=[h.values[0],h.values[0]]}else this.range=b("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(h.range==="min"||h.range==="max")this.range.addClass("ui-slider-range-"+h.range);this.range.addClass("ui-widget-header")}b(".ui-slider-handle",this.element).length===0&&b("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");
 if(h.values&&h.values.length)for(;b(".ui-slider-handle",this.element).length<h.values.length;)b("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");this.handles=b(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){h.disabled||b(this).addClass("ui-state-hover")},function(){b(this).removeClass("ui-state-hover")}).focus(function(){if(h.disabled)b(this).blur();

data/templates/jrails/jquery.js

@@ -332,8 +332,11 @@ jQuery.fn = jQuery.prototype = {
 jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy, copyIsArray;
+	 var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
 
 	// Handle a deep copy situation
 	if ( typeof target === "boolean" ) {
@@ -435,18 +438,21 @@ jQuery.extend({
 			// If there are functions bound, to execute
 			if ( readyList ) {
 				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
+				var fn,
+					i = 0,
+					ready = readyList;
 
 				// Reset the list of functions
 				readyList = null;
-			}
 
-			// Trigger any bound ready events
-			if ( jQuery.fn.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
+				while ( (fn = ready[ i++ ]) ) {
+					fn.call( document, jQuery );
+				}
+
+				// Trigger any bound ready events
+				if ( jQuery.fn.trigger ) {
+					jQuery( document ).trigger( "ready" ).unbind( "ready" );
+				}
 			}
 		}
 	},
@@ -699,7 +705,8 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var i = first.length, j = 0;
+		var i = first.length,
+			j = 0;
 
 		if ( typeof second.length === "number" ) {
 			for ( var l = second.length; j < l; j++ ) {
@@ -968,6 +975,7 @@ return (window.jQuery = window.$ = jQuery);
 		optSelected: opt.selected,
 
 		// Will be defined later
+		deleteExpando: true,
 		optDisabled: false,
 		checkClone: false,
 		scriptEval: false,
@@ -998,6 +1006,15 @@ return (window.jQuery = window.$ = jQuery);
 		delete window[ id ];
 	}
 
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete script.test;
+
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
 	root.removeChild( script );
 
 	if ( div.attachEvent && div.fireEvent ) {
@@ -1090,20 +1107,6 @@ return (window.jQuery = window.$ = jQuery);
 	// release memory in IE
 	root = script = div = all = a = null;
 })();
-
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-
 })( jQuery );
 
 
@@ -1243,8 +1246,24 @@ jQuery.extend({
 
 jQuery.fn.extend({
 	data: function( key, value ) {
+		var data = null;
+
 		if ( typeof key === "undefined" ) {
-			return this.length ? jQuery.data( this[0] ) : null;
+			if ( this.length ) {
+				var attr = this[0].attributes, name;
+				data = jQuery.data( this[0] );
+
+				for ( var i = 0, l = attr.length; i < l; i++ ) {
+					name = attr[i].name;
+
+					if ( name.indexOf( "data-" ) === 0 ) {
+						name = name.substr( 5 );
+						dataAttr( this[0], name, data[ name ] );
+					}
+				}
+			}
+
+			return data;
 
 		} else if ( typeof key === "object" ) {
 			return this.each(function() {
@@ -1256,31 +1275,12 @@ jQuery.fn.extend({
 		parts[1] = parts[1] ? "." + parts[1] : "";
 
 		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
 
 			// Try to fetch any internally stored data first
 			if ( data === undefined && this.length ) {
 				data = jQuery.data( this[0], key );
-
-				// If nothing was found internally, try to fetch any
-				// data from the HTML5 data-* attribute
-				if ( data === undefined && this[0].nodeType === 1 ) {
-					data = this[0].getAttribute( "data-" + key );
-
-					if ( typeof data === "string" ) {
-						try {
-							data = data === "true" ? true :
-								data === "false" ? false :
-								data === "null" ? null :
-								!jQuery.isNaN( data ) ? parseFloat( data ) :
-								rbrace.test( data ) ? jQuery.parseJSON( data ) :
-								data;
-						} catch( e ) {}
-
-					} else {
-						data = undefined;
-					}
-				}
+				data = dataAttr( this[0], key, data );
 			}
 
 			return data === undefined && parts[1] ?
@@ -1289,7 +1289,8 @@ jQuery.fn.extend({
 
 		} else {
 			return this.each(function() {
-				var $this = jQuery( this ), args = [ parts[0], value ];
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
 
 				$this.triggerHandler( "setData" + parts[1] + "!", args );
 				jQuery.data( this, key, value );
@@ -1305,6 +1306,33 @@ jQuery.fn.extend({
 	}
 });
 
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		data = elem.getAttribute( "data-" + key );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
 })( jQuery );
 
 
@@ -1337,7 +1365,8 @@ jQuery.extend({
 	dequeue: function( elem, type ) {
 		type = type || "fx";
 
-		var queue = jQuery.queue( elem, type ), fn = queue.shift();
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift();
 
 		// If the fx queue is dequeued, always remove the progress sentinel
 		if ( fn === "inprogress" ) {
@@ -1415,6 +1444,19 @@ var rclass = /[\n\t]/g,
 	rclickable = /^a(?:rea)?$/i,
 	rradiocheck = /^(?:radio|checkbox)$/i;
 
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+
 jQuery.fn.extend({
 	attr: function( name, value ) {
 		return jQuery.access( this, name, value, true, jQuery.attr );
@@ -1448,7 +1490,9 @@ jQuery.fn.extend({
 						elem.className = value;
 
 					} else {
-						var className = " " + elem.className + " ", setClass = elem.className;
+						var className = " " + elem.className + " ",
+							setClass = elem.className;
+
 						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
 							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
 								setClass += " " + classNames[c];
@@ -1496,7 +1540,8 @@ jQuery.fn.extend({
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value, isBool = typeof stateVal === "boolean";
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
 
 		if ( jQuery.isFunction( value ) ) {
 			return this.each(function(i) {
@@ -1508,7 +1553,9 @@ jQuery.fn.extend({
 		return this.each(function() {
 			if ( type === "string" ) {
 				// toggle individual class names
-				var className, i = 0, self = jQuery(this),
+				var className,
+					i = 0,
+					self = jQuery( this ),
 					state = stateVal,
 					classNames = value.split( rspaces );
 
@@ -1677,91 +1724,88 @@ jQuery.extend({
 		// Try to normalize/fix the name
 		name = notxml && jQuery.props[ name ] || name;
 
-		// Only do all the following if this is a node (faster for style)
-		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
-
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				var parent = elem.parentNode;
-				if ( parent ) {
-					parent.selectedIndex;
-	
-					// Make sure that it also works with optgroups, see #5701
-					if ( parent.parentNode ) {
-						parent.parentNode.selectedIndex;
-					}
-				}
-			}
+		// These attributes require special treatment
+		var special = rspecialurl.test( name );
 
-			// If applicable, access the attribute via the DOM 0 way
-			// 'in' checks fail in Blackberry 4.7 #6931
-			if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
-					}
+		// Safari mis-reports the default selected property of an option
+		// Accessing the parent's selectedIndex property fixes it
+		if ( name === "selected" && !jQuery.support.optSelected ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
 
-					if ( value === null ) {
-						if ( elem.nodeType === 1 ) {
-							elem.removeAttribute( name );
-						}
-
-					} else {
-						elem[ name ] = value;
-					}
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
 				}
+			}
+		}
 
-				// 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;
+		// If applicable, access the attribute via the DOM 0 way
+		// 'in' checks fail in Blackberry 4.7 #6931
+		if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
+			if ( set ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
 				}
 
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
+				if ( value === null ) {
+					if ( elem.nodeType === 1 ) {
+						elem.removeAttribute( name );
+					}
 
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
+				} else {
+					elem[ name ] = value;
 				}
+			}
 
-				return elem[ name ];
+			// 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;
 			}
 
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + value;
-				}
+			// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+			// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+			if ( name === "tabIndex" ) {
+				var attributeNode = elem.getAttributeNode( "tabIndex" );
 
-				return elem.style.cssText;
+				return attributeNode && attributeNode.specified ?
+					attributeNode.value :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
 			}
 
+			return elem[ name ];
+		}
+
+		if ( !jQuery.support.style && notxml && name === "style" ) {
 			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
+				elem.style.cssText = "" + value;
 			}
 
-			// Ensure that missing attributes return undefined
-			// Blackberry 4.7 returns "" from getAttribute #6938
-			if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
-				return undefined;
-			}
+			return elem.style.cssText;
+		}
 
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
+		if ( set ) {
+			// convert the value to a string (all browsers do this but IE) see #1070
+			elem.setAttribute( name, "" + value );
+		}
 
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
+		// Ensure that missing attributes return undefined
+		// Blackberry 4.7 returns "" from getAttribute #6938
+		if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
+			return undefined;
 		}
+
+		var attr = !jQuery.support.hrefNormalized && notxml && special ?
+				// Some attributes require a special call on IE
+				elem.getAttribute( name, 2 ) :
+				elem.getAttribute( name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return attr === null ? undefined : attr;
 	}
 });
 
@@ -1802,6 +1846,9 @@ jQuery.event = {
 
 		if ( handler === false ) {
 			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+		  return;
 		}
 
 		var handleObjIn, handleObj;
@@ -2145,8 +2192,10 @@ jQuery.event = {
 			jQuery.event.trigger( event, data, parent, true );
 
 		} else if ( !event.isDefaultPrevented() ) {
-			var target = event.target, old, targetType = type.replace(rnamespaces, ""),
-				isClick = jQuery.nodeName(target, "a") && targetType === "click",
+			var old,
+				target = event.target,
+				targetType = type.replace( rnamespaces, "" ),
+				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
 				special = jQuery.event.special[ targetType ] || {};
 
 			if ( (!special._default || special._default.call( elem, event ) === false) && 
@@ -2178,7 +2227,9 @@ jQuery.event = {
 	},
 
 	handle: function( event ) {
-		var all, handlers, namespaces, namespace_sort = [], namespace_re, events, args = jQuery.makeArray( arguments );
+		var all, handlers, namespaces, namespace_re, events,
+			namespace_sort = [],
+			args = jQuery.makeArray( arguments );
 
 		event = args[0] = jQuery.event.fix( event || window.event );
 		event.currentTarget = this;
@@ -2257,7 +2308,8 @@ jQuery.event = {
 
 		// Fix target property, if necessary
 		if ( !event.target ) {
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
 		}
 
 		// check if target is a textnode (safari)
@@ -2272,7 +2324,9 @@ jQuery.event = {
 
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
+			var doc = document.documentElement,
+				body = document.body;
+
 			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
 			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
 		}
@@ -2478,7 +2532,8 @@ if ( !jQuery.support.submitBubbles ) {
 		setup: function( data, namespaces ) {
 			if ( this.nodeName.toLowerCase() !== "form" ) {
 				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
+					var elem = e.target,
+						type = elem.type;
 
 					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
 						e.liveFired = undefined;
@@ -2487,7 +2542,8 @@ if ( !jQuery.support.submitBubbles ) {
 				});
 	 
 				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
+					var elem = e.target,
+						type = elem.type;
 
 					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
 						e.liveFired = undefined;
@@ -2728,7 +2784,8 @@ jQuery.fn.extend({
 
 	toggle: function( fn ) {
 		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
+		var args = arguments,
+			i = 1;
 
 		// link all the functions, so any of them can unbind this click handler
 		while ( i < args.length ) {
@@ -2823,8 +2880,9 @@ jQuery.each(["live", "die"], function( i, name ) {
 });
 
 function liveHandler( event ) {
-	var stop, maxLevel, elems = [], selectors = [],
-		related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
 		events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
 
 	if ( typeof events === "function" ) {
@@ -2835,7 +2893,7 @@ function liveHandler( event ) {
 	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
 		return;
 	}
-
+	
 	if ( event.namespace ) {
 		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
 	}
@@ -2899,6 +2957,9 @@ function liveHandler( event ) {
 			if ( ret === false ) {
 				stop = false;
 			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
 		}
 	}
 
@@ -4287,7 +4348,8 @@ var runtil = /Until$/,
 
 jQuery.fn.extend({
 	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0;
+		var ret = this.pushStack( "", "find", selector ),
+			length = 0;
 
 		for ( var i = 0, l = this.length; i < l; i++ ) {
 			length = ret.length;
@@ -4336,7 +4398,9 @@ jQuery.fn.extend({
 		var ret = [], i, l, cur = this[0];
 
 		if ( jQuery.isArray( selectors ) ) {
-			var match, matches = {}, selector, level = 1;
+			var match, selector,
+				matches = {},
+				level = 1;
 
 			if ( cur && selectors.length ) {
 				for ( i = 0, l = selectors.length; i < l; i++ ) {
@@ -4502,7 +4566,9 @@ jQuery.extend({
 	},
 	
 	dir: function( elem, dir, until ) {
-		var matched = [], cur = elem[dir];
+		var matched = [],
+			cur = elem[ dir ];
+
 		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
 			if ( cur.nodeType === 1 ) {
 				matched.push( cur );
@@ -4580,7 +4646,8 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rtbody = /<tbody/i,
 	rhtml = /<|&#?\w+;/,
 	rnocache = /<(?:script|object|embed|option|style)/i,
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
+	// checked="checked" or checked (html5)
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
 	raction = /\=([^="'>\s]+\/)>/g,
 	wrapMap = {
 		option: [ 1, "<select multiple='multiple'>", "</select>" ],
@@ -4606,7 +4673,8 @@ jQuery.fn.extend({
 	text: function( text ) {
 		if ( jQuery.isFunction(text) ) {
 			return this.each(function(i) {
-				var self = jQuery(this);
+				var self = jQuery( this );
+
 				self.text( text.call(this, i, self.text()) );
 			});
 		}
@@ -4655,7 +4723,8 @@ jQuery.fn.extend({
 		}
 
 		return this.each(function() {
-			var self = jQuery( this ), contents = self.contents();
+			var self = jQuery( this ),
+				contents = self.contents();
 
 			if ( contents.length ) {
 				contents.wrapAll( html );
@@ -4766,7 +4835,9 @@ jQuery.fn.extend({
 				// attributes in IE that are actually only stored
 				// as properties will not be copied (such as the
 				// the name attribute on an input).
-				var html = this.outerHTML, ownerDocument = this.ownerDocument;
+				var html = this.outerHTML,
+					ownerDocument = this.ownerDocument;
+
 				if ( !html ) {
 					var div = ownerDocument.createElement("div");
 					div.appendChild( this.cloneNode(true) );
@@ -4821,7 +4892,8 @@ jQuery.fn.extend({
 
 		} else if ( jQuery.isFunction( value ) ) {
 			this.each(function(i){
-				var self = jQuery(this);
+				var self = jQuery( this );
+
 				self.html( value.call(this, i, self.html()) );
 			});
 
@@ -4844,13 +4916,14 @@ jQuery.fn.extend({
 			}
 
 			if ( typeof value !== "string" ) {
-				value = jQuery(value).detach();
+				value = jQuery( value ).detach();
 			}
 
 			return this.each(function() {
-				var next = this.nextSibling, parent = this.parentNode;
+				var next = this.nextSibling,
+					parent = this.parentNode;
 
-				jQuery(this).remove();
+				jQuery( this ).remove();
 
 				if ( next ) {
 					jQuery(next).before( value );
@@ -4868,7 +4941,9 @@ jQuery.fn.extend({
 	},
 
 	domManip: function( args, table, callback ) {
-		var results, first, value = args[0], scripts = [], fragment, parent;
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
 
 		// We can't cloneNode fragments that contain checked, in WebKit
 		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
@@ -4943,7 +5018,9 @@ function cloneCopyEvent(orig, ret) {
 			return;
 		}
 
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
+		var oldData = jQuery.data( orig[i++] ),
+			curData = jQuery.data( this, oldData ),
+			events = oldData && oldData.events;
 
 		if ( events ) {
 			delete curData.handle;
@@ -5000,7 +5077,8 @@ jQuery.each({
 	replaceAll: "replaceWith"
 }, function( name, original ) {
 	jQuery.fn[ name ] = function( selector ) {
-		var ret = [], insert = jQuery( selector ),
+		var ret = [],
+			insert = jQuery( selector ),
 			parent = this.length === 1 && this[0].parentNode;
 		
 		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
@@ -5186,8 +5264,8 @@ var ralpha = /alpha\([^)]*\)/i,
 	cssHeight = [ "Top", "Bottom" ],
 	curCSS,
 
-	// cache check for defaultView.getComputedStyle
-	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
+	getComputedStyle,
+	currentStyle,
 
 	fcamelCase = function( all, letter ) {
 		return letter.toUpperCase();
@@ -5343,7 +5421,29 @@ jQuery.each(["height", "width"], function( i, name ) {
 					});
 				}
 
-				return val + "px";
+				if ( val <= 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val === "0px" && currentStyle ) {
+						val = currentStyle( elem, name, name );
+					}
+
+					if ( val != null ) {
+						// Should return "auto" instead of 0, use 0 for
+						// temporary backwards-compat
+						return val === "" || val === "auto" ? "0px" : val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					val = elem.style[ name ];
+
+					// Should return "auto" instead of 0, use 0 for
+					// temporary backwards-compat
+					return val === "" || val === "auto" ? "0px" : val;
+				}
+
+				return typeof val === "string" ? val : val + "px";
 			}
 		},
 
@@ -5392,8 +5492,8 @@ if ( !jQuery.support.opacity ) {
 	};
 }
 
-if ( getComputedStyle ) {
-	curCSS = function( elem, newName, name ) {
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, newName, name ) {
 		var ret, defaultView, computedStyle;
 
 		name = name.replace( rupper, "-$1" ).toLowerCase();
@@ -5411,10 +5511,13 @@ if ( getComputedStyle ) {
 
 		return ret;
 	};
+}
 
-} else if ( document.documentElement.currentStyle ) {
-	curCSS = function( elem, name ) {
-		var left, rsLeft, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style;
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left, rsLeft,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			style = elem.style;
 
 		// From the awesome hack by Dean Edwards
 		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
@@ -5436,10 +5539,12 @@ if ( getComputedStyle ) {
 			elem.runtimeStyle.left = rsLeft;
 		}
 
-		return ret;
+		return ret === "" ? "auto" : ret;
 	};
 }
 
+curCSS = getComputedStyle || currentStyle;
+
 function getWH( elem, name, extra ) {
 	var which = name === "width" ? cssWidth : cssHeight,
 		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
@@ -5466,7 +5571,8 @@ function getWH( elem, name, extra ) {
 
 if ( jQuery.expr && jQuery.expr.filters ) {
 	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth, height = elem.offsetHeight;
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
 
 		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
 	};
@@ -5485,7 +5591,7 @@ var jsc = jQuery.now(),
 	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
 	rselectTextarea = /^(?:select|textarea)/i,
 	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	rnoContent = /^(?:GET|HEAD|DELETE)$/,
+	rnoContent = /^(?:GET|HEAD)$/,
 	rbracket = /\[\]$/,
 	jsre = /\=\?(&|$)/,
 	rquery = /\?/,
@@ -5720,10 +5826,6 @@ jQuery.extend({
 			var customJsonp = window[ jsonp ];
 
 			window[ jsonp ] = function( tmp ) {
-				data = tmp;
-				jQuery.handleSuccess( s, xhr, status, data );
-				jQuery.handleComplete( s, xhr, status, data );
-
 				if ( jQuery.isFunction( customJsonp ) ) {
 					customJsonp( tmp );
 
@@ -5735,6 +5837,10 @@ jQuery.extend({
 						delete window[ jsonp ];
 					} catch( jsonpError ) {}
 				}
+
+				data = tmp;
+				jQuery.handleSuccess( s, xhr, status, data );
+				jQuery.handleComplete( s, xhr, status, data );
 				
 				if ( head ) {
 					head.removeChild( script );
@@ -5746,7 +5852,7 @@ jQuery.extend({
 			s.cache = false;
 		}
 
-		if ( s.cache === false && type === "GET" ) {
+		if ( s.cache === false && noContent ) {
 			var ts = jQuery.now();
 
 			// try replacing _= if it is there
@@ -5756,8 +5862,8 @@ jQuery.extend({
 			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
 		}
 
-		// If data is available, append data to url for get requests
-		if ( s.data && type === "GET" ) {
+		// If data is available, append data to url for GET/HEAD requests
+		if ( s.data && noContent ) {
 			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
 		}
 
@@ -5768,7 +5874,7 @@ jQuery.extend({
 
 		// Matches an absolute URL, and saves the domain
 		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
+			remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
 
 		// If we're requesting a remote document
 		// and trying to load JSON or Script with a GET
@@ -5944,10 +6050,11 @@ jQuery.extend({
 		try {
 			var oldAbort = xhr.abort;
 			xhr.abort = function() {
-				// xhr.abort in IE7 is not a native JS function
-				// and does not have a call property
-				if ( xhr && oldAbort.call ) {
-					oldAbort.call( xhr );
+				if ( xhr ) {
+					// oldAbort has no call property in IE7 so
+					// just do it this way, which works in all
+					// browsers
+					Function.prototype.call.call( oldAbort, xhr );
 				}
 
 				onreadystatechange( "abort" );
@@ -5987,11 +6094,12 @@ jQuery.extend({
 	// Serialize an array of form elements or a set of
 	// key/values into a query string
 	param: function( a, traditional ) {
-		var s = [], add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction(value) ? value() : value;
-			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-		};
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction(value) ? value() : value;
+				s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+			};
 		
 		// Set traditional to true for jQuery <= 1.3.2 behavior.
 		if ( traditional === undefined ) {
@@ -6215,28 +6323,39 @@ var elemdisplay = {},
 
 jQuery.fn.extend({
 	show: function( speed, easing, callback ) {
+		var elem, display;
+
 		if ( speed || speed === 0 ) {
 			return this.animate( genFx("show", 3), speed, easing, callback);
+
 		} else {
 			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
 				// Reset the inline display of this element to learn if it is
 				// being hidden by cascaded rules or not
-				if ( !jQuery.data(this[i], "olddisplay") && this[i].style.display === "none" ) {
-					this[i].style.display = "";
+				if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
+					display = elem.style.display = "";
 				}
 
 				// Set elements which have been overridden with display: none
 				// in a stylesheet to whatever the default browser style is
 				// for such an element
-				if ( this[i].style.display === "" && jQuery.css( this[i], "display" ) === "none" ) {
-					jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
+				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+					jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
 				}
 			}
 
 			// Set the display of most of the elements in a second loop
 			// to avoid the constant reflow
 			for ( i = 0; i < j; i++ ) {
-				this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
+				elem = this[i];
+				display = elem.style.display;
+
+				if ( display === "" || display === "none" ) {
+					elem.style.display = jQuery.data(elem, "olddisplay") || "";
+				}
 			}
 
 			return this;
@@ -6301,7 +6420,7 @@ jQuery.fn.extend({
 		}
 
 		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			// XXX ‘this’ does not always have a nodeName when running the
+			// XXX 'this' does not always have a nodeName when running the
 			// test suite
 
 			var opt = jQuery.extend({}, optall), p,
@@ -6374,7 +6493,7 @@ jQuery.fn.extend({
 
 				} else {
 					var parts = rfxnum.exec(val),
-						start = e.cur(true) || 0;
+						start = e.cur() || 0;
 
 					if ( parts ) {
 						var end = parseFloat( parts[2] ),
@@ -6383,7 +6502,7 @@ jQuery.fn.extend({
 						// We need to compute starting value
 						if ( unit !== "px" ) {
 							jQuery.style( self, name, (end || 1) + unit);
-							start = ((end || 1) / e.cur(true)) * start;
+							start = ((end || 1) / e.cur()) * start;
 							jQuery.style( self, name, start + unit);
 						}
 
@@ -6452,7 +6571,8 @@ jQuery.each({
 	slideUp: genFx("hide", 1),
 	slideToggle: genFx("toggle", 1),
 	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" }
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
 }, function( name, props ) {
 	jQuery.fn[ name ] = function( speed, easing, callback ) {
 		return this.animate( props, speed, easing, callback );
@@ -6530,6 +6650,9 @@ jQuery.fx.prototype = {
 
 	// Start an animation from one number to another
 	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
 		this.startTime = jQuery.now();
 		this.start = from;
 		this.end = to;
@@ -6537,7 +6660,6 @@ jQuery.fx.prototype = {
 		this.now = this.start;
 		this.pos = this.state = 0;
 
-		var self = this, fx = jQuery.fx;
 		function t( gotoEnd ) {
 			return self.step(gotoEnd);
 		}
@@ -6594,7 +6716,9 @@ jQuery.fx.prototype = {
 			if ( done ) {
 				// Reset the overflow
 				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-					var elem = this.elem, options = this.options;
+					var elem = this.elem,
+						options = this.options;
+
 					jQuery.each( [ "", "X", "Y" ], function (index, value) {
 						elem.style[ "overflow" + value ] = options.overflow[index];
 					} );
@@ -6775,11 +6899,16 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 
 		jQuery.offset.initialize();
 
-		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
-			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
-			body = doc.body, defaultView = doc.defaultView,
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
 			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop, left = elem.offsetLeft;
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
 
 		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
 			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
@@ -6861,7 +6990,8 @@ jQuery.offset = {
 	},
 
 	bodyOffset: function( body ) {
-		var top = body.offsetTop, left = body.offsetLeft;
+		var top = body.offsetTop,
+			left = body.offsetLeft;
 
 		jQuery.offset.initialize();
 
@@ -7044,27 +7174,31 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 			});
 		}
 
-		return jQuery.isWindow( elem ) ?
+		if ( jQuery.isWindow( elem ) ) {
 			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-			elem.document.body[ "client" + name ] :
-
-			// Get document width or height
-			(elem.nodeType === 9) ? // is it a document
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					elem.documentElement["client" + name],
-					elem.body["scroll" + name], elem.documentElement["scroll" + name],
-					elem.body["offset" + name], elem.documentElement["offset" + name]
-				) :
-
-				// Get or set width or height on the element
-				size === undefined ?
-					// Get width or height on the element
-					parseFloat( jQuery.css( elem, type ) ) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, typeof size === "string" ? size : size + "px" );
+			return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
+				elem.document.body[ "client" + name ];
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
 	};
 
 });