compass-jquery-plugin 0.3.2.pre.2 → 0.3.2.0

data/templates/jquery/jquery/ui/_theme.scss

@@ -1,7 +1,7 @@
 /*
- * jQuery UI CSS Framework 1.8.7
+ * jQuery UI CSS Framework 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -83,9 +83,9 @@
 
 
 /*
- * jQuery UI Accordion 1.8.7
+ * jQuery UI Accordion 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -137,9 +137,9 @@
 
 
 /*
- * jQuery UI Autocomplete 1.8.7
+ * jQuery UI Autocomplete 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -156,7 +156,7 @@
 /* without this, the menu expands to 100% in IE6 */
 
 /*
- * jQuery UI Menu 1.8.7
+ * jQuery UI Menu 1.8.9
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -196,9 +196,9 @@
 
 
 /*
- * jQuery UI Button 1.8.7
+ * jQuery UI Button 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -292,9 +292,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Datepicker 1.8.7
+ * jQuery UI Datepicker 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -491,9 +491,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Dialog 1.8.7
+ * jQuery UI Dialog 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -506,12 +506,12 @@ button.ui-button::-moz-focus-inner {
   overflow: hidden; }
 
 .ui-dialog .ui-dialog-titlebar {
-  padding: .5em 1em .3em;
+  padding: .4em 1em;
   position: relative; }
 
 .ui-dialog .ui-dialog-title {
   float: left;
-  margin: .1em 16px .2em 0; }
+  margin: .1em 16px .1em 0; }
 
 .ui-dialog .ui-dialog-titlebar-close {
   position: absolute;
@@ -627,9 +627,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Progressbar 1.8.7
+ * jQuery UI Progressbar 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -645,9 +645,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Resizable 1.8.7
+ * jQuery UI Resizable 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -723,9 +723,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Selectable 1.8.7
+ * jQuery UI Selectable 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -835,9 +835,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Slider 1.8.7
+ * jQuery UI Slider 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -900,9 +900,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
- * jQuery UI Tabs 1.8.7
+ * jQuery UI Tabs 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -955,9 +955,9 @@ button.ui-button::-moz-focus-inner {
 
 
 /*
-* jQuery UI CSS Framework 1.8.7
+* jQuery UI CSS Framework 1.8.9
 *
-* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
 *

data/templates/jquery/json.js

@@ -0,0 +1,7 @@
+if(!this.JSON)this.JSON={};
+(function(){function k(a){return a<10?"0"+a:a}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+k(this.getUTCMonth()+1)+"-"+k(this.getUTCDate())+"T"+k(this.getUTCHours())+":"+k(this.getUTCMinutes())+":"+k(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()}}var n=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,o=
+/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,f,l,q={"\u0008":"\\b","\t":"\\t","\n":"\\n","\u000c":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},i;function p(a){o.lastIndex=0;return o.test(a)?'"'+a.replace(o,function(c){var d=q[c];return typeof d==="string"?d:"\\u"+("0000"+c.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function m(a,c){var d,g,j=f,e,b=c[a];if(b&&typeof b==="object"&&typeof b.toJSON==="function")b=b.toJSON(a);
+if(typeof i==="function")b=i.call(c,a,b);switch(typeof b){case "string":return p(b);case "number":return isFinite(b)?String(b):"null";case "boolean":case "null":return String(b);case "object":if(!b)return"null";f+=l;e=[];if(Object.prototype.toString.apply(b)==="[object Array]"){g=b.length;for(a=0;a<g;a+=1)e[a]=m(a,b)||"null";c=e.length===0?"[]":f?"[\n"+f+e.join(",\n"+f)+"\n"+j+"]":"["+e.join(",")+"]";f=j;return c}if(i&&typeof i==="object"){g=i.length;for(a=0;a<g;a+=1){d=i[a];if(typeof d==="string")if(c=
+m(d,b))e.push(p(d)+(f?": ":":")+c)}}else for(d in b)if(Object.hasOwnProperty.call(b,d))if(c=m(d,b))e.push(p(d)+(f?": ":":")+c);c=e.length===0?"{}":f?"{\n"+f+e.join(",\n"+f)+"\n"+j+"}":"{"+e.join(",")+"}";f=j;return c}}if(typeof JSON.stringify!=="function")JSON.stringify=function(a,c,d){var g;l=f="";if(typeof d==="number")for(g=0;g<d;g+=1)l+=" ";else if(typeof d==="string")l=d;if((i=c)&&typeof c!=="function"&&(typeof c!=="object"||typeof c.length!=="number"))throw new Error("JSON.stringify");return m("",
+{"":a})};if(typeof JSON.parse!=="function")JSON.parse=function(a,c){function d(g,j){var e,b,h=g[j];if(h&&typeof h==="object")for(e in h)if(Object.hasOwnProperty.call(h,e)){b=d(h,e);if(b!==undefined)h[e]=b;else delete h[e]}return c.call(g,j,h)}a=String(a);n.lastIndex=0;if(n.test(a))a=a.replace(n,function(g){return"\\u"+("0000"+g.charCodeAt(0).toString(16)).slice(-4)});if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){a=eval("("+a+")");return typeof c==="function"?d({"":a},""):a}throw new SyntaxError("JSON.parse");}})();

data/templates/jquery/json.min.js

@@ -0,0 +1,7 @@
+if(!this.JSON)this.JSON={};
+(function(){function k(a){return a<10?"0"+a:a}function n(a){o.lastIndex=0;return o.test(a)?'"'+a.replace(o,function(c){var d=q[c];return typeof d==="string"?d:"\\u"+("0000"+c.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function l(a,c){var d,f,i=g,e,b=c[a];if(b&&typeof b==="object"&&typeof b.toJSON==="function")b=b.toJSON(a);if(typeof j==="function")b=j.call(c,a,b);switch(typeof b){case "string":return n(b);case "number":return isFinite(b)?String(b):"null";case "boolean":case "null":return String(b);case "object":if(!b)return"null";
+g+=m;e=[];if(Object.prototype.toString.apply(b)==="[object Array]"){f=b.length;for(a=0;a<f;a+=1)e[a]=l(a,b)||"null";c=e.length===0?"[]":g?"[\n"+g+e.join(",\n"+g)+"\n"+i+"]":"["+e.join(",")+"]";g=i;return c}if(j&&typeof j==="object"){f=j.length;for(a=0;a<f;a+=1){d=j[a];if(typeof d==="string")if(c=l(d,b))e.push(n(d)+(g?": ":":")+c)}}else for(d in b)if(Object.hasOwnProperty.call(b,d))if(c=l(d,b))e.push(n(d)+(g?": ":":")+c);c=e.length===0?"{}":g?"{\n"+g+e.join(",\n"+g)+"\n"+i+"}":"{"+e.join(",")+"}";
+g=i;return c}}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+k(this.getUTCMonth()+1)+"-"+k(this.getUTCDate())+"T"+k(this.getUTCHours())+":"+k(this.getUTCMinutes())+":"+k(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()}}var p=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+o=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,g,m,q={"":"\\b","\t":"\\t","\n":"\\n","":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},j;if(typeof JSON.stringify!=="function")JSON.stringify=function(a,c,d){var f;m=g="";if(typeof d==="number")for(f=0;f<d;f+=1)m+=" ";else if(typeof d==="string")m=d;if((j=c)&&typeof c!=="function"&&(typeof c!=="object"||typeof c.length!=="number"))throw Error("JSON.stringify");return l("",{"":a})};
+if(typeof JSON.parse!=="function")JSON.parse=function(a,c){function d(f,i){var e,b,h=f[i];if(h&&typeof h==="object")for(e in h)if(Object.hasOwnProperty.call(h,e)){b=d(h,e);if(b!==undefined)h[e]=b;else delete h[e]}return c.call(f,i,h)}a=String(a);p.lastIndex=0;if(p.test(a))a=a.replace(p,function(f){return"\\u"+("0000"+f.charCodeAt(0).toString(16)).slice(-4)});if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){a=eval("("+a+")");return typeof c==="function"?d({"":a},""):a}throw new SyntaxError("JSON.parse");}})();

data/templates/jquery/manifest.rb

@@ -28,8 +28,10 @@ javascript 'jquery.hotkeys.js'
 javascript 'jquery.hotkeys.min.js'
 javascript 'jquery.layout.js'
 javascript 'jquery.layout.min.js'
-javascript 'jquery.metadata.js'
-javascript 'jquery.metadata.min.js'
+javascript 'jquery.mousewheel.js'
+javascript 'jquery.mousewheel.min.js'
+javascript 'jquery.offline.js'
+javascript 'jquery.offline.min.js'
 javascript 'jquery.pngFix.js'
 javascript 'jquery.pngFix.min.js'
 javascript 'jquery.themeswitchertool.js'
@@ -38,6 +40,8 @@ javascript 'jquery.tmpl.js'
 javascript 'jquery.tmpl.min.js'
 javascript 'jquery.tmplPlus.js'
 javascript 'jquery.tmplPlus.min.js'
+javascript 'json.js'
+javascript 'json.min.js'
 image 'jquery/ui/contextMenu/cut.png'
 image 'jquery/ui/contextMenu/door.png'
 image 'jquery/ui/contextMenu/page_white_copy.png'
@@ -79,6 +83,8 @@ javascript 'jquery-ui.js'
 javascript 'jquery-ui.min.js'
 javascript 'i18n/jquery.ui/datepicker-af.js'
 javascript 'i18n/jquery.ui/datepicker-af.min.js'
+javascript 'i18n/jquery.ui/datepicker-ar-DZ.js'
+javascript 'i18n/jquery.ui/datepicker-ar-DZ.min.js'
 javascript 'i18n/jquery.ui/datepicker-ar.js'
 javascript 'i18n/jquery.ui/datepicker-ar.min.js'
 javascript 'i18n/jquery.ui/datepicker-az.js'
@@ -97,8 +103,12 @@ javascript 'i18n/jquery.ui/datepicker-de.js'
 javascript 'i18n/jquery.ui/datepicker-de.min.js'
 javascript 'i18n/jquery.ui/datepicker-el.js'
 javascript 'i18n/jquery.ui/datepicker-el.min.js'
+javascript 'i18n/jquery.ui/datepicker-en-AU.js'
+javascript 'i18n/jquery.ui/datepicker-en-AU.min.js'
 javascript 'i18n/jquery.ui/datepicker-en-GB.js'
 javascript 'i18n/jquery.ui/datepicker-en-GB.min.js'
+javascript 'i18n/jquery.ui/datepicker-en-NZ.js'
+javascript 'i18n/jquery.ui/datepicker-en-NZ.min.js'
 javascript 'i18n/jquery.ui/datepicker-eo.js'
 javascript 'i18n/jquery.ui/datepicker-eo.min.js'
 javascript 'i18n/jquery.ui/datepicker-es.js'
@@ -143,6 +153,8 @@ javascript 'i18n/jquery.ui/datepicker-lt.js'
 javascript 'i18n/jquery.ui/datepicker-lt.min.js'
 javascript 'i18n/jquery.ui/datepicker-lv.js'
 javascript 'i18n/jquery.ui/datepicker-lv.min.js'
+javascript 'i18n/jquery.ui/datepicker-ml.js'
+javascript 'i18n/jquery.ui/datepicker-ml.min.js'
 javascript 'i18n/jquery.ui/datepicker-ms.js'
 javascript 'i18n/jquery.ui/datepicker-ms.min.js'
 javascript 'i18n/jquery.ui/datepicker-nl.js'

data/templates/mobile/jquery.mobile.js

@@ -1,7 +1,7 @@
 /*!
- * jQuery UI Widget @VERSION
+ * jQuery UI Widget 1.8.9
  *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -96,15 +96,19 @@ $.widget.bridge = function( name, object ) {
 
 		if ( isMethodCall ) {
 			this.each(function() {
-				var instance = $.data( this, name );
-				if ( !instance ) {
-					throw "cannot call methods on " + name + " prior to initialization; " +
-						"attempted to call method '" + options + "'";
-				}
-				if ( !$.isFunction( instance[options] ) ) {
-					throw "no such method '" + options + "' for " + name + " widget instance";
-				}
-				var methodValue = instance[ options ].apply( instance, args );
+				var instance = $.data( this, name ),
+					methodValue = instance && $.isFunction( instance[options] ) ?
+						instance[ options ].apply( instance, args ) :
+						instance;
+				// TODO: add this back in 1.9 and use $.error() (see #5972)
+//				if ( !instance ) {
+//					throw "cannot call methods on " + name + " prior to initialization; " +
+//						"attempted to call method '" + options + "'";
+//				}
+//				if ( !$.isFunction( instance[options] ) ) {
+//					throw "no such method '" + options + "' for " + name + " widget instance";
+//				}
+//				var methodValue = instance[ options ].apply( instance, args );
 				if ( methodValue !== instance && methodValue !== undefined ) {
 					returnValue = methodValue;
 					return false;
@@ -158,11 +162,7 @@ $.Widget.prototype = {
 		this._init();
 	},
 	_getCreateOptions: function() {
-		var options = {};
-		if ( $.metadata ) {
-			options = $.metadata.get( element )[ this.widgetName ];
-		}
-		return options;
+		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
 	},
 	_create: function() {},
 	_init: function() {},
@@ -319,9 +319,17 @@ $.mobile.media = (function() {
 
 	return function( query ) {
 		if ( !( query in cache ) ) {
-			var styleBlock = $( "<style type='text/css'>" +
-				"@media " + query + "{#jquery-mediatest{position:absolute;}}" +
-				"</style>" );
+			var styleBlock = document.createElement('style'),
+        		cssrule = "@media " + query + " { #jquery-mediatest { position:absolute; } }";
+	        //must set type for IE!	
+	        styleBlock.type = "text/css";
+	        if (styleBlock.styleSheet){ 
+	          styleBlock.styleSheet.cssText = cssrule;
+	        } 
+	        else {
+	          styleBlock.appendChild(document.createTextNode(cssrule));
+	        } 
+				
 			$html.prepend( fakeBody ).prepend( styleBlock );
 			cache[ query ] = testDiv.css( "position" ) === "absolute";
 			fakeBody.add( styleBlock ).remove();
@@ -388,11 +396,26 @@ $(document).bind("mobileinit.htmlclass", function(){
 		//add orientation class to HTML element on flip/resize.
 		if(event.orientation){
 			$html.removeClass( "portrait landscape" ).addClass( event.orientation );
+			//Set the min-height to the size of the fullscreen.  This is to fix issue #455
+			if( event.orientation === 'portrait' ) {
+			    $( '.ui-page' ).css( 'minHeight', ( screen.availHeight >= screen.availWidth ) ? screen.availHeight : screen.availWidth);
+			} else {
+			    $( '.ui-page' ).css( 'minHeight', ( screen.availHeight <= screen.availWidth ) ? screen.availHeight : screen.availWidth);
+			}
+            
+            $.mobile.silentScroll();
 		}
 		//add classes to HTML element for min/max breakpoints
 		detectResolutionBreakpoints();
 	});
+});
 
+/* Manually trigger an orientationchange event when the dom ready event fires.
+   This will ensure that any viewport meta tag that may have been injected
+   has taken effect already, allowing us to properly calculate the width of the
+   document.
+*/
+$(function(){
 	//trigger event manually
 	$window.trigger( "orientationchange.htmlclass" );
 });
@@ -429,11 +452,21 @@ function propExists( prop ){
 //test for dynamic-updating base tag support (allows us to avoid href,src attr rewriting)
 function baseTagTest(){
 	var fauxBase = location.protocol + '//' + location.host + location.pathname + "ui-dir/",
-		base = $("<base>", {"href": fauxBase}).appendTo("head"),
-		link = $( "<a href='testurl'></a>" ).prependTo( fakeBody ),
+		base = $("head base"),
+		fauxEle = null,
+		href = '';
+	if (!base.length) {
+		base = fauxEle = $("<base>", {"href": fauxBase}).appendTo("head");
+	}
+	else {
+		href = base.attr("href");
+	}
+	var link = $( "<a href='testurl'></a>" ).prependTo( fakeBody ),
 		rebase = link[0].href;
-	base[0].href = location.pathname;	
-	base.remove();
+	base[0].href = href ? href : location.pathname;
+	if (fauxEle) {
+		fauxEle.remove();
+	}
 	return rebase.indexOf(fauxBase) === 0;
 };
 
@@ -521,20 +554,37 @@ $.event.special.tap = {
 			$this = $( thisObject );
 		
 		$this
-			.bind( touchStartEvent, function( event ) {
-				if ( event.which && event.which !== 1 ) {
-					return;
+			.bind( "mousedown touchstart", function( event ) {
+				if ( event.which && event.which !== 1 ||
+					//check if event fired once already by a device that fires both mousedown and touchstart (while supporting both events)
+					$this.data( "prevEvent") && $this.data( "prevEvent") !== event.type ) {
+					return false;
 				}
 				
+				//save event type so only this type is let through for a temp duration, 
+				//allowing quick repetitive taps but not duplicative events 
+				$this.data( "prevEvent", event.type );
+				setTimeout(function(){
+					$this.removeData( "prevEvent" );
+				}, 800);
+				
 				var moved = false,
 					touching = true,
-					origPos = [ event.pageX, event.pageY ],
+					origTarget = event.target,
+					origEvent = event.originalEvent,
+					origPos = event.type == "touchstart" ? [origEvent.touches[0].pageX, origEvent.touches[0].pageY] : [ event.pageX, event.pageY ],
 					originalType,
 					timer;
+					
 				
-				function moveHandler() {
-					if ((Math.abs(origPos[0] - event.pageX) > 10) ||
-					    (Math.abs(origPos[1] - event.pageY) > 10)) {
+				function moveHandler( event ) {
+					if( event.type == "scroll" ){
+						moved = true;
+						return;
+					}
+					var newPageXY = event.type == "touchmove" ? event.originalEvent.touches[0] : event;
+					if ((Math.abs(origPos[0] - newPageXY.pageX) > 10) ||
+					    (Math.abs(origPos[1] - newPageXY.pageY) > 10)) {
 					    moved = true;
 					}
 				}
@@ -548,14 +598,21 @@ $.event.special.tap = {
 					}
 				}, 750 );
 				
+				//scroll now cancels tap
+				$(window).one("scroll", moveHandler);
+				
 				$this
-					.one( touchMoveEvent, moveHandler)
-					.one( touchStopEvent, function( event ) {
-						$this.unbind( touchMoveEvent, moveHandler );
+					.bind( "mousemove touchmove", moveHandler )
+					.one( "mouseup touchend", function( event ) {
+						$this.unbind( "mousemove touchmove", moveHandler );
+						$(window).unbind("scroll", moveHandler);
 						clearTimeout( timer );
 						touching = false;
 						
-						if ( !moved ) {
+						/* ONLY trigger a 'tap' event if the start target is
+						 * the same as the stop target.
+						 */
+						if ( !moved && ( origTarget == event.target ) ) {
 							originalType = event.type;
 							event.type = "tap";
 							$.event.handle.call( thisObject, event );
@@ -1096,6 +1153,217 @@ $.each({
 })(jQuery,this);
 
 
+/*
+* jQuery Mobile Framework : "page" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
+(function($, undefined ) {
+
+$.widget( "mobile.page", $.mobile.widget, {
+	options: {
+		backBtnText: "Back",
+		addBackBtn: true,
+		degradeInputs: {
+			color: false,
+			date: false,
+			datetime: false,
+			"datetime-local": false,
+			email: false,
+			month: false,
+			number: false,
+			range: "number",
+			search: true,
+			tel: false,
+			time: false,
+			url: false,
+			week: false
+		},
+		keepNative: null
+	},
+
+	_create: function() {
+		var $elem = this.element,
+			o = this.options;
+
+		this.keepNative = "[data-role='none'], [data-role='nojs']" + (o.keepNative ? ", " + o.keepNative : "");
+
+		if ( this._trigger( "beforeCreate" ) === false ) {
+			return;
+		}
+		
+		if( $( "html" ).hasClass( 'portrait' ) ) {
+		    $elem.css( 'minHeight', ( screen.availHeight >= screen.availWidth ) ? screen.availHeight : screen.availWidth);
+		} else {
+		    $elem.css( 'minHeight', ( screen.availHeight <= screen.availWidth ) ? screen.availHeight : screen.availWidth);
+		}
+
+		//some of the form elements currently rely on the presence of ui-page and ui-content
+		// classes so we'll handle page and content roles outside of the main role processing
+		// loop below.
+		$elem.find( "[data-role='page'], [data-role='content']" ).andSelf().each(function() {
+			$(this).addClass( "ui-" + $(this).data( "role" ) );
+		});
+
+		$elem.find( "[data-role='nojs']" ).addClass( "ui-nojs" );
+
+		// pre-find data els
+		var $dataEls = $elem.find( "[data-role]" ).andSelf().each(function() {
+			var $this = $( this ),
+				role = $this.data( "role" ),
+				theme = $this.data( "theme" );
+
+			//apply theming and markup modifications to page,header,content,footer
+			if ( role === "header" || role === "footer" ) {
+				$this.addClass( "ui-bar-" + (theme || $this.parent('[data-role=page]').data( "theme" ) || "a") );
+
+				// add ARIA role
+				$this.attr( "role", role === "header" ? "banner" : "contentinfo" );
+
+				//right,left buttons
+				var $headeranchors = $this.children( "a" ),
+					leftbtn = $headeranchors.hasClass( "ui-btn-left" ),
+					rightbtn = $headeranchors.hasClass( "ui-btn-right" );
+
+				if ( !leftbtn ) {
+					leftbtn = $headeranchors.eq( 0 ).not( ".ui-btn-right" ).addClass( "ui-btn-left" ).length;
+				}
+
+				if ( !rightbtn ) {
+					rightbtn = $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length;
+				}
+
+				// auto-add back btn on pages beyond first view
+				if ( o.addBackBtn && role === "header" &&
+						$.mobile.urlHistory.stack.length > 0  &&
+						!leftbtn && $this.data( "backbtn" ) !== false ) {
+
+					$( "<a href='#' class='ui-btn-left' data-rel='back' data-icon='arrow-l'>"+ o.backBtnText +"</a>" ).prependTo( $this );
+				}
+
+				//page title
+				$this.children( "h1, h2, h3, h4, h5, h6" )
+					.addClass( "ui-title" )
+					//regardless of h element number in src, it becomes h1 for the enhanced page
+					.attr({ "tabindex": "0", "role": "heading", "aria-level": "1" });
+
+			} else if ( role === "content" ) {
+				if ( theme ) {
+					$this.addClass( "ui-body-" + theme );
+				}
+
+				// add ARIA role
+				$this.attr( "role", "main" );
+
+			} else if ( role === "page" ) {
+				$this.addClass( "ui-body-" + (theme || "c") );
+			}
+
+			switch(role) {
+				case "header":
+				case "footer":
+				case "page":
+				case "content":
+					$this.addClass( "ui-" + role );
+					break;
+				case "collapsible":
+				case "fieldcontain":
+				case "navbar":
+				case "listview":
+				case "dialog":
+					$this[ role ]();
+					break;
+			}
+		});
+		
+		//enhance form controls
+  	this._enhanceControls();
+
+		//links in bars, or those with data-role become buttons
+		$elem.find( "[data-role='button'], .ui-bar > a, .ui-header > a, .ui-footer > a" )
+			.not( ".ui-btn" )
+			.not(this.keepNative)
+			.buttonMarkup();
+
+		$elem
+			.find("[data-role='controlgroup']")
+			.controlgroup();
+
+		//links within content areas
+		$elem.find( "a:not(.ui-btn):not(.ui-link-inherit)" )
+			.not(this.keepNative)
+			.addClass( "ui-link" );
+
+		//fix toolbars
+		$elem.fixHeaderFooter();
+	},
+
+	_enhanceControls: function() {
+		var o = this.options;
+
+		// degrade inputs to avoid poorly implemented native functionality
+		this.element.find( "input" ).not(this.keepNative).each(function() {
+			var type = this.getAttribute( "type" ),
+				optType = o.degradeInputs[ type ] || "text";
+
+			if ( o.degradeInputs[ type ] ) {
+				$( this ).replaceWith(
+					$( "<div>" ).html( $(this).clone() ).html()
+						.replace( /type="([a-zA-Z]+)"/, "type="+ optType +" data-type='$1'" ) );
+			}
+		});
+
+		// We re-find form elements since the degredation code above
+		// may have injected new elements. We cache the non-native control
+		// query to reduce the number of times we search through the entire page.
+
+		var allControls = this.element.find("input, textarea, select, button"),
+			nonNativeControls = allControls.not(this.keepNative);
+
+		// XXX: Temporary workaround for issue 785. Turn off autocorrect and
+		//      autocomplete since the popup they use can't be dismissed by
+		//      the user. Note that we test for the presence of the feature
+		//      by looking for the autocorrect property on the input element.
+
+		var textInputs = allControls.filter( "input[type=text]" );
+		if (textInputs.length && typeof textInputs[0].autocorrect !== "undefined") {
+			textInputs.each(function(){
+				// Set the attribute instead of the property just in case there
+				// is code that attempts to make modifications via HTML.
+				this.setAttribute("autocorrect", "off");
+				this.setAttribute("autocomplete", "off");
+			});
+		}
+
+		// enchance form controls
+		nonNativeControls
+			.filter( "[type='radio'], [type='checkbox']" )
+			.checkboxradio();
+
+		nonNativeControls
+			.filter( "button, [type='button'], [type='submit'], [type='reset'], [type='image']" )
+			.button();
+
+		nonNativeControls
+			.filter( "input, textarea" )
+			.not( "[type='radio'], [type='checkbox'], [type='button'], [type='submit'], [type='reset'], [type='image'], [type='hidden']" )
+			.textinput();
+
+		nonNativeControls
+			.filter( "input, select" )
+			.filter( "[data-role='slider'], [data-type='range']" )
+			.slider();
+
+		nonNativeControls
+			.filter( "select:not([data-role='slider'])" )
+			.selectmenu();
+	}
+});
+
+})( jQuery );
+
+
 /*!
  * jQuery Mobile v@VERSION
  * http://jquerymobile.com/
@@ -1125,9 +1393,14 @@ $.each({
 		//class used for "active" button state, from CSS framework
 		activeBtnClass: 'ui-btn-active',
 
+		//automatically handle clicks and form submissions through Ajax, when same-domain
+		ajaxEnabled: true,
+
+		// TODO: deprecated - remove at 1.0
 		//automatically handle link clicks through Ajax, when possible
 		ajaxLinksEnabled: true,
 
+		// TODO: deprecated - remove at 1.0
 		//automatically handle form submissions through Ajax, when possible
 		ajaxFormsEnabled: true,
 
@@ -1141,6 +1414,8 @@ $.each({
 		//configure meta viewport tag's content attr:
 		metaViewportContent: "width=device-width, minimum-scale=1, maximum-scale=1",
 
+		nativeSelectMenus: false,
+
 		//support conditions that must be met in order to proceed
 		gradeA: function(){
 			return $.support.mediaquery;
@@ -1184,11 +1459,11 @@ $.each({
 	});
 
 
-//trigger mobileinit event - useful hook for configuring $.mobile settings before they're used
+	//trigger mobileinit event - useful hook for configuring $.mobile settings before they're used
 	$( window.document ).trigger('mobileinit');
 
 
-//support conditions
+	//support conditions
 	//if device support condition(s) aren't met, leave things as they are -> a basic, usable experience,
 	//otherwise, proceed with the enhancements
 	if ( !$.mobile.gradeA() ) {
@@ -1196,7 +1471,7 @@ $.each({
 	}
 
 
-//define vars for interal use
+	//define vars for interal use
 	var $window = $(window),
 		$html = $('html'),
 		$head = $('head'),
@@ -1211,15 +1486,15 @@ $.each({
 			: undefined;
 
 
-//add mobile, initial load "rendering" classes to docEl
+	//add mobile, initial load "rendering" classes to docEl
 	$html.addClass('ui-mobile ui-mobile-rendering');
 
 
-//define & prepend meta viewport tag, if content is defined
+	//define & prepend meta viewport tag, if content is defined
 	$.mobile.metaViewportContent ? $("<meta>", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined;
 
 
-//expose some core utilities
+	//expose some core utilities
 	$.extend($.mobile, {
 
 		// turn on/off page loading message.
@@ -1228,7 +1503,9 @@ $.each({
 				$html.removeClass( "ui-loading" );
 			} else {
 				if( $.mobile.loadingMessage ){
-					$loader.appendTo($.mobile.pageContainer).css({top: $(window).scrollTop() + 75});
+					var activeLink = $( "." + $.mobile.activeBtnClass ).eq(0),
+						yPos = activeLink.length ? activeLink.offset().top : $(window).scrollTop() + 75;
+					$loader.appendTo($.mobile.pageContainer).css({top: yPos});
 				}
 				$html.addClass( "ui-loading" );
 			}
@@ -1236,10 +1513,12 @@ $.each({
 
 		//scroll page vertically: scroll to 0 to hide iOS address bar, or pass a Y value
 		silentScroll: function( ypos ) {
+			ypos = ypos || 0;
 			// prevent scrollstart and scrollstop events
 			$.event.special.scrollstart.enabled = false;
 			setTimeout(function() {
-				window.scrollTo( 0, ypos || 0 );
+				window.scrollTo( 0, ypos );
+				$(document).trigger("silentscroll", { x: 0, y: ypos });
 			},20);
 			setTimeout(function() {
 				$.event.special.scrollstart.enabled = true;
@@ -1248,13 +1527,13 @@ $.each({
 	});
 
 
-//dom-ready inits
+	//dom-ready inits
 	$(function(){
 
 		//find present pages
 		var $pages = $("[data-role='page']");
 
-		$pages.each(function(){
+		$("[data-role='page'], [data-role='dialog']").each(function(){
 			$(this).attr('data-url', $(this).attr('id'));
 		});
 
@@ -1278,7 +1557,7 @@ $.each({
 	});
 
 
-//window load event
+	//window load event
 	//hide iOS browser chrome on load
 	$window.load( $.mobile.silentScroll );
 
@@ -1306,24 +1585,17 @@ $.each({
 				if( newPath == undefined ){
 					newPath = location.hash;
 				}
-				newPath = newPath.replace(/#/,'').split('/');
-				if(newPath.length){
-					var lastSegment = newPath[newPath.length-1];
-					if( lastSegment.indexOf('.') > -1 || lastSegment == ''){
-						newPath.pop();
-					}
-				}
-				return newPath.join('/') + (newPath.length ? '/' : '');
+				return path.stripHash( newPath ).replace(/[^\/]*\.[^\/*]+$/, '');
 			},
 
 			//return the substring of a filepath before the sub-page key, for making a server request
 			getFilePath: function( path ){
 				var splitkey = '&' + $.mobile.subPageUrlKey;
-				return path && path.indexOf( splitkey ) > -1 ? path.split( splitkey )[0] : path;
+				return path && path.split( splitkey )[0].split( dialogHashKey )[0];
 			},
-
-			set: function( path, disableListening){
-				if(disableListening) { hashListener = false; }
+			
+			//set location hash to path
+			set: function( path ){
 				location.hash = path;
 			},
 
@@ -1332,48 +1604,147 @@ $.each({
 
 			setOrigin: function(){
 				path.origin = path.get( location.protocol + '//' + location.host + location.pathname );
+			},
+			
+			//prefix a relative url with the current path
+			makeAbsolute: function( url ){
+				return path.get() + url;
+			},
+			
+			//return a url path with the window's location protocol/hostname removed
+			clean: function( url ){
+				return url.replace( location.protocol + "//" + location.host, "");
+			},
+			
+			//just return the url without an initial #
+			stripHash: function( url ){
+				return url.replace( /^#/, "" );
+			},
+			
+			//check whether a url is referencing the same domain, or an external domain or different protocol
+			//could be mailto, etc
+			isExternal: function( url ){
+				return path.hasProtocol( path.clean( url ) );
+			},
+			
+			hasProtocol: function( url ){
+				return /^(:?\w+:)/.test( url );
+			},
+			
+			//check if the url is relative
+			isRelative: function( url ){
+				return  /^[^\/|#]/.test( url ) && !path.hasProtocol( url );
 			}
 		},
 
+		//will be defined when a link is clicked and given an active class
+		$activeClickedLink = null,
+		
+		//urlHistory is purely here to make guesses at whether the back or forward button was clicked
+		//and provide an appropriate transition
+		urlHistory = {
+			//array of pages that are visited during a single page load. each has a url and optional transition
+			stack: [],
+			
+			//maintain an index number for the active page in the stack
+			activeIndex: 0,
+			
+			//get active
+			getActive: function(){
+				return urlHistory.stack[ urlHistory.activeIndex ];
+			},
+			
+			getPrev: function(){
+				return urlHistory.stack[ urlHistory.activeIndex - 1 ];
+			},
+			
+			getNext: function(){
+				return urlHistory.stack[ urlHistory.activeIndex + 1 ];
+			},
+			
+			// addNew is used whenever a new page is added
+			addNew: function( url, transition ){
+				//if there's forward history, wipe it
+				if( urlHistory.getNext() ){
+					urlHistory.clearForward();
+				}
+				
+				urlHistory.stack.push( {url : url, transition: transition } );
+					
+				urlHistory.activeIndex = urlHistory.stack.length - 1;
+			},
+			
+			//wipe urls ahead of active index
+			clearForward: function(){
+				urlHistory.stack = urlHistory.stack.slice( 0, urlHistory.activeIndex + 1 );
+			},
+			
+			//enable/disable hashchange event listener
+			//toggled internally when location.hash is updated to match the url of a successful page load
+			listeningEnabled: true
+		},
+
+		//define first selector to receive focus when a page is shown
+		focusable = "[tabindex],a,button:visible,select:visible,input",
+
+		//contains role for next page, if defined on clicked link via data-rel
+		nextPageRole = null,
+		
+		//nonsense hash change key for dialogs, so they create a history entry
+		dialogHashKey = "&ui-state=dialog";
+
+		//existing base tag?
+		var $base = $head.children("base"),
+			hostURL = location.protocol + '//' + location.host,
+			docLocation = path.get( hostURL + location.pathname ),
+			docBase = docLocation;
+
+		if ($base.length){
+			var href = $base.attr("href");
+			if (href){
+				if (href.search(/^[^:/]+:\/\/[^/]+\/?/) == -1){
+					//the href is not absolute, we need to turn it into one
+					//so that we can turn paths stored in our location hash into
+					//relative paths.
+					if (href.charAt(0) == '/'){
+						//site relative url
+						docBase = hostURL + href;
+					}
+					else {
+						//the href is a document relative url
+						docBase = docLocation + href;
+						//XXX: we need some code here to calculate the final path
+						// just in case the docBase contains up-level (../) references.
+					}
+				}
+				else {
+					//the href is an absolute url
+					docBase = href;
+				}
+			}
+			//make sure docBase ends with a slash
+			docBase = docBase  + (docBase.charAt(docBase.length - 1) == '/' ? ' ' : '/');
+		}
+
 		//base element management, defined depending on dynamic base tag support
 		base = $.support.dynamicBaseTag ? {
 
 			//define base element, for use in routing asset urls that are referenced in Ajax-requested markup
-			element: $("<base>", { href: path.origin }).prependTo( $head ),
+			element: ($base.length ? $base : $("<base>", { href: docBase }).prependTo( $head )),
 
 			//set the generated BASE element's href attribute to a new page's base path
 			set: function( href ){
-				base.element.attr('href', path.origin + path.get( href ));
+				base.element.attr('href', docBase + path.get( href ));
 			},
 
 			//set the generated BASE element's href attribute to a new page's base path
 			reset: function(){
-				base.element.attr('href', path.origin );
+				base.element.attr('href', docBase );
 			}
 
-		} : undefined,
-
+		} : undefined;
 
-		//will be defined when a link is clicked and given an active class
-		$activeClickedLink = null,
 
-		//array of pages that are visited during a single page load
-		//length will grow as pages are visited, and shrink as "back" link/button is clicked
-		//each item has a url (string matches ID), and transition (saved for reuse when "back" link/button is clicked)
-		urlStack = [ {
-			url: location.hash.replace( /^#/, "" ),
-			transition: undefined
-		} ],
-
-		//define first selector to receive focus when a page is shown
-		focusable = "[tabindex],a,button:visible,select:visible,input",
-
-		//contains role for next page, if defined on clicked link via data-rel
-		nextPageRole = null,
-
-		//enable/disable hashchange event listener
-		//toggled internally when location.hash is updated to match the url of a successful page load
-		hashListener = true;
 
 		//set location pathname from intial directory request
 		path.setOrigin();
@@ -1402,7 +1773,6 @@ $.each({
 		$activeClickedLink = null;
 	};
 
-
 	//animation complete callback
 	$.fn.animationComplete = function( callback ){
 		if($.support.cssTransitions){
@@ -1418,37 +1788,87 @@ $.each({
 /* exposed $.mobile methods	 */
 
 	//update location.hash, with or without triggering hashchange event
+	//TODO - deprecate this one at 1.0
 	$.mobile.updateHash = path.set;
+	
+	//expose path object on $.mobile
+	$.mobile.path = path;
+	
+	//expose base object on $.mobile
+	$.mobile.base = base;
 
 	//url stack, useful when plugins need to be aware of previous pages viewed
-	$.mobile.urlStack = urlStack;
+	//TODO: deprecate this one at 1.0
+	$.mobile.urlstack = urlHistory.stack;
+	
+	//history stack
+	$.mobile.urlHistory = urlHistory;
 
 	// changepage function
-	$.mobile.changePage = function( to, transition, back, changeHash){
-
+	// TODO : consider moving args to an object hash
+	$.mobile.changePage = function( to, transition, reverse, changeHash, fromHashChange ){
 		//from is always the currently viewed page
 		var toIsArray = $.type(to) === "array",
+			toIsObject = $.type(to) === "object",
 			from = toIsArray ? to[0] : $.mobile.activePage,
 			to = toIsArray ? to[1] : to,
-			url = fileUrl = $.type(to) === "string" ? to.replace( /^#/, "" ) : null,
+			url = fileUrl = $.type(to) === "string" ? path.stripHash( to ) : "",
 			data = undefined,
 			type = 'get',
 			isFormRequest = false,
 			duplicateCachedPage = null,
-			back = (back !== undefined) ? back : ( urlStack.length > 1 && urlStack[ urlStack.length - 2 ].url === url );
-
-		//If we are trying to transition to the same page that we are currently on ignore the request.
-		if(urlStack.length > 1 && url === urlStack[urlStack.length -1].url && !toIsArray ) {
+			currPage = urlHistory.getActive(),
+			back = false,
+			forward = false;
+			
+			
+		// If we are trying to transition to the same page that we are currently on ignore the request.
+		// an illegal same page request is defined by the current page being the same as the url, as long as there's history
+		// and to is not an array or object (those are allowed to be "same")
+		if( currPage && urlHistory.stack.length > 1 && currPage.url === url && !toIsArray && !toIsObject ) {
 			return;
+		}	
+			
+		// if the changePage was sent from a hashChange event
+		// guess if it came from the history menu
+		if( fromHashChange ){
+			
+			// check if url is in history and if it's ahead or behind current page
+			$.each( urlHistory.stack, function( i ){
+				//if the url is in the stack, it's a forward or a back
+				if( this.url == url ){
+					urlIndex = i;
+					//define back and forward by whether url is older or newer than current page
+					back = i < urlHistory.activeIndex;
+					//forward set to opposite of back
+					forward = !back;
+					//reset activeIndex to this one
+					urlHistory.activeIndex = i;
+				}
+			});
+			
+			//if it's a back, use reverse animation
+			if( back ){
+				reverse = true;
+				transition = transition || currPage.transition;
+			}
+			else if ( forward ){
+				transition = transition || urlHistory.getActive().transition;
+			}
 		}
+		
 
-		if( $.type(to) === "object" && to.url ){
+		if( toIsObject && to.url ){
 			url = to.url,
 			data = to.data,
 			type = to.type,
 			isFormRequest = true;
 			//make get requests bookmarkable
 			if( data && type == 'get' ){
+				if($.type( data ) == "object" ){
+					data = $.param(data);
+				}
+			
 				url += "?" + data;
 				data = undefined;
 			}
@@ -1466,32 +1886,19 @@ $.each({
 			}
 		}
 
-		// if the new href is the same as the previous one
-		if ( back ) {
-			var pop = urlStack.pop();
-
-			// prefer the explicitly set transition
-			if( pop && !transition ){
-				transition = pop.transition;
-			}
-
-			// ensure a transition has been set where pop is undefined
-			defaultTransition();
-		} else {
-			// If no transition has been passed
-			defaultTransition();
-
-			// push the url and transition onto the stack
-			urlStack.push({ url: url, transition: transition });
-		}
-
 		//function for transitioning between two existing pages
 		function transitionPages() {
+		    $.mobile.silentScroll();
 
 			//get current scroll distance
 			var currScroll = $window.scrollTop(),
 					perspectiveTransitions = ["flip"],
 					pageContainerClasses = [];
+			
+			//support deep-links to generated sub-pages	
+			if( url.indexOf( "&" + $.mobile.subPageUrlKey ) > -1 ){
+				to = $( "[data-url='" + url + "']" );
+			}
 
 			//set as data for returning to that spot
 			from.data('lastScroll', currScroll);
@@ -1501,28 +1908,36 @@ $.each({
 			to.data("page")._trigger("beforeshow", {prevPage: from});
 
 			function loadComplete(){
-				$.mobile.pageLoading( true );
-
-				reFocus( to );
 
 				if( changeHash !== false && url ){
-					path.set(url, (back !== true));
+					if( !back  ){
+						urlHistory.listeningEnabled = false;
+					}
+					path.set( url );
+					urlHistory.listeningEnabled = true;
 				}
-				removeActiveLinkClass();
-
-				//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
-				if( duplicateCachedPage != null ){
-					duplicateCachedPage.remove();
+				
+				//add page to history stack if it's not back or forward
+				if( !back && !forward ){
+					urlHistory.addNew( url, transition );
 				}
+				
+				removeActiveLinkClass();
 
-				//jump to top or prev scroll, if set
-				$.mobile.silentScroll( to.data( 'lastScroll' ) );
+				//jump to top or prev scroll, sometimes on iOS the page has not rendered yet.  I could only get by this with a setTimeout, but would like to avoid that.
+				$.mobile.silentScroll( to.data( 'lastScroll' ) ); 
+				reFocus( to );
 
 				//trigger show/hide events, allow preventing focus change through return false
 				from.data("page")._trigger("hide", null, {nextPage: to});
 				if( to.data("page")._trigger("show", null, {prevPage: from}) !== false ){
 					$.mobile.activePage = to;
 				}
+
+				//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
+				if (duplicateCachedPage != null) {
+				    duplicateCachedPage.remove();
+				}
 			};
 
 			function addContainerClass(className){
@@ -1537,18 +1952,25 @@ $.each({
 
 				pageContainerClasses = [];
 			};
+			
+			
 
 			if(transition && (transition !== 'none')){
-				if( perspectiveTransitions.indexOf(transition) >= 0 ){
+			    $.mobile.pageLoading( true );
+				if( $.inArray(transition, perspectiveTransitions) >= 0 ){
 					addContainerClass('ui-mobile-viewport-perspective');
 				}
 
 				addContainerClass('ui-mobile-viewport-transitioning');
 
-				// animate in / out
-				from.addClass( transition + " out " + ( back ? "reverse" : "" ) );
+				/* animate in / out
+				 * This is in a setTimeout because we were often seeing pages in not animate across but rather go straight to
+				 * the 'to' page.  The loadComplete would still fire, so the browser thought it was applying the animation.  From
+				 * what I could tell this was a problem with the classes not being applied yet.
+				 */ 
+				setTimeout(function() { from.addClass( transition + " out " + ( reverse ? "reverse" : "" ) );
 				to.addClass( $.mobile.activePageClass + " " + transition +
-					" in " + ( back ? "reverse" : "" ) );
+					" in " + ( reverse ? "reverse" : "" ) ); } , 0);
 
 				// callback - remove classes, etc
 				to.animationComplete(function() {
@@ -1559,6 +1981,7 @@ $.each({
 				});
 			}
 			else{
+			    $.mobile.pageLoading( true );
 				from.removeClass( $.mobile.activePageClass );
 				to.addClass( $.mobile.activePageClass );
 				loadComplete();
@@ -1570,7 +1993,7 @@ $.each({
 
 			//set next page role, if defined
 			if ( nextPageRole || to.data('role') == 'dialog' ) {
-				changeHash = false;
+				url = urlHistory.getActive().url + dialogHashKey;
 				if(nextPageRole){
 					to.attr( "data-role", nextPageRole );
 					nextPageRole = null;
@@ -1594,6 +2017,9 @@ $.each({
 				fileUrl = toIDfileurl;
 			}
 		}
+		
+		// ensure a transition has been set where pop is undefined
+		defaultTransition();
 
 		// find the "to" page, either locally existing in the dom or by creating it through ajax
 		if ( to.length && !isFormRequest ) {
@@ -1616,8 +2042,23 @@ $.each({
 				type: type,
 				data: data,
 				success: function( html ) {
-					if(base){ base.set(fileUrl); }
+					
+					//pre-parse html to check for a data-url, 
+					//use it as the new fileUrl, base path, etc
+					var redirectLoc = / data-url="(.*)"/.test( html ) && RegExp.$1;
 
+					if( redirectLoc ){
+						if(base){
+							base.set( redirectLoc );
+						}	
+						url = fileUrl = path.makeAbsolute( path.getFilePath( redirectLoc ) );
+					}
+					else {
+						if(base){
+							base.set(fileUrl);
+						}	
+					}
+					
 					var all = $("<div></div>");
 					//workaround to allow scripts to execute when included in page divs
 					all.get(0).innerHTML = html;
@@ -1638,7 +2079,8 @@ $.each({
 							}
 						});
 					}
-
+					
+					//append to page and enhance
 					to
 						.attr( "data-url", fileUrl )
 						.appendTo( $.mobile.pageContainer );
@@ -1667,20 +2109,22 @@ $.each({
 /* Event Bindings - hashchange, submit, and click */
 
 	//bind to form submit events, handle with Ajax
-	$('form').live('submit', function(event){
-		if( !$.mobile.ajaxFormsEnabled ){ return; }
+	$( "form[data-ajax!='false']" ).live('submit', function(event){
+		if( !$.mobile.ajaxEnabled ||
+			//TODO: deprecated - remove at 1.0
+			!$.mobile.ajaxFormsEnabled ){ return; }
 
 		var type = $(this).attr("method"),
-			url = $(this).attr( "action" ).replace( location.protocol + "//" + location.host, "");
+			url = path.clean( $(this).attr( "action" ) );
 
 		//external submits use regular HTTP
-		if( /^(:?\w+:)/.test( url ) ){
+		if( path.isExternal( url ) ){
 			return;
 		}
 
 		//if it's a relative href, prefix href with base url
-		if( url.indexOf('/') && url.indexOf('#') !== 0 ){
-			url = path.get() + url;
+		if( path.isRelative( url ) ){
+			url = path.makeAbsolute( url );
 		}
 
 		$.mobile.changePage({
@@ -1698,50 +2142,63 @@ $.each({
 
 	//click routing - direct to HTTP or Ajax, accordingly
 	$( "a" ).live( "click", function(event) {
-
-		if( !$.mobile.ajaxLinksEnabled ){ return; }
+		
 		var $this = $(this),
 			//get href, remove same-domain protocol and host
-			href = $this.attr( "href" ).replace( location.protocol + "//" + location.host, ""),
-			//if target attr is specified, it's external, and we mimic _blank... for now
-			target = $this.is( "[target]" ),
-			//if it still starts with a protocol, it's external, or could be :mailto, etc
-			external = target || /^(:?\w+:)/.test( href ) || $this.is( "[rel=external]" );
+			url = path.clean( $this.attr( "href" ) ),
+			
+			//check if it's external
+			isExternal = path.isExternal( url ) || $this.is( "[rel='external']" ),
+			
+			//if target attr is specified we mimic _blank... for now
+			hasTarget = $this.is( "[target]" );
+		
+		//if there's a data-rel=back attr, go back in history
+		if( $this.is( "[data-rel='back']" ) ){
+			window.history.back();
+			return false;
+		}	
 
-		if( href === '#' ){
+		if( url === "#" ){
 			//for links created purely for interaction - ignore
 			return false;
 		}
 
 		$activeClickedLink = $this.closest( ".ui-btn" ).addClass( $.mobile.activeBtnClass );
 
-		if( external || !$.mobile.ajaxLinksEnabled ){
-			//remove active link class if external
+		if( isExternal || hasTarget || !$.mobile.ajaxEnabled ||
+			// TODO: deprecated - remove at 1.0
+			!$.mobile.ajaxLinksEnabled ){
+			//remove active link class if external (then it won't be there if you come back)
 			removeActiveLinkClass(true);
 
 			//deliberately redirect, in case click was triggered
-			if( target ){
-				window.open(href);
+			if( hasTarget ){
+				window.open( url );
 			}
 			else{
-				location.href = href;
+				location.href = url;
 			}
 		}
 		else {
 			//use ajax
 			var transition = $this.data( "transition" ),
-				back = $this.data( "back" );
-
+				direction = $this.data("direction"),
+				reverse = direction && direction == "reverse" || 
+				// deprecated - remove by 1.0
+				$this.data( "back" );
+				
+			//this may need to be more specific as we use data-rel more	
 			nextPageRole = $this.attr( "data-rel" );
 
 			//if it's a relative href, prefix href with base url
-			if( href.indexOf('/') && href.indexOf('#') !== 0 ){
-				href = path.get() + href;
+			if( path.isRelative( url ) ){
+				url = path.makeAbsolute( url );
 			}
 
-			href.replace(/^#/,'');
+			url = path.stripHash( url );
 
-			$.mobile.changePage(href, transition, back);
+			$.mobile.changePage( url, transition, reverse);
 		}
 		event.preventDefault();
 	});
@@ -1750,29 +2207,35 @@ $.each({
 
 	//hashchange event handler
 	$window.bind( "hashchange", function(e, triggered) {
-		if( !hashListener ){
-			hashListener = true;
+		if( !triggered && ( !urlHistory.listeningEnabled || !$.mobile.ajaxEnabled ||
+			// TODO: deprecated - remove at 1.0
+			// only links need to be checked here, as forms don't trigger a hashchange event (they just silently update the hash)
+			!$.mobile.ajaxLinksEnabled ) ){
 			return;
 		}
+		
+		var to = path.stripHash( location.hash ),
+			transition = triggered ? false : undefined;	
 
-		if( $(".ui-page-active").is("[data-role=" + $.mobile.nonHistorySelectors + "]") ){
+		//make sure that hash changes that produce a dialog url do nothing	
+		if( urlHistory.stack.length > 1 &&
+				to.indexOf( dialogHashKey ) > -1 &&
+				!$.mobile.activePage.is( ".ui-dialog" ) ){
 			return;
-		}
-
-		var to = location.hash,
-			transition = triggered ? false : undefined;
+		}	
 
 		//if to is defined, use it
 		if ( to ){
-			$.mobile.changePage( to, transition, undefined, false);
+			$.mobile.changePage( to, transition, undefined, false, true );
 		}
 		//there's no hash, the active page is not the start page, and it's not manually triggered hashchange
 		//we probably backed out to the first page visited
 		else if( $.mobile.activePage.length && $.mobile.startPage[0] !== $.mobile.activePage[0] && !triggered ) {
-			$.mobile.changePage( $.mobile.startPage, transition, true, false );
+			$.mobile.changePage( $.mobile.startPage, transition, true, false, true );
 		}
 		//probably the first page - show it
 		else{
+			urlHistory.addNew( "" );
 			$.mobile.startPage.trigger("pagebeforeshow", {prevPage: $('')});
 			$.mobile.startPage.addClass( $.mobile.activePageClass );
 			$.mobile.pageLoading( true );
@@ -1784,451 +2247,378 @@ $.each({
 	});
 })( jQuery );
 
+
 /*
-* jQuery Mobile Framework : "page" plugin
+* jQuery Mobile Framework : plugin for making button-like links
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
 */
 (function($, undefined ) {
 
-$.widget( "mobile.page", $.mobile.widget, {
-	options: {
-		backBtnText: "Back",
-		addBackBtn: true,
-		degradeInputs: {
-			color: false,
-			date: false,
-			datetime: false,
-			"datetime-local": false,
-			email: false,
-			month: false,
-			number: false,
-			range: "number",
-			search: true,
-			tel: false,
-			time: false,
-			url: false,
-			week: false
-		},
-		keepNative: null
-	},
-
-	_create: function() {
-		var $elem = this.element,
-			o = this.options;
+$.fn.buttonMarkup = function( options ){
+	return this.each( function() {
+		var el = $( this ),
+		    o = $.extend( {}, $.fn.buttonMarkup.defaults, el.data(), options),
 
-		this.keepNative = "[data-role='none'], [data-role='nojs']" + (o.keepNative ? ", " + o.keepNative : "");
+			// Classes Defined
+			buttonClass,
+			innerClass = "ui-btn-inner",
+			iconClass;
 
-		if ( this._trigger( "beforeCreate" ) === false ) {
-			return;
+		if ( attachEvents ) {
+			attachEvents();
 		}
 
-		//some of the form elements currently rely on the presence of ui-page and ui-content
-		// classes so we'll handle page and content roles outside of the main role processing
-		// loop below.
-		$elem.find( "[data-role='page'], [data-role='content']" ).andSelf().each(function() {
-			$(this).addClass( "ui-" + $(this).data( "role" ) );
-		});
+		// if not, try to find closest theme container
+		if ( !o.theme ) {
+			var themedParent = el.closest("[class*='ui-bar-'],[class*='ui-body-']");
+			o.theme = themedParent.length ?
+				/ui-(bar|body)-([a-z])/.exec( themedParent.attr("class") )[2] :
+				"c";
+		}
 
-		$elem.find( "[data-role='nojs']" ).addClass( "ui-nojs" );
+		buttonClass = "ui-btn ui-btn-up-" + o.theme;
 
-		// pre-find data els
-		var $dataEls = $elem.find( "[data-role]" ).andSelf().each(function() {
-			var $this = $( this ),
-				role = $this.data( "role" ),
-				theme = $this.data( "theme" );
+		if ( o.inline ) {
+			buttonClass += " ui-btn-inline";
+		}
 
-			//apply theming and markup modifications to page,header,content,footer
-			if ( role === "header" || role === "footer" ) {
-				$this.addClass( "ui-bar-" + (theme || $this.parent('[data-role=page]').data( "theme" ) || "a") );
+		if ( o.icon ) {
+			o.icon = "ui-icon-" + o.icon;
+			o.iconpos = o.iconpos || "left";
 
-				// add ARIA role
-				$this.attr( "role", role === "header" ? "banner" : "contentinfo" );
+			iconClass = "ui-icon " + o.icon;
 
-				//right,left buttons
-				var $headeranchors = $this.children( "a" ),
-					leftbtn = $headeranchors.hasClass( "ui-btn-left" ),
-					rightbtn = $headeranchors.hasClass( "ui-btn-right" );
+			if ( o.shadow ) {
+				iconClass += " ui-icon-shadow";
+			}
+		}
 
-				if ( !leftbtn ) {
-					leftbtn = $headeranchors.eq( 0 ).not( ".ui-btn-right" ).addClass( "ui-btn-left" ).length;
-				}
+		if ( o.iconpos ) {
+			buttonClass += " ui-btn-icon-" + o.iconpos;
 
-				if ( !rightbtn ) {
-					rightbtn = $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length;
-				}
+			if ( o.iconpos == "notext" && !el.attr("title") ) {
+				el.attr( "title", el.text() );
+			}
+		}
 
-				// auto-add back btn on pages beyond first view
-				if ( o.addBackBtn && role === "header" &&
-						($.mobile.urlStack.length > 1 || $(".ui-page").length > 1) &&
-						!leftbtn && !$this.data( "noBackBtn" ) ) {
+		if ( o.corners ) {
+			buttonClass += " ui-btn-corner-all";
+			innerClass += " ui-btn-corner-all";
+		}
 
-					$( "<a href='#' class='ui-btn-left' data-icon='arrow-l'>"+ o.backBtnText +"</a>" )
-						.click(function() {
-							history.back();
-							return false;
-						})
-						.prependTo( $this );
-				}
+		if ( o.shadow ) {
+			buttonClass += " ui-shadow";
+		}
 
-				//page title
-				$this.children( "h1, h2, h3, h4, h5, h6" )
-					.addClass( "ui-title" )
-					//regardless of h element number in src, it becomes h1 for the enhanced page
-					.attr({ "tabindex": "0", "role": "heading", "aria-level": "1" });
+		el
+			.attr( "data-theme", o.theme )
+			.addClass( buttonClass );
 
-			} else if ( role === "content" ) {
-				if ( theme ) {
-					$this.addClass( "ui-body-" + theme );
-				}
+		var wrap = ("<D class='" + innerClass + "'><D class='ui-btn-text'></D>" +
+			( o.icon ? "<span class='" + iconClass + "'></span>" : "" ) +
+			"</D>").replace(/D/g, o.wrapperEls);
 
-				// add ARIA role
-				$this.attr( "role", "main" );
+		el.wrapInner( wrap );
+	});
+};
 
-			} else if ( role === "page" ) {
-				$this.addClass( "ui-body-" + (theme || "c") );
-			}
+$.fn.buttonMarkup.defaults = {
+	corners: true,
+	shadow: true,
+	iconshadow: true,
+	wrapperEls: "span"
+};
 
-			switch(role) {
-				case "header":
-				case "footer":
-				case "page":
-				case "content":
-					$this.addClass( "ui-" + role );
-					break;
-				case "collapsible":
-				case "fieldcontain":
-				case "navbar":
-				case "listview":
-				case "dialog":
-					$this[ role ]();
-					break;
-			}
-		});
-		
-		//enhance form controls
-  	this._enhanceControls();
+var attachEvents = function() {
+	$(".ui-btn:not(.ui-disabled)").live({
+		mousedown: function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
+		},
+		mouseup: function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
+		},
+		"mouseover focus": function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
+		},
+		"mouseout blur": function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-hover-" + theme ).addClass( "ui-btn-up-" + theme );
+		}
+	});
 
-		//links in bars, or those with data-role become buttons
-		$elem.find( "[data-role='button'], .ui-bar > a, .ui-header > a, .ui-footer > a" )
-			.not( ".ui-btn" )
-			.not(this.keepNative)
-			.buttonMarkup();
+	attachEvents = null;
+};
 
-		$elem
-			.find("[data-role='controlgroup']")
-			.controlgroup();
+})(jQuery);
 
-		//links within content areas
-		$elem.find( "a:not(.ui-btn):not(.ui-link-inherit)" )
-			.not(this.keepNative)
-			.addClass( "ui-link" );
 
-		//fix toolbars
-		$elem.fixHeaderFooter();
+/*
+* jQuery Mobile Framework : "collapsible" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/ 
+(function($, undefined ) {
+$.widget( "mobile.collapsible", $.mobile.widget, {
+	options: {
+		expandCueText: ' click to expand contents',
+		collapseCueText: ' click to collapse contents',
+		collapsed: false,
+		heading: '>:header,>legend',
+		theme: null,
+		iconTheme: 'd'
 	},
+	_create: function(){
 
-	_enhanceControls: function() {
-		var o = this.options;
-
-		// degrade inputs to avoid poorly implemented native functionality
-		this.element.find( "input" ).not(this.keepNative).each(function() {
-			var type = this.getAttribute( "type" ),
-				optType = o.degradeInputs[ type ] || "text";
-
-			if ( o.degradeInputs[ type ] ) {
-				$( this ).replaceWith(
-					$( "<div>" ).html( $(this).clone() ).html()
-						.replace( /type="([a-zA-Z]+)"/, "type="+ optType +" data-type='$1'" ) );
+		var $el = this.element,
+			o = this.options,
+			collapsibleContain = $el.addClass('ui-collapsible-contain'),
+			collapsibleHeading = $el.find(o.heading).eq(0),
+			collapsibleContent = collapsibleContain.wrapInner('<div class="ui-collapsible-content"></div>').find('.ui-collapsible-content'),
+			collapsibleParent = $el.closest('[data-role="collapsible-set"]').addClass('ui-collapsible-set');				
+		
+		//replace collapsibleHeading if it's a legend	
+		if(collapsibleHeading.is('legend')){
+			collapsibleHeading = $('<div role="heading">'+ collapsibleHeading.html() +'</div>').insertBefore(collapsibleHeading);
+			collapsibleHeading.next().remove();
+		}	
+		
+		//drop heading in before content
+		collapsibleHeading.insertBefore(collapsibleContent);
+		
+		//modify markup & attributes
+		collapsibleHeading.addClass('ui-collapsible-heading')
+			.append('<span class="ui-collapsible-heading-status"></span>')
+			.wrapInner('<a href="#" class="ui-collapsible-heading-toggle"></a>')
+			.find('a:eq(0)')
+			.buttonMarkup({
+				shadow: !!!collapsibleParent.length,
+				corners:false,
+				iconPos: 'left',
+				icon: 'plus',
+				theme: o.theme
+			})
+			.find('.ui-icon')
+			.removeAttr('class')
+			.buttonMarkup({
+				shadow: true,
+				corners:true,
+				iconPos: 'notext',
+				icon: 'plus',
+				theme: o.iconTheme
+			});
+			
+			if( !collapsibleParent.length ){
+				collapsibleHeading
+					.find('a:eq(0)')	
+					.addClass('ui-corner-all')
+						.find('.ui-btn-inner')
+						.addClass('ui-corner-all');
+			}
+			else {
+				if( collapsibleContain.data('collapsible-last') ){
+					collapsibleHeading
+						.find('a:eq(0), .ui-btn-inner')	
+							.addClass('ui-corner-bottom');
+				}					
 			}
+			
+		
+		//events
+		collapsibleContain	
+			.bind('collapse', function(event){
+				if( !event.isDefaultPrevented() ){
+					event.preventDefault();
+					collapsibleHeading
+						.addClass('ui-collapsible-heading-collapsed')
+						.find('.ui-collapsible-heading-status').text(o.expandCueText);
+					
+					collapsibleHeading.find('.ui-icon').removeClass('ui-icon-minus').addClass('ui-icon-plus');	
+					collapsibleContent.addClass('ui-collapsible-content-collapsed').attr('aria-hidden',true);
+					
+					if( collapsibleContain.data('collapsible-last') ){
+						collapsibleHeading
+							.find('a:eq(0), .ui-btn-inner')
+							.addClass('ui-corner-bottom');
+					}
+				}						
+				
+			})
+			.bind('expand', function(event){
+				if( !event.isDefaultPrevented() ){
+					event.preventDefault();
+					collapsibleHeading
+						.removeClass('ui-collapsible-heading-collapsed')
+						.find('.ui-collapsible-heading-status').text(o.collapseCueText);
+					
+					collapsibleHeading.find('.ui-icon').removeClass('ui-icon-plus').addClass('ui-icon-minus');	
+					collapsibleContent.removeClass('ui-collapsible-content-collapsed').attr('aria-hidden',false);
+					
+					if( collapsibleContain.data('collapsible-last') ){
+						collapsibleHeading
+							.find('a:eq(0), .ui-btn-inner')
+							.removeClass('ui-corner-bottom');
+					}
+					
+				}
+			})
+			.trigger(o.collapsed ? 'collapse' : 'expand');
+			
+		
+		//close others in a set
+		if( collapsibleParent.length && !collapsibleParent.data("collapsiblebound") ){
+			collapsibleParent
+				.data("collapsiblebound", true)
+				.bind("expand", function( event ){
+					$(this).find( ".ui-collapsible-contain" )
+						.not( $(event.target).closest( ".ui-collapsible-contain" ) )
+						.not( "> .ui-collapsible-contain .ui-collapsible-contain" )
+						.trigger( "collapse" );
+				})
+			var set = collapsibleParent.find('[data-role=collapsible]')
+					
+			set.first()
+				.find('a:eq(0)')	
+				.addClass('ui-corner-top')
+					.find('.ui-btn-inner')
+					.addClass('ui-corner-top');
+					
+			set.last().data('collapsible-last', true)	
+		}
+					
+		collapsibleHeading.bind( $.support.touch ? "touchstart" : "click", function(){ 
+			if( collapsibleHeading.is('.ui-collapsible-heading-collapsed') ){
+				collapsibleContain.trigger('expand'); 
+			}	
+			else {
+				collapsibleContain.trigger('collapse'); 
+			}
+			return false;
 		});
-
-		// enchance form controls
-		this.element
-			.find( "[type='radio'], [type='checkbox']" )
-			.not(this.keepNative)
-			.checkboxradio();
-
-		this.element
-			.find( "button, [type='button'], [type='submit'], [type='reset'], [type='image']" )
-			.not(this.keepNative)
-			.button();
-
-		this.element
-			.find( "input, textarea" )
-			.not( "[type='radio'], [type='checkbox'], button, [type='button'], [type='submit'], [type='reset'], [type='image']" )
-			.not(this.keepNative)
-			.textinput();
-
-		this.element
-			.find( "input, select" )
-			.not(this.keepNative)
-			.filter( "[data-role='slider'], [data-type='range']" )
-			.slider();
-
-		this.element
-			.find( "select:not([data-role='slider'])" )
-			.not(this.keepNative)
-			.selectmenu();
+			
 	}
 });
-
 })( jQuery );
 
-
 /*
- * jQuery UI Position @VERSION
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function( $, undefined ) {
-
-$.ui = $.ui || {};
-
-var horizontalPositions = /left|center|right/,
-	verticalPositions = /top|center|bottom/,
-	center = "center",
-	_position = $.fn.position,
-	_offset = $.fn.offset;
-
-$.fn.position = function( options ) {
-	if ( !options || !options.of ) {
-		return _position.apply( this, arguments );
-	}
-
-	// make a copy, we don't want to modify arguments
-	options = $.extend( {}, options );
-
-	var target = $( options.of ),
-		targetElem = target[0],
-		collision = ( options.collision || "flip" ).split( " " ),
-		offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ],
-		targetWidth,
-		targetHeight,
-		basePosition;
-
-	if ( targetElem.nodeType === 9 ) {
-		targetWidth = target.width();
-		targetHeight = target.height();
-		basePosition = { top: 0, left: 0 };
-	// TODO: use $.isWindow() in 1.9
-	} else if ( targetElem.setTimeout ) {
-		targetWidth = target.width();
-		targetHeight = target.height();
-		basePosition = { top: target.scrollTop(), left: target.scrollLeft() };
-	} else if ( targetElem.preventDefault ) {
-		// force left top to allow flipping
-		options.at = "left top";
-		targetWidth = targetHeight = 0;
-		basePosition = { top: options.of.pageY, left: options.of.pageX };
-	} else {
-		targetWidth = target.outerWidth();
-		targetHeight = target.outerHeight();
-		basePosition = target.offset();
-	}
-
-	// force my and at to have valid horizontal and veritcal positions
-	// if a value is missing or invalid, it will be converted to center 
-	$.each( [ "my", "at" ], function() {
-		var pos = ( options[this] || "" ).split( " " );
-		if ( pos.length === 1) {
-			pos = horizontalPositions.test( pos[0] ) ?
-				pos.concat( [center] ) :
-				verticalPositions.test( pos[0] ) ?
-					[ center ].concat( pos ) :
-					[ center, center ];
-		}
-		pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center;
-		pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center;
-		options[ this ] = pos;
-	});
-
-	// normalize collision option
-	if ( collision.length === 1 ) {
-		collision[ 1 ] = collision[ 0 ];
-	}
-
-	// normalize offset option
-	offset[ 0 ] = parseInt( offset[0], 10 ) || 0;
-	if ( offset.length === 1 ) {
-		offset[ 1 ] = offset[ 0 ];
-	}
-	offset[ 1 ] = parseInt( offset[1], 10 ) || 0;
-
-	if ( options.at[0] === "right" ) {
-		basePosition.left += targetWidth;
-	} else if (options.at[0] === center ) {
-		basePosition.left += targetWidth / 2;
-	}
-
-	if ( options.at[1] === "bottom" ) {
-		basePosition.top += targetHeight;
-	} else if ( options.at[1] === center ) {
-		basePosition.top += targetHeight / 2;
-	}
-
-	basePosition.left += offset[ 0 ];
-	basePosition.top += offset[ 1 ];
-
-	return this.each(function() {
-		var elem = $( this ),
-			elemWidth = elem.outerWidth(),
-			elemHeight = elem.outerHeight(),
-			marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0,
-			marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0,
-			collisionWidth = elemWidth + marginLeft +
-				parseInt( $.curCSS( this, "marginRight", true ) ) || 0,
-			collisionHeight = elemHeight + marginTop +
-				parseInt( $.curCSS( this, "marginBottom", true ) ) || 0,
-			position = $.extend( {}, basePosition ),
-			collisionPosition;
-
-		if ( options.my[0] === "right" ) {
-			position.left -= elemWidth;
-		} else if ( options.my[0] === center ) {
-			position.left -= elemWidth / 2;
-		}
-
-		if ( options.my[1] === "bottom" ) {
-			position.top -= elemHeight;
-		} else if ( options.my[1] === center ) {
-			position.top -= elemHeight / 2;
-		}
-
-		// prevent fractions (see #5280)
-		position.left = parseInt( position.left );
-		position.top = parseInt( position.top );
-
-		collisionPosition = {
-			left: position.left - marginLeft,
-			top: position.top - marginTop
-		};
-
-		$.each( [ "left", "top" ], function( i, dir ) {
-			if ( $.ui.position[ collision[i] ] ) {
-				$.ui.position[ collision[i] ][ dir ]( position, {
-					targetWidth: targetWidth,
-					targetHeight: targetHeight,
-					elemWidth: elemWidth,
-					elemHeight: elemHeight,
-					collisionPosition: collisionPosition,
-					collisionWidth: collisionWidth,
-					collisionHeight: collisionHeight,
-					offset: offset,
-					my: options.my,
-					at: options.at
-				});
-			}
-		});
-
-		if ( $.fn.bgiframe ) {
-			elem.bgiframe();
+* jQuery Mobile Framework: "controlgroup" plugin - corner-rounding for groups of buttons, checks, radios, etc
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
+(function($, undefined ) {
+$.fn.controlgroup = function(options){
+		
+	return this.each(function(){
+		var o = $.extend({
+			direction: $( this ).data( "type" ) || "vertical",
+			shadow: false
+		},options);
+		var groupheading = $(this).find('>legend'),
+			flCorners = o.direction == 'horizontal' ? ['ui-corner-left', 'ui-corner-right'] : ['ui-corner-top', 'ui-corner-bottom'],
+			type = $(this).find('input:eq(0)').attr('type');
+		
+		//replace legend with more stylable replacement div	
+		if( groupheading.length ){
+			$(this).wrapInner('<div class="ui-controlgroup-controls"></div>');	
+			$('<div role="heading" class="ui-controlgroup-label">'+ groupheading.html() +'</div>').insertBefore( $(this).children(0) );	
+			groupheading.remove();	
 		}
-		elem.offset( $.extend( position, { using: options.using } ) );
-	});
-};
 
-$.ui.position = {
-	fit: {
-		left: function( position, data ) {
-			var win = $( window ),
-				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft();
-			position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left );
-		},
-		top: function( position, data ) {
-			var win = $( window ),
-				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop();
-			position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top );
+		$(this).addClass('ui-corner-all ui-controlgroup ui-controlgroup-'+o.direction);
+		
+		function flipClasses(els){
+			els
+				.removeClass('ui-btn-corner-all ui-shadow')
+				.eq(0).addClass(flCorners[0])
+				.end()
+				.filter(':last').addClass(flCorners[1]).addClass('ui-controlgroup-last');
 		}
-	},
-
-	flip: {
-		left: function( position, data ) {
-			if ( data.at[0] === center ) {
-				return;
-			}
-			var win = $( window ),
-				over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(),
-				myOffset = data.my[ 0 ] === "left" ?
-					-data.elemWidth :
-					data.my[ 0 ] === "right" ?
-						data.elemWidth :
-						0,
-				atOffset = data.at[ 0 ] === "left" ?
-					data.targetWidth :
-					-data.targetWidth,
-				offset = -2 * data.offset[ 0 ];
-			position.left += data.collisionPosition.left < 0 ?
-				myOffset + atOffset + offset :
-				over > 0 ?
-					myOffset + atOffset + offset :
-					0;
-		},
-		top: function( position, data ) {
-			if ( data.at[1] === center ) {
-				return;
-			}
-			var win = $( window ),
-				over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(),
-				myOffset = data.my[ 1 ] === "top" ?
-					-data.elemHeight :
-					data.my[ 1 ] === "bottom" ?
-						data.elemHeight :
-						0,
-				atOffset = data.at[ 1 ] === "top" ?
-					data.targetHeight :
-					-data.targetHeight,
-				offset = -2 * data.offset[ 1 ];
-			position.top += data.collisionPosition.top < 0 ?
-				myOffset + atOffset + offset :
-				over > 0 ?
-					myOffset + atOffset + offset :
-					0;
+		flipClasses($(this).find('.ui-btn'));
+		flipClasses($(this).find('.ui-btn-inner'));
+		if(o.shadow){
+			$(this).addClass('ui-shadow');
 		}
-	}
+	});	
 };
+})(jQuery);
 
-// offset setter from jQuery 1.4
-if ( !$.offset.setOffset ) {
-	$.offset.setOffset = function( elem, options ) {
-		// set position first, in-case top/left are set even on static elem
-		if ( /static/.test( $.curCSS( elem, "position" ) ) ) {
-			elem.style.position = "relative";
-		}
-		var curElem   = $( elem ),
-			curOffset = curElem.offset(),
-			curTop    = parseInt( $.curCSS( elem, "top",  true ), 10 ) || 0,
-			curLeft   = parseInt( $.curCSS( elem, "left", true ), 10)  || 0,
-			props     = {
-				top:  (options.top  - curOffset.top)  + curTop,
-				left: (options.left - curOffset.left) + curLeft
-			};
+/*
+* jQuery Mobile Framework : "dialog" plugin.
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change
+*/
+(function($, undefined ) {
+$.widget( "mobile.dialog", $.mobile.widget, {
+	options: {},
+	_create: function(){
+		var self = this,
+			$el = self.element;
 		
-		if ( 'using' in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	};
-
-	$.fn.offset = function( options ) {
-		var elem = this[ 0 ];
-		if ( !elem || !elem.ownerDocument ) { return null; }
-		if ( options ) { 
-			return this.each(function() {
-				$.offset.setOffset( this, options );
+		/* class the markup for dialog styling */	
+		this.element			
+			//add ARIA role
+			.attr("role","dialog")
+			.addClass('ui-page ui-dialog ui-body-a')
+			.find('[data-role=header]')
+			.addClass('ui-corner-top ui-overlay-shadow')
+				.prepend( '<a href="#" data-icon="delete" data-rel="back" data-iconpos="notext">Close</a>' )
+			.end()
+			.find('.ui-content:not([class*="ui-body-"])')
+				.addClass('ui-body-c')
+			.end()
+			.find('.ui-content,[data-role=footer]')
+				.last()
+				.addClass('ui-corner-bottom ui-overlay-shadow');
+		
+		/* bind events 
+			- clicks and submits should use the closing transition that the dialog opened with
+			  unless a data-transition is specified on the link/form
+			- if the click was on the close button, or the link has a data-rel="back" it'll go back in history naturally
+		*/
+		this.element		
+			.bind( "click submit", function(e){
+				var $targetel;
+				if( e.type == "click" ){
+					$targetel = $(e.target).closest("a");
+				}
+				else{
+					$targetel = $(e.target).closest("form");
+				}
+				
+				if( $targetel.length && !$targetel.data("transition") ){
+					$targetel
+						.attr("data-transition", $.mobile.urlHistory.getActive().transition )
+						.attr("data-direction", "reverse");
+				}
 			});
-		}
-		return _offset.call( this );
-	};
-}
 
-}( jQuery ));
+	},
+	
+	//close method goes back in history
+	close: function(){
+		window.history.back();
+	}
+});
+})( jQuery );
+
+/*
+* jQuery Mobile Framework : "fieldcontain" plugin - simple class additions to make form row separators
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
+(function($, undefined ) {
+$.fn.fieldcontain = function(options){
+	return this.addClass('ui-field-contain ui-body ui-br');
+};
+})(jQuery);
 
 /*
 * jQuery Mobile Framework : "fixHeaderFooter" plugin - on-demand positioning for headers,footers
@@ -2238,18 +2628,23 @@ if ( !$.offset.setOffset ) {
 */
 (function($, undefined ) {
 $.fn.fixHeaderFooter = function(options){
-	if( !$.support.scrollTop ){ return $(this); }
-	return $(this).each(function(){
-		if( $(this).data('fullscreen') ){ $(this).addClass('ui-page-fullscreen'); }
-		$(this).find('.ui-header[data-position="fixed"]').addClass('ui-header-fixed ui-fixed-inline fade'); //should be slidedown
-		$(this).find('.ui-footer[data-position="fixed"]').addClass('ui-footer-fixed ui-fixed-inline fade'); //should be slideup		
+	if( !$.support.scrollTop ){ return this; }
+	
+	return this.each(function(){
+		var $this = $(this);
+		
+		if( $this.data('fullscreen') ){ $this.addClass('ui-page-fullscreen'); }
+		$this.find('.ui-header[data-position="fixed"]').addClass('ui-header-fixed ui-fixed-inline fade'); //should be slidedown
+		$this.find('.ui-footer[data-position="fixed"]').addClass('ui-footer-fixed ui-fixed-inline fade'); //should be slideup		
 	});
-};				
+};
 
 //single controller for all showing,hiding,toggling		
 $.fixedToolbars = (function(){
 	if( !$.support.scrollTop ){ return; }
 	var currentstate = 'inline',
+		autoHideMode = false,
+		showDelay = 100,
 		delayTimer,
 		ignoreTargets = 'a,input,textarea,select,button,label,.ui-header-fixed,.ui-footer-fixed',
 		toolbarSelector = '.ui-header-fixed:first, .ui-footer-fixed:not(.ui-footer-duplicate):last',
@@ -2261,6 +2656,24 @@ $.fixedToolbars = (function(){
 		scrollTriggered = false,
         touchToggleEnabled = true;
 
+	function showEventCallback(event)
+	{
+		// An event that affects the dimensions of the visual viewport has
+		// been triggered. If the header and/or footer for the current page are in overlay
+		// mode, we want to hide them, and then fire off a timer to show them at a later
+		// point. Events like a resize can be triggered continuously during a scroll, on
+		// some platforms, so the timer is used to delay the actual positioning until the
+		// flood of events have subsided.
+		//
+		// If we are in autoHideMode, we don't do anything because we know the scroll
+		// callbacks for the plugin will fire off a show when the scrolling has stopped.
+		if (!autoHideMode && currentstate == 'overlay') {
+			if (!delayTimer)
+				$.fixedToolbars.hide(true);
+			$.fixedToolbars.startShowTimer();
+		}
+	}
+
 	$(function() {
 		$(document)
 			.bind(touchStartEvent,function(event){
@@ -2269,14 +2682,6 @@ $.fixedToolbars = (function(){
 					stateBefore = currentstate;
 				}
 			})
-			.bind('scrollstart',function(event){
-				if( $(event.target).closest(ignoreTargets).length ){ return; } //because it could be a touchmove...
-				scrollTriggered = true;
-				if(stateBefore == null){ stateBefore = currentstate; }
-				if (stateBefore == 'overlay') {
-					$.fixedToolbars.hide(true);
-				}
-			})
 			.bind(touchStopEvent,function(event){
 				if( touchToggleEnabled ) {
 					if( $(event.target).closest(ignoreTargets).length ){ return; }
@@ -2286,21 +2691,44 @@ $.fixedToolbars = (function(){
 					}
 				}
 			})
+			.bind('scrollstart',function(event){
+				if( $(event.target).closest(ignoreTargets).length ){ return; } //because it could be a touchmove...
+				scrollTriggered = true;
+				if(stateBefore == null){ stateBefore = currentstate; }
+
+				// We only enter autoHideMode if the headers/footers are in
+				// an overlay state or the show timer was started. If the
+				// show timer is set, clear it so the headers/footers don't
+				// show up until after we're done scrolling.
+				var isOverlayState = stateBefore == 'overlay';
+				autoHideMode = isOverlayState || !!delayTimer;
+				if (autoHideMode){
+					$.fixedToolbars.clearShowTimer();
+					if (isOverlayState) {
+						$.fixedToolbars.hide(true);
+					}
+				}
+			})
 			.bind('scrollstop',function(event){
 				if( $(event.target).closest(ignoreTargets).length ){ return; }
 				scrollTriggered = false;
-				if (stateBefore == 'overlay') {
-					$.fixedToolbars.show();
+				if (autoHideMode) {
+					autoHideMode = false;
+					$.fixedToolbars.startShowTimer();
 				}
 				stateBefore = null;
-			});
+			})
+			.bind('silentscroll', showEventCallback);
+
+			$(window).bind('resize', showEventCallback);
 	});
 		
 	//before page is shown, check for duplicate footer
 	$('.ui-page').live('pagebeforeshow', function(event, ui){
-		var page = $(event.target);
-		var footer = page.find('[data-role="footer"]:not(.ui-sticky-footer)');
-		var id = footer.data('id');
+		var page = $(event.target),
+			footer = page.find('[data-role="footer"]:not(.ui-sticky-footer)'),
+			id = footer.data('id');
+		stickyFooter = null;
 		if (id)
 		{
 			stickyFooter = $('.ui-footer[data-id="' + id + '"].ui-sticky-footer');
@@ -2380,6 +2808,7 @@ $.fixedToolbars = (function(){
 	//exposed methods
 	return {
 		show: function(immediately, page){
+			$.fixedToolbars.clearShowTimer();
 			currentstate = 'overlay';
 			var $ap = page ? $(page) : ($.mobile.activePage ? $.mobile.activePage : $(".ui-page-active"));
 			return $ap.children( toolbarSelector ).each(function(){
@@ -2428,23 +2857,98 @@ $.fixedToolbars = (function(){
 					}
 				}
 			});
-		},
-		hideAfterDelay: function(){
-			delayTimer = setTimeout(function(){
-				$.fixedToolbars.hide();
-			}, 3000);
-		},
-		toggle: function(from){
-			if(from){ currentstate = from; }
-			return (currentstate == 'overlay') ? $.fixedToolbars.hide() : $.fixedToolbars.show();
-		},
-        setTouchToggleEnabled: function(enabled) {
-            touchToggleEnabled = enabled;
-        }
-	};
-})();
+		},
+		startShowTimer: function(){
+			$.fixedToolbars.clearShowTimer();
+			var args = $.makeArray(arguments);
+			delayTimer = setTimeout(function(){
+				delayTimer = undefined;
+				$.fixedToolbars.show.apply(null, args);
+			}, showDelay);
+		},
+		clearShowTimer: function() {
+			if (delayTimer) {
+				clearTimeout(delayTimer);
+			}
+			delayTimer = undefined;
+		},
+		toggle: function(from){
+			if(from){ currentstate = from; }
+			return (currentstate == 'overlay') ? $.fixedToolbars.hide() : $.fixedToolbars.show();
+		},
+        setTouchToggleEnabled: function(enabled) {
+            touchToggleEnabled = enabled;
+        }
+	};
+})();
+
+})(jQuery);
+
+/*
+* jQuery Mobile Framework : "button" plugin - links that proxy to native input/buttons
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/ 
+(function($, undefined ) {
+$.widget( "mobile.button", $.mobile.widget, {
+	options: {
+		theme: null, 
+		icon: null,
+		iconpos: null,
+		inline: null,
+		corners: true,
+		shadow: true,
+		iconshadow: true
+	},
+	_create: function(){
+		var $el = this.element,
+			o = this.options;
+		
+		//add ARIA role
+		this.button = $( "<div></div>" )
+			.text( $el.text() || $el.val() )
+			.buttonMarkup({
+				theme: o.theme, 
+				icon: o.icon,
+				iconpos: o.iconpos,
+				inline: o.inline,
+				corners: o.corners,
+				shadow: o.shadow,
+				iconshadow: o.iconshadow
+			})
+			.insertBefore( $el )
+			.append( $el.addClass('ui-btn-hidden') );
+		
+		//add hidden input during submit
+		if( $el.attr('type') !== 'reset' ){
+			$el.click(function(){
+				var $buttonPlaceholder = $("<input>", 
+						{type: "hidden", name: $el.attr("name"), value: $el.attr("value")})
+						.insertBefore($el);
+						
+				//bind to doc to remove after submit handling	
+				$(document).submit(function(){
+					 $buttonPlaceholder.remove();
+				});
+			});
+		}
+			
+	},
 
-})(jQuery);
+	enable: function(){
+		this.element.attr("disabled", false);
+		this.button.removeClass("ui-disabled").attr("aria-disabled", false);
+		return this._setOption("disabled", false);
+	},
+
+	disable: function(){
+		this.element.attr("disabled", true);
+		this.button.addClass("ui-disabled").attr("aria-disabled", true);
+		return this._setOption("disabled", true);
+	}
+});
+})( jQuery );
 
 /*
 * jQuery Mobile Framework : "checkboxradio" plugin
@@ -2458,8 +2962,9 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 		theme: null
 	},
 	_create: function(){
-		var input = this.element,
-			label = $("label[for='" + input.attr( "id" ) + "']"),
+		var self = this,
+			input = this.element,
+			label = input.closest("form,fieldset,[data-role='page']").find("label[for='" + input.attr( "id" ) + "']"),
 			inputtype = input.attr( "type" ),
 			checkedicon = "ui-icon-" + inputtype + "-on",
 			uncheckedicon = "ui-icon-" + inputtype + "-off";
@@ -2488,25 +2993,25 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 				if( $(this).parent().is('.ui-disabled') ){ return false; }
 			},
 			
-			mousedown: function() {
-				if( $(this).parent().is('.ui-disabled') ){ return false; }
-				label.data( "state", input.attr( "checked" ) );
+			"tap": function( event ){
+				self._cacheVals();
+				input.attr( "checked", inputtype === "radio" && true || !input.is( ":checked" ) );
+				self._updateAll();
+				event.preventDefault();
 			},
 			
-			click: function() {
-				setTimeout(function() {
-					if ( input.attr( "checked" ) === label.data( "state" ) ) {
-						input.trigger( "click" );
-					}
-				}, 1);
-			}
+			click: false
+			
 		});
 		
 		input
 			.bind({
-
-				click: function() {
-					$( "input[name='" + input.attr( "name" ) + "'][type='" + inputtype + "']" ).checkboxradio( "refresh" );
+				mousedown: function(){
+					this._cacheVals();
+				},
+				
+				click: function(){
+					self._updateAll();
 				},
 
 				focus: function() { 
@@ -2522,9 +3027,31 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 		
 	},
 	
+	_cacheVals: function(){
+		this._getInputSet().each(function(){
+			$(this).data("cacheVal", $(this).is(":checked") );
+		});	
+	},
+		
+	//returns either a set of radios with the same name attribute, or a single checkbox
+	_getInputSet: function(){
+		return this.element.closest( "form,fieldset,[data-role='page']" )
+				.find( "input[name='"+ this.element.attr( "name" ) +"'][type='"+ this.element.attr( "type" ) +"']" );
+	},
+	
+	_updateAll: function(){
+		this._getInputSet().each(function(){
+			var dVal = $(this).data("cacheVal");
+			if( dVal && dVal !== $(this).is(":checked") || $(this).is( "[type='checkbox']" ) ){
+				$(this).trigger("change");
+			}
+		})
+		.checkboxradio( "refresh" );
+	},
+	
 	refresh: function( ){
 		var input = this.element,
-			label = $("label[for='" + input.attr( "id" ) + "']"),
+			label = input.closest("form,fieldset,[data-role='page']").find("label[for='" + input.attr( "id" ) + "']"),
 			inputtype = input.attr( "type" ),
 			icon = label.find( ".ui-icon" ),
 			checkedicon = "ui-icon-" + inputtype + "-on",
@@ -2560,116 +3087,17 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 })( jQuery );
 
 
-/*
-* jQuery Mobile Framework : "textinput" plugin for text inputs, textareas
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/
-(function($, undefined ) {
-$.widget( "mobile.textinput", $.mobile.widget, {
-	options: {
-		theme: null
-	},
-	_create: function(){
-		var input = this.element,
-			o = this.options,
-			theme = o.theme,
-			themeclass;
-			
-		if ( !theme ) {
-			var themedParent = this.element.closest("[class*='ui-bar-'],[class*='ui-body-']"); 
-				theme = themedParent.length ?
-					/ui-(bar|body)-([a-z])/.exec( themedParent.attr("class") )[2] :
-					"c";
-		}	
-		
-		themeclass = " ui-body-" + theme;
-		
-		$('label[for='+input.attr('id')+']').addClass('ui-input-text');
-		
-		input.addClass('ui-input-text ui-body-'+ o.theme);
-		
-		var focusedEl = input;
-		
-		//"search" input widget
-		if( input.is('[type="search"],[data-type="search"]') ){
-			focusedEl = input.wrap('<div class="ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-search'+ themeclass +'"></div>').parent();
-			var clearbtn = $('<a href="#" class="ui-input-clear" title="clear text">clear text</a>')
-				.click(function(){
-					input.val('').focus();
-					input.trigger('change'); 
-					clearbtn.addClass('ui-input-clear-hidden');
-					return false;
-				})
-				.appendTo(focusedEl)
-				.buttonMarkup({icon: 'delete', iconpos: 'notext', corners:true, shadow:true});
-			
-			function toggleClear(){
-				if(input.val() == ''){
-					clearbtn.addClass('ui-input-clear-hidden');
-				}
-				else{
-					clearbtn.removeClass('ui-input-clear-hidden');
-				}
-			}
-			
-			toggleClear();
-			input.keyup(toggleClear);	
-		}
-		else{
-			input.addClass('ui-corner-all ui-shadow-inset' + themeclass);
-		}
-				
-		input
-			.focus(function(){
-				focusedEl.addClass('ui-focus');
-			})
-			.blur(function(){
-				focusedEl.removeClass('ui-focus');
-			});	
-			
-		//autogrow
-		if ( input.is('textarea') ) {
-			var extraLineHeight = 15,
-				keyupTimeoutBuffer = 100,
-				keyup = function() {
-					var scrollHeight = input[0].scrollHeight,
-						clientHeight = input[0].clientHeight;
-					if ( clientHeight < scrollHeight ) {
-						input.css({ height: (scrollHeight + extraLineHeight) });
-					}
-				},
-				keyupTimeout;
-			input.keyup(function() {
-				clearTimeout( keyupTimeout );
-				keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer );
-			});
-		}
-	},
-	
-	disable: function(){
-		( this.element.attr("disabled",true).is('[type="search"],[data-type="search"]') ? this.element.parent() : this.element ).addClass("ui-disabled");
-	},
-	
-	enable: function(){
-		( this.element.attr("disabled", false).is('[type="search"],[data-type="search"]') ? this.element.parent() : this.element ).removeClass("ui-disabled");
-	}
-});
-})( jQuery );
-
-
 /*
 * jQuery Mobile Framework : "selectmenu" plugin
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
-*/  
+*/
 (function($, undefined ) {
 $.widget( "mobile.selectmenu", $.mobile.widget, {
 	options: {
 		theme: null,
-		disabled: false, 
+		disabled: false,
 		icon: 'arrow-d',
 		iconpos: 'right',
 		inline: null,
@@ -2679,43 +3107,43 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 		menuPageTheme: 'b',
 		overlayTheme: 'a',
 		hidePlaceholderMenuItems: true,
-		closeText: 'Close'
+		closeText: 'Close',
+		useNativeMenu: false
 	},
 	_create: function(){
-	
+
 		var self = this,
-			
+
 			o = this.options,
-			
+
 			select = this.element
-						.attr( "tabindex", "-1" )
 						.wrap( "<div class='ui-select'>" ),
-							
+
 			selectID = select.attr( "id" ),
-			
+
 			isMultiple = self.isMultiple = select[0].multiple,
-			
+
 			options = select.find("option"),
-			
+
 			label = $( "label[for="+ selectID +"]" ).addClass( "ui-select" ),
-			
+
 			buttonId = selectID + "-button",
-			
+
 			menuId = selectID + "-menu",
-			
+
 			thisPage = select.closest( ".ui-page" ),
-			
-			button = $( "<a>", { 
+
+			button = $( "<a>", {
 					"href": "#",
 					"role": "button",
 					"id": buttonId,
 					"aria-haspopup": "true",
-					"aria-owns": menuId 
+					"aria-owns": menuId
 				})
 				.text( $( select[0].options.item(select[0].selectedIndex) ).text() )
 				.insertBefore( select )
 				.buttonMarkup({
-					theme: o.theme, 
+					theme: o.theme,
 					icon: o.icon,
 					iconpos: o.iconpos,
 					inline: o.inline,
@@ -2723,9 +3151,9 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 					shadow: o.shadow,
 					iconshadow: o.iconshadow
 				}),
-			
+
 			theme = /ui-btn-up-([a-z])/.exec( button.attr("class") )[1],
-				
+
 			menuPage = $( "<div data-role='dialog' data-theme='"+ o.menuPageTheme +"'>" +
 						"<div data-role='header'>" +
 							"<div class='ui-title'>" + label.text() + "</div>"+
@@ -2733,46 +3161,52 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 						"<div data-role='content'></div>"+
 					"</div>" )
 					.appendTo( $.mobile.pageContainer )
-					.page(),	
-					
+					.page(),
+
 			menuPageContent = menuPage.find( ".ui-content" ),
-			
+
 			menuPageClose = menuPage.find( ".ui-header a" ),
-					
+
 			screen = $( "<div>", {"class": "ui-selectmenu-screen ui-screen-hidden"})
-						.appendTo( thisPage ),		
-								
+						.appendTo( thisPage ),
+
 			listbox = $( "<div>", { "class": "ui-selectmenu ui-selectmenu-hidden ui-overlay-shadow ui-corner-all pop ui-body-" + o.overlayTheme } )
 					.insertAfter(screen),
-					
-			list = $( "<ul>", { 
-					"class": "ui-selectmenu-list", 
-					"id": menuId, 
-					"role": "listbox", 
+
+			list = $( "<ul>", {
+					"class": "ui-selectmenu-list",
+					"id": menuId,
+					"role": "listbox",
 					"aria-labelledby": buttonId,
 					"data-theme": theme
 				})
 				.appendTo( listbox ),
-			
+
 			header = $( "<div>", {
-					"data-role": "header",
-					"data-nobackbtn": true
+					"class": "ui-header ui-bar-" + theme
 				})
 				.prependTo( listbox ),
-				
-			headerTitle = $( "<h1>" )
+
+			headerTitle = $( "<h1>", {
+					"class": "ui-title"
+				})
 				.appendTo( header ),
-				
+
 			headerClose = $( "<a>", {
 					"data-iconpos": "notext",
 					"data-icon": "delete",
 					"text": o.closeText,
-					"href": "#"
+					"href": "#",
+					"class": "ui-btn-left"
 				})
-				.appendTo( header ),
-				
+				.appendTo( header )
+				.buttonMarkup(),
+
 			menuType;
-		
+
+		// set to native menu
+		o.useNativeMenu = $.mobile.nativeSelectMenus || select.is( "[data-native]" );
+
 		// add counter for multi selects
 		if( isMultiple ){
 			self.buttonCount = $('<span>')
@@ -2780,10 +3214,11 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 				.hide()
 				.appendTo( button );
 		}
-		
+
 		//expose to other methods
 		$.extend(self, {
 			select: select,
+			optionElems: options,
 			selectID: selectID,
 			label: label,
 			buttonId:buttonId,
@@ -2801,44 +3236,92 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 			headerTitle:headerTitle,
 			placeholder: ''
 		});
-		
+
 		//create list from select, update state
 		self.refresh();
-		
+
 		//disable if specified
 		if( o.disabled ){ this.disable(); }
 
-		//events on native select
-		select
-			.change(function(){ 
-				self.refresh();
-			})
-			.focus(function(){
-				$(this).blur();
-				button.focus();
-			});
-		
-		//button events
-		button.bind( $.support.touch ? "touchstart" : "click", function(event){
-			self.open();
-			event.preventDefault();
-		});
-		
+		//events on native select
+		select
+			.change(function(){
+				self.refresh();
+			});
+
+		//support for using the native select menu with a custom button
+		if( o.useNativeMenu ){
+
+			select
+				.appendTo(button)
+				.bind( "touchstart mousedown", function( e ){
+					//add active class to button
+					button.addClass( $.mobile.activeBtnClass );
+
+					//ensure button isn't clicked
+					e.stopPropagation();
+				})
+				.bind( "focus mouseover", function(){
+					button.trigger( "mouseover" );
+				})
+				.bind( "blur mouseout", function(){
+					button
+						.trigger( "mouseout" )
+						.removeClass( $.mobile.activeBtnClass );
+				});
+
+			button.attr( "tabindex", "-1" );
+		} else {
+
+			select
+				.attr( "tabindex", "-1" )
+				.focus(function(){
+					$(this).blur();
+					button.focus();
+				});
+
+			//button events
+			button
+				.bind( "touchstart" , function( event ){
+					//set startTouches to cached copy of
+					$( this ).data( "startTouches", $.extend({}, event.originalEvent.touches[ 0 ]) );
+				})
+				.bind( $.support.touch ? "touchend" : "mouseup" , function( event ){
+					//if it's a scroll, don't open
+					if( $( this ).data( "moved" ) ){
+						$( this ).removeData( "moved" );
+					} else {
+						self.open();
+					}
+					event.preventDefault();
+				})
+				.bind( "touchmove", function( event ){
+					//if touch moved enough, set data moved and don't open menu
+					var thisTouches = event.originalEvent.touches[ 0 ],
+					startTouches = $( this ).data( "startTouches" ),
+					deltaX = Math.abs(thisTouches.pageX - startTouches.pageX),
+					deltaY = Math.abs(thisTouches.pageY - startTouches.pageY);
+
+					if( deltaX > 10 || deltaY > 10 ){
+						$( this ).data( "moved", true );
+					}
+				});
+		}
+
 		//events for list items
 		list.delegate("li:not(.ui-disabled, .ui-li-divider)", "click", function(event){
-			
 			// clicking on the list item fires click on the link in listview.js.
 			// to prevent this handler from firing twice if the link isn't clicked on,
 			// short circuit unless the target is the link
 			if( !$(event.target).is("a") ){ return; }
 
-			// index of option tag to be selected 
+			// index of option tag to be selected
 			var newIndex = list.find( "li:not(.ui-li-divider)" ).index( this ),
-				option = options.eq( newIndex )[0];
-			
+				option = self.optionElems.eq( newIndex )[0];
+
 			// toggle selected status on the tag for multi selects
 			option.selected = isMultiple ? !option.selected : true;
-			
+
 			// toggle checkbox class for multiple selects
 			if( isMultiple ){
 				$(this)
@@ -2846,141 +3329,144 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 					.toggleClass('ui-icon-checkbox-on', option.selected)
 					.toggleClass('ui-icon-checkbox-off', !option.selected);
 			}
-			
+
 			// trigger change
-			select.trigger( "change" ); 
-			
+			select.trigger( "change" );
+
 			//hide custom select for single selects only
 			if( !isMultiple ){
 				self.close();
 			}
-			
+
 			event.preventDefault();
 		});
-		
+
 		//events on "screen" overlay + close button
-		screen.add( headerClose ).add( menuPageClose ).click(function(event){
-			self.close();
-			event.preventDefault();
-			
-			// if the dialog's close icon was clicked, prevent the dialog's close
-			// handler from firing. selectmenu's should take precedence
-			if( $.contains(menuPageClose[0], event.target) ){
-				event.stopImmediatePropagation();
-			}
-		});
+		screen
+			.add( headerClose )
+			.add( menuPageClose )
+			.bind("click", function(event){
+				self.close();
+				event.preventDefault();
+
+				// if the dialog's close icon was clicked, prevent the dialog's close
+				// handler from firing. selectmenu's should take precedence
+				if( $.contains(menuPageClose[0], event.target) ){
+					event.stopImmediatePropagation();
+				}
+			});
 	},
-	
+
 	_buildList: function(){
-		var self = this, 
+		var self = this,
 			optgroups = [],
 			o = this.options,
 			placeholder = this.placeholder;
-		
+
 		self.list.empty().filter('.ui-listview').listview('destroy');
-		
+
 		//populate menu with options from select element
 		self.select.find( "option" ).each(function( i ){
 			var $this = $(this),
 				$parent = $this.parent(),
 				text = $this.text();
-			
+
 			// are we inside an optgroup?
 			if( $parent.is("optgroup") ){
 				var optLabel = $parent.attr("label");
-				
+
 				// has this optgroup already been built yet?
 				if( $.inArray(optLabel, optgroups) === -1 ){
 					$("<li>", {
 						"data-role":"list-divider",
 						"text": optLabel
 					}).appendTo( self.list );
-					
+
 					optgroups.push( optLabel );
 				}
 			}
-			
-			var anchor = $("<a>", { 
-				"role": "", 
+
+			var anchor = $("<a>", {
+				"role": "",
 				"href": "#",
 				"text": text
 			}),
-		
+
 			item = $( "<li>", { "data-icon": false });
-			
+
 			if( !this.getAttribute('value') || text.length == 0 || $this.data('placeholder') ){
 				if( o.hidePlaceholderMenuItems ){
 					item.addClass('ui-selectmenu-placeholder');
 				}
-				
+
 				placeholder = self.placeholder = text;
 			}
-		
+
 			// multiple select defaults
 			if( self.isMultiple ){
 				item.data('icon', 'checkbox-off');
 			}
-			
+
 			// support disabled option tags
 			if( this.disabled ){
 				item.addClass("ui-disabled")
 					.attr("aria-disabled", true);
 			}
-			
+
 			item
 				.append( anchor )
 				.appendTo( self.list );
 		});
-		
+
 		// hide header close link for single selects
 		if( !this.isMultiple ){
 			this.headerClose.hide();
 		}
-		
+
 		// hide header if it's not a multiselect and there's no placeholder
 		if( !this.isMultiple && !placeholder.length ){
 			this.header.hide();
 		} else {
 			this.headerTitle.text( this.placeholder );
 		}
-		
+
 		//now populated, create listview
 		self.list.listview();
 	},
-	
+
 	refresh: function( forceRebuild ){
 		var self = this,
 			select = this.element,
 			isMultiple = this.isMultiple,
-			options = select.find("option"),
+			options = this.optionElems = select.find("option"),
 			selected = options.filter(":selected"),
-			
+
 			// return an array of all selected index's
 			indicies = selected.map(function(){
 				return options.index( this );
 			}).get();
-		
+
 		if( forceRebuild || select[0].options.length > self.list.find('li').length ){
 			self._buildList();
 		}
-		
+
 		self.button
 			.find( ".ui-btn-text" )
 			.text(function(){
 				if( !isMultiple ){
 					return selected.text();
 				}
-				
+
 				return selected.length ?
 					selected.map(function(){ return $(this).text(); }).get().join(', ') :
 					self.placeholder;
 			});
-		
+
 		// multiple count inside button
 		if( isMultiple ){
 			self.buttonCount[ selected.length > 1 ? 'show' : 'hide' ]().text( selected.length );
 		}
-		
+
 		self.list
 			.find( 'li:not(.ui-li-divider)' )
 			.removeClass( $.mobile.activeBtnClass )
@@ -2988,10 +3474,10 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 			.each(function( i ){
 				if( $.inArray(i, indicies) > -1 ){
 					var item = $(this).addClass( $.mobile.activeBtnClass );
-					
+
 					// aria selected attr
 					item.find( 'a' ).attr( 'aria-selected', true );
-					
+
 					// multiple selects: add the "on" checkbox state to the icon
 					if( isMultiple ){
 						item.find('.ui-icon').removeClass('ui-icon-checkbox-off').addClass('ui-icon-checkbox-on');
@@ -2999,280 +3485,130 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 				}
 			});
 	},
-	
+
 	open: function(){
 		if( this.options.disabled ){ return; }
-		
+
 		var self = this,
 			menuHeight = self.list.outerHeight(),
 			menuWidth = self.list.outerWidth(),
 			scrollTop = $(window).scrollTop(),
 			btnOffset = self.button.offset().top,
 			screenHeight = window.innerHeight,
-			screenWidth = window.innerWidth;
-			
+			screenWidth = window.innerWidth,
+			dialogUsed = self.list.parents('.ui-dialog').length;
+
 		//add active class to button
 		self.button.addClass( $.mobile.activeBtnClass );
-			
+
 		function focusMenuItem(){
 			self.list.find( ".ui-btn-active" ).focus();
 		}
-		
-		if( menuHeight > screenHeight - 80 || !$.support.scrollTop ){
-			
+
+		// NOTE addresses issue with firefox outerHeight when the parent dialog
+		//      is display: none. Upstream?
+		if( dialogUsed || menuHeight > screenHeight - 80 || !$.support.scrollTop ){
+
 			//for webos (set lastscroll using button offset)
 			if( scrollTop == 0 && btnOffset > screenHeight ){
 				self.thisPage.one('pagehide',function(){
 					$(this).data('lastScroll', btnOffset);
-				});	
-			}
-			
-			self.menuPage.one('pageshow',focusMenuItem);
-		
-			self.menuType = "page";		
-			self.menuPageContent.append( self.list );
-			$.mobile.changePage(self.menuPage, 'pop', false, false);
-		}
-		else {
-			self.menuType = "overlay";
-						
-			self.screen
-				.height( $(document).height() )
-				.removeClass('ui-screen-hidden');
-				
-			self.listbox
-				.append( self.list )
-				.removeClass( "ui-selectmenu-hidden" )
-				.position({
-					my: "center center",
-					at: "center center",
-					of: self.button,
-					collision: "fit"
-				})
-				.addClass("in");
-				
-			focusMenuItem();	
-		}
-	},
-	
-	close: function(){
-		if( this.options.disabled ){ return; }
-		var self = this;
-		
-		function focusButton(){
-			setTimeout(function(){
-				self.button.focus();
-				
-				//remove active class from button
-				self.button.removeClass( $.mobile.activeBtnClass );
-			}, 40);
-			
-			self.listbox.removeAttr('style').append( self.list );
-		}
-		
-		if(self.menuType == "page"){
-			$.mobile.changePage([self.menuPage,self.thisPage], 'pop', true, false);
-			self.menuPage.one("pagehide", focusButton);
-		}
-		else{
-			self.screen.addClass( "ui-screen-hidden" );
-			self.listbox.addClass( "ui-selectmenu-hidden" ).removeAttr( "style" ).removeClass("in");
-			focusButton();
-		}
-		
-	},
-	
-	disable: function(){
-		this.element.attr("disabled",true);
-		this.button.addClass('ui-disabled').attr("aria-disabled", true);
-		return this._setOption( "disabled", true );
-	},
-	
-	enable: function(){
-		this.element.attr("disabled",false);
-		this.button.removeClass('ui-disabled').attr("aria-disabled", false);
-		return this._setOption( "disabled", false );
-	}
-});
-})( jQuery );
-	
-
-
-/*
-* jQuery Mobile Framework : plugin for making button-like links
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/ 
-(function($, undefined ) {
-
-$.fn.buttonMarkup = function( options ){
-	return this.each( function() {
-		var el = $( this ),
-		    o = $.extend( {}, $.fn.buttonMarkup.defaults, el.data(), options),
-
-			// Classes Defined
-			buttonClass,
-			innerClass = "ui-btn-inner",
-			iconClass;
-
-		if ( attachEvents ) {
-			attachEvents();
-		}
-
-		// if not, try to find closest theme container
-		if ( !o.theme ) {
-			var themedParent = el.closest("[class*='ui-bar-'],[class*='ui-body-']"); 
-			o.theme = themedParent.length ?
-				/ui-(bar|body)-([a-z])/.exec( themedParent.attr("class") )[2] :
-				"c";
-		}
-
-		buttonClass = "ui-btn ui-btn-up-" + o.theme;
-		
-		if ( o.inline ) {
-			buttonClass += " ui-btn-inline";
-		}
-		
-		if ( o.icon ) {
-			o.icon = "ui-icon-" + o.icon;
-			o.iconpos = o.iconpos || "left";
-
-			iconClass = "ui-icon " + o.icon;
-
-			if ( o.shadow ) {
-				iconClass += " ui-icon-shadow"
-			}
-		}
-
-		if ( o.iconpos ) {
-			buttonClass += " ui-btn-icon-" + o.iconpos;
-			
-			if ( o.iconpos == "notext" && !el.attr("title") ) {
-				el.attr( "title", el.text() );
+				});
 			}
-		}
-		
-		if ( o.corners ) { 
-			buttonClass += " ui-btn-corner-all";
-			innerClass += " ui-btn-corner-all";
-		}
-		
-		if ( o.shadow ) {
-			buttonClass += " ui-shadow";
-		}
-		
-		el
-			.attr( "data-theme", o.theme )
-			.addClass( buttonClass );
-
-		var wrap = ("<D class='" + innerClass + "'><D class='ui-btn-text'></D>" +
-			( o.icon ? "<span class='" + iconClass + "'></span>" : "" ) +
-			"</D>").replace(/D/g, o.wrapperEls);
-
-		el.wrapInner( wrap );
-	});		
-};
 
-$.fn.buttonMarkup.defaults = {
-	corners: true,
-	shadow: true,
-	iconshadow: true,
-	wrapperEls: "span"
-};
+			self.menuPage.one('pageshow',focusMenuItem);
 
-var attachEvents = function() {
-	$(".ui-btn:not(.ui-disabled)").live({
-		mousedown: function() {
-			var theme = $(this).attr( "data-theme" );
-			$(this).removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
-		},
-		mouseup: function() {
-			var theme = $(this).attr( "data-theme" );
-			$(this).removeClass( "ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
-		},
-		"mouseover focus": function() {
-			var theme = $(this).attr( "data-theme" );
-			$(this).removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
-		},
-		"mouseout blur": function() {
-			var theme = $(this).attr( "data-theme" );
-			$(this).removeClass( "ui-btn-hover-" + theme ).addClass( "ui-btn-up-" + theme );
+			self.menuType = "page";
+			self.menuPageContent.append( self.list );
+			$.mobile.changePage(self.menuPage, 'pop', false, false);
 		}
-	});
+		else {
+			self.menuType = "overlay";
 
-	attachEvents = null;
-};
+			self.screen
+				.height( $(document).height() )
+				.removeClass('ui-screen-hidden');
 
-})(jQuery);
+			//try and center the overlay over the button
+			var roomtop = btnOffset - scrollTop,
+				roombot = scrollTop + screenHeight - btnOffset,
+				halfheight = menuHeight / 2,
+				newtop,newleft;
+				
+				if( roomtop > menuHeight / 2 && roombot > menuHeight / 2 ){
+					newtop = btnOffset + ( self.button.outerHeight() / 2 ) - halfheight;
+				}
+				else{
+					//30px tolerance off the edges
+					newtop = roomtop > roombot ? scrollTop + screenHeight - menuHeight - 30 : scrollTop + 30;
+				}
+				
+				newleft = self.button.offset().left + self.button.outerWidth() / 2 - menuWidth / 2;
+				
 
+			self.listbox
+				.append( self.list )
+				.removeClass( "ui-selectmenu-hidden" )
+				.css({
+					top: newtop,
+					left: newleft
+				})
+				.addClass("in");
 
-/*
-* jQuery Mobile Framework : "button" plugin - links that proxy to native input/buttons
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/ 
-(function($, undefined ) {
-$.widget( "mobile.button", $.mobile.widget, {
-	options: {
-		theme: null, 
-		icon: null,
-		iconpos: null,
-		inline: null,
-		corners: true,
-		shadow: true,
-		iconshadow: true
-	},
-	_create: function(){
-		var $el = this.element,
-			o = this.options;
-		
-		//add ARIA role
-		this.button = $( "<div></div>" )
-			.text( $el.text() || $el.val() )
-			.buttonMarkup({
-				theme: o.theme, 
-				icon: o.icon,
-				iconpos: o.iconpos,
-				inline: o.inline,
-				corners: o.corners,
-				shadow: o.shadow,
-				iconshadow: o.iconshadow
-			})
-			.insertBefore( $el )
-			.append( $el.addClass('ui-btn-hidden') );
-		
-		//add hidden input during submit
-		if( $el.attr('type') !== 'reset' ){
-			$el.click(function(){
-				var $buttonPlaceholder = $("<input>", 
-						{type: "hidden", name: $el.attr("name"), value: $el.attr("value")})
-						.insertBefore($el);
-						
-				//bind to doc to remove after submit handling	
-				$(document).submit(function(){
-					 $buttonPlaceholder.remove();
-				});
-			});
+			focusMenuItem();
 		}
-			
+
+		// wait before the dialog can be closed
+		setTimeout(function(){
+		 	self.isOpen = true;
+		}, 400);
 	},
 
-	enable: function(){
-		this.element.attr("disabled", false);
-		this.button.removeClass("ui-disabled").attr("aria-disabled", false);
-		return this._setOption("disabled", false);
+	close: function(){
+		if( this.options.disabled || !this.isOpen ){ return; }
+		var self = this;
+
+		function focusButton(){
+			setTimeout(function(){
+				self.button.focus();
+
+				//remove active class from button
+				self.button.removeClass( $.mobile.activeBtnClass );
+			}, 40);
+
+			self.listbox.removeAttr('style').append( self.list );
+		}
+
+		if(self.menuType == "page"){
+			$.mobile.changePage([self.menuPage,self.thisPage], 'pop', true, false);
+			self.menuPage.one("pagehide", focusButton);
+		}
+		else{
+			self.screen.addClass( "ui-screen-hidden" );
+			self.listbox.addClass( "ui-selectmenu-hidden" ).removeAttr( "style" ).removeClass("in");
+			focusButton();
+		}
+
+		// allow the dialog to be closed again
+		this.isOpen = false;
 	},
 
 	disable: function(){
-		this.element.attr("disabled", true);
-		this.button.addClass("ui-disabled").attr("aria-disabled", true);
-		return this._setOption("disabled", true);
+		this.element.attr("disabled",true);
+		this.button.addClass('ui-disabled').attr("aria-disabled", true);
+		return this._setOption( "disabled", true );
+	},
+
+	enable: function(){
+		this.element.attr("disabled",false);
+		this.button.removeClass('ui-disabled').attr("aria-disabled", false);
+		return this._setOption( "disabled", false );
 	}
 });
 })( jQuery );
 
+
+
 /*
 * jQuery Mobile Framework : "slider" plugin
 * Copyright (c) jQuery Project
@@ -3304,11 +3640,12 @@ $.widget( "mobile.slider", $.mobile.widget, {
 			controlID = control.attr('id'),
 			labelID = controlID + '-label',
 			label = $('[for='+ controlID +']').attr('id',labelID),
-			val = (cType == 'input') ? parseFloat(control.val()) : control[0].selectedIndex,
+			val = function(){
+				return (cType == 'input') ? parseFloat(control.val()) : control[0].selectedIndex;
+			},
 			min = (cType == 'input') ? parseFloat(control.attr('min')) : 0,
 			max = (cType == 'input') ? parseFloat(control.attr('max')) : control.find('option').length-1,
 			step = window.parseFloat(control.attr('data-step') || 1),
-
 			slider = $('<div class="ui-slider '+ selectClass +' ui-btn-down-'+ trackTheme+' ui-btn-corner-all" role="application"></div>'),
 			handle = $('<a href="#" class="ui-slider-handle"></a>')
 				.appendTo(slider)
@@ -3317,12 +3654,11 @@ $.widget( "mobile.slider", $.mobile.widget, {
 					'role': 'slider',
 					'aria-valuemin': min,
 					'aria-valuemax': max,
-					'aria-valuenow': val,
-					'aria-valuetext': val,
-					'title': val,
+					'aria-valuenow': val(),
+					'aria-valuetext': val(),
+					'title': val(),
 					'aria-labelledby': labelID
-				}),
-			switchValues = {'off' : 0, 'on': 1};
+				});
 
 		$.extend(this, {
 			slider: slider,
@@ -3347,13 +3683,21 @@ $.widget( "mobile.slider", $.mobile.widget, {
 
 		label.addClass('ui-slider');
 
+		// monitor the input for updated values
 		control
 			.addClass((cType == 'input') ? 'ui-slider-input' : 'ui-slider-switch')
-			.keyup(function(){
-				self.refresh( $(this).val() );
+			.change(function(){
+				self.refresh( val(), true );
+			})
+			.keyup(function(){ // necessary?
+				self.refresh( val(), true, true );
+			})
+			.blur(function(){
+				self.refresh( val(), true );
 			});
 
-		$(document).bind($.support.touch ? "touchmove" : "mousemove", function(event){
+		// prevent screen drag when slider activated
+		$(document).bind( "touchmove mousemove", function(event){
 			if ( self.dragging ) {
 				self.refresh( event );
 				return false;
@@ -3361,7 +3705,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 		});
 
 		slider
-			.bind($.support.touch ? "touchstart" : "mousedown", function(event){
+			.bind( "touchstart mousedown", function(event){
 				self.dragging = true;
 				if ( cType === "select" ) {
 					self.beforeStart = control[0].selectedIndex;
@@ -3372,7 +3716,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 
 		slider
 			.add(document)
-			.bind($.support.touch ? "touchend" : "mouseup", function(){
+			.bind( "touchend mouseup", function(){
 				if ( self.dragging ) {
 					self.dragging = false;
 					if ( cType === "select" ) {
@@ -3380,7 +3724,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 							//tap occurred, but value didn't change. flip it!
 							self.refresh( self.beforeStart === 0 ? 1 : 0 );
 						}
-						var curval = (cType === "input") ? parseFloat(control.val()) : control[ 0 ].selectedIndex;
+						var curval = val();
 						var snapped = Math.round( curval / (max - min) * 100 );
 						handle
 							.addClass("ui-slider-handle-snapping")
@@ -3397,26 +3741,18 @@ $.widget( "mobile.slider", $.mobile.widget, {
 
 		// NOTE force focus on handle
 		this.handle
-			.bind($.support.touch ? "touchstart" : "mousedown", function(){
+			.bind( "touchstart mousedown", function(){
 				$(this).focus();
 			});
 
 		this.handle
-			.bind('keydown', function( event ) {
-				var valuenow = $( this ).attr( "aria-valuenow" ),
-					  index;
+			.bind( "keydown", function( event ) {
+				var index = val();
 
 				if ( self.options.disabled ) {
 					return;
 				}
 
-				// convert switch values to slider
-				if(valuenow.match(/off|on/)){
-					valuenow = switchValues[valuenow];
-				}
-
-				index = window.parseFloat(valuenow, 10);
-
 				// In all cases prevent the default and mark the handle as active
 				switch ( event.keyCode ) {
 				 case $.mobile.keyCode.HOME:
@@ -3466,7 +3802,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 		this.refresh();
 	},
 
-	refresh: function(val){
+	refresh: function(val, isfromControl, preventInputUpdate){
 		if ( this.options.disabled ) { return; }
 
 		var control = this.element, percent,
@@ -3486,7 +3822,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 			percent = Math.round( ((data.pageX - this.slider.offset().left) / this.slider.width() ) * 100 );
 		} else {
 			if ( val == null ) {
-				val = (cType === "input") ? parseFloat(control.val()) : control[ 0 ].selectedIndex;
+				val = (cType === "input") ? parseFloat(control.val()) : control[0].selectedIndex;
 			}
 			percent = (parseFloat(val) - min) / (max - min) * 100;
 		}
@@ -3521,13 +3857,15 @@ $.widget( "mobile.slider", $.mobile.widget, {
 			}
 		}
 
-		// update control's value
-		if ( cType === "input" ) {
-			control.val(newval);
-		} else {
-			control[ 0 ].selectedIndex = newval;
+		if(!preventInputUpdate){
+			// update control's value
+			if ( cType === "input" ) {
+				control.val(newval);
+			} else {
+				control[ 0 ].selectedIndex = newval;
+			}
+			if (!isfromControl) { control.trigger("change"); }
 		}
-		control.trigger("change");
 	},
 
 	enable: function(){
@@ -3547,207 +3885,155 @@ $.widget( "mobile.slider", $.mobile.widget, {
 
 
 /*
-* jQuery Mobile Framework : "collapsible" plugin
+* jQuery Mobile Framework : "textinput" plugin for text inputs, textareas
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
-*/ 
+*/
 (function($, undefined ) {
-$.widget( "mobile.collapsible", $.mobile.widget, {
+$.widget( "mobile.textinput", $.mobile.widget, {
 	options: {
-		expandCueText: ' click to expand contents',
-		collapseCueText: ' click to collapse contents',
-		collapsed: false,
-		heading: '>:header,>legend',
-		theme: null,
-		iconTheme: 'd'
+		theme: null
 	},
 	_create: function(){
-
-		var $el = this.element,
+		var input = this.element,
 			o = this.options,
-			collapsibleContain = $el.addClass('ui-collapsible-contain'),
-			collapsibleHeading = $el.find(o.heading).eq(0),
-			collapsibleContent = collapsibleContain.wrapInner('<div class="ui-collapsible-content"></div>').find('.ui-collapsible-content'),
-			collapsibleParent = $el.closest('[data-role="collapsible-set"]').addClass('ui-collapsible-set');				
-		
-		//replace collapsibleHeading if it's a legend	
-		if(collapsibleHeading.is('legend')){
-			collapsibleHeading = $('<div role="heading">'+ collapsibleHeading.html() +'</div>').insertBefore(collapsibleHeading);
-			collapsibleHeading.next().remove();
+			theme = o.theme,
+			themeclass;
+			
+		if ( !theme ) {
+			var themedParent = this.element.closest("[class*='ui-bar-'],[class*='ui-body-']"); 
+				theme = themedParent.length ?
+					/ui-(bar|body)-([a-z])/.exec( themedParent.attr("class") )[2] :
+					"c";
 		}	
 		
-		//drop heading in before content
-		collapsibleHeading.insertBefore(collapsibleContent);
+		themeclass = " ui-body-" + theme;
 		
-		//modify markup & attributes
-		collapsibleHeading.addClass('ui-collapsible-heading')
-			.append('<span class="ui-collapsible-heading-status"></span>')
-			.wrapInner('<a href="#" class="ui-collapsible-heading-toggle"></a>')
-			.find('a:eq(0)')
-			.buttonMarkup({
-				shadow: !!!collapsibleParent.length,
-				corners:false,
-				iconPos: 'left',
-				icon: 'plus',
-				theme: o.theme
-			})
-			.find('.ui-icon')
-			.removeAttr('class')
-			.buttonMarkup({
-				shadow: true,
-				corners:true,
-				iconPos: 'notext',
-				icon: 'plus',
-				theme: o.iconTheme
-			});
-			
-			if( !collapsibleParent.length ){
-				collapsibleHeading
-					.find('a:eq(0)')	
-					.addClass('ui-corner-all')
-						.find('.ui-btn-inner')
-						.addClass('ui-corner-all');
-			}
-			else {
-				if( collapsibleContain.data('collapsible-last') ){
-					collapsibleHeading
-						.find('a:eq(0), .ui-btn-inner')	
-							.addClass('ui-corner-bottom');
-				}					
-			}
-			
+		$('label[for='+input.attr('id')+']').addClass('ui-input-text');
 		
-		//events
-		collapsibleContain	
-			.bind('collapse', function(event){
-				if( !event.isDefaultPrevented() ){
-					event.preventDefault();
-					collapsibleHeading
-						.addClass('ui-collapsible-heading-collapsed')
-						.find('.ui-collapsible-heading-status').text(o.expandCueText);
-					
-					collapsibleHeading.find('.ui-icon').removeClass('ui-icon-minus').addClass('ui-icon-plus');	
-					collapsibleContent.addClass('ui-collapsible-content-collapsed').attr('aria-hidden',true);
-					
-					if( collapsibleContain.data('collapsible-last') ){
-						collapsibleHeading
-							.find('a:eq(0), .ui-btn-inner')
-							.addClass('ui-corner-bottom');
-					}
-				}						
-				
-			})
-			.bind('expand', function(event){
-				if( !event.isDefaultPrevented() ){
-					event.preventDefault();
-					collapsibleHeading
-						.removeClass('ui-collapsible-heading-collapsed')
-						.find('.ui-collapsible-heading-status').text(o.collapseCueText);
-					
-					collapsibleHeading.find('.ui-icon').removeClass('ui-icon-plus').addClass('ui-icon-minus');	
-					collapsibleContent.removeClass('ui-collapsible-content-collapsed').attr('aria-hidden',false);
-					
-					if( collapsibleContain.data('collapsible-last') ){
-						collapsibleHeading
-							.find('a:eq(0), .ui-btn-inner')
-							.removeClass('ui-corner-bottom');
-					}
-					
+		input.addClass('ui-input-text ui-body-'+ o.theme);
+		
+		var focusedEl = input;
+		
+		//"search" input widget
+		if( input.is('[type="search"],[data-type="search"]') ){
+			focusedEl = input.wrap('<div class="ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-search'+ themeclass +'"></div>').parent();
+			var clearbtn = $('<a href="#" class="ui-input-clear" title="clear text">clear text</a>')
+				.tap(function( e ){
+					input.val('').focus();
+					input.trigger('change'); 
+					clearbtn.addClass('ui-input-clear-hidden');
+					e.preventDefault();
+				})
+				.appendTo(focusedEl)
+				.buttonMarkup({icon: 'delete', iconpos: 'notext', corners:true, shadow:true});
+			
+			function toggleClear(){
+				if(input.val() == ''){
+					clearbtn.addClass('ui-input-clear-hidden');
+				}
+				else{
+					clearbtn.removeClass('ui-input-clear-hidden');
 				}
-			})
-			.trigger(o.collapsed ? 'collapse' : 'expand');
+			}
 			
-		
-		//close others in a set
-		if( collapsibleParent.length && !collapsibleParent.data("collapsiblebound") ){
-			collapsibleParent
-				.data("collapsiblebound", true)
-				.bind("expand", function( event ){
-					$(this).find( ".ui-collapsible-contain" )
-						.not( $(event.target).closest( ".ui-collapsible-contain" ) )
-						.not( "> .ui-collapsible-contain .ui-collapsible-contain" )
-						.trigger( "collapse" );
-				})
-			var set = collapsibleParent.find('[data-role=collapsible]')
-					
-			set.first()
-				.find('a:eq(0)')	
-				.addClass('ui-corner-top')
-					.find('.ui-btn-inner')
-					.addClass('ui-corner-top');
-					
-			set.last().data('collapsible-last', true)	
+			toggleClear();
+			input.keyup(toggleClear);	
 		}
-					
-		collapsibleHeading.bind( $.support.touch ? "touchstart" : "click", function(){ 
-			if( collapsibleHeading.is('.ui-collapsible-heading-collapsed') ){
-				collapsibleContain.trigger('expand'); 
-			}	
-			else {
-				collapsibleContain.trigger('collapse'); 
-			}
-			return false;
-		});
+		else{
+			input.addClass('ui-corner-all ui-shadow-inset' + themeclass);
+		}
+				
+		input
+			.focus(function(){
+				focusedEl.addClass('ui-focus');
+			})
+			.blur(function(){
+				focusedEl.removeClass('ui-focus');
+			});	
 			
+		//autogrow
+		if ( input.is('textarea') ) {
+			var extraLineHeight = 15,
+				keyupTimeoutBuffer = 100,
+				keyup = function() {
+					var scrollHeight = input[0].scrollHeight,
+						clientHeight = input[0].clientHeight;
+					if ( clientHeight < scrollHeight ) {
+						input.css({ height: (scrollHeight + extraLineHeight) });
+					}
+				},
+				keyupTimeout;
+			input.keyup(function() {
+				clearTimeout( keyupTimeout );
+				keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer );
+			});
+		}
+	},
+	
+	disable: function(){
+		( this.element.attr("disabled",true).is('[type="search"],[data-type="search"]') ? this.element.parent() : this.element ).addClass("ui-disabled");
+	},
+	
+	enable: function(){
+		( this.element.attr("disabled", false).is('[type="search"],[data-type="search"]') ? this.element.parent() : this.element ).removeClass("ui-disabled");
 	}
 });
 })( jQuery );
 
+
 /*
-* jQuery Mobile Framework: "controlgroup" plugin - corner-rounding for groups of buttons, checks, radios, etc
+* jQuery Mobile Framework : plugin for creating CSS grids
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
-*/
+*/ 
 (function($, undefined ) {
-$.fn.controlgroup = function(options){
-		
-	return $(this).each(function(){
+$.fn.grid = function(options){
+	return this.each(function(){
 		var o = $.extend({
-			direction: $( this ).data( "type" ) || "vertical",
-			shadow: false
+			grid: null
 		},options);
-		var groupheading = $(this).find('>legend'),
-			flCorners = o.direction == 'horizontal' ? ['ui-corner-left', 'ui-corner-right'] : ['ui-corner-top', 'ui-corner-bottom'],
-			type = $(this).find('input:eq(0)').attr('type');
-		
-		//replace legend with more stylable replacement div	
-		if( groupheading.length ){
-			$(this).wrapInner('<div class="ui-controlgroup-controls"></div>');	
-			$('<div role="heading" class="ui-controlgroup-label">'+ groupheading.html() +'</div>').insertBefore( $(this).children(0) );	
-			groupheading.remove();	
-		}
-
-		$(this).addClass('ui-corner-all ui-controlgroup ui-controlgroup-'+o.direction);
-		
-		function flipClasses(els){
-			els
-				.removeClass('ui-btn-corner-all ui-shadow')
-				.eq(0).addClass(flCorners[0])
-				.end()
-				.filter(':last').addClass(flCorners[1]).addClass('ui-controlgroup-last');
-		}
-		flipClasses($(this).find('.ui-btn'));
-		flipClasses($(this).find('.ui-btn-inner'));
-		if(o.shadow){
-			$(this).addClass('ui-shadow');
+	
+			
+		var $kids = $(this).children(),
+			gridCols = {a: 2, b:3, c:4, d:5},
+			grid = o.grid,
+			iterator;
+			
+			if( !grid ){
+				if( $kids.length <= 5 ){
+					for(var letter in gridCols){
+						if(gridCols[letter] == $kids.length){ grid = letter; }
+					}
+				}
+				else{
+					grid = 'a';
+				}
+			}
+			iterator = gridCols[grid];
+			
+		$(this).addClass('ui-grid-' + grid);
+	
+		$kids.filter(':nth-child(' + iterator + 'n+1)').addClass('ui-block-a');
+		$kids.filter(':nth-child(' + iterator + 'n+2)').addClass('ui-block-b');
+			
+		if(iterator > 2){	
+			$kids.filter(':nth-child(3n+3)').addClass('ui-block-c');
+		}	
+		if(iterator> 3){	
+			$kids.filter(':nth-child(4n+4)').addClass('ui-block-d');
+		}	
+		if(iterator > 4){	
+			$kids.filter(':nth-child(5n+5)').addClass('ui-block-e');
 		}
+				
 	});	
 };
 })(jQuery);
 
-/*
-* jQuery Mobile Framework : "fieldcontain" plugin - simple class additions to make form row separators
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/
-(function($, undefined ) {
-$.fn.fieldcontain = function(options){
-	return $(this).addClass('ui-field-contain ui-body ui-br');
-};
-})(jQuery);
+
 
 /*
 * jQuery Mobile Framework : "listview" plugin
@@ -3878,7 +4164,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 
 		item.find( "p, dl" ).addClass( "ui-li-desc" );
 
-		item.find( "img" ).addClass( "ui-li-thumb" ).each(function() {
+		item.find( "li" ).find( "img:eq(0)" ).addClass( "ui-li-thumb" ).each(function() {
 			$( this ).closest( "li" )
 				.addClass( $(this).is( ".ui-li-icon" ) ? "ui-li-has-icon" : "ui-li-has-thumb" );
 		});
@@ -4051,7 +4337,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 		$( parentList.find( "ul, ol" ).toArray().reverse() ).each(function( i ) {
 			var list = $( this ),
 				parent = list.parent(),
-				title = $.trim(parent.contents()[ 0 ].nodeValue.split("\n")[0]) || parent.find('a:first').text(),
+				title = $.trim(parent.contents()[ 0 ].nodeValue) || parent.find('a:first').text(),
 				id = parentId + "&" + $.mobile.subPageUrlKey + "=" + self._idStringEscape(title + " " + i),
 				theme = list.data( "theme" ) || o.theme,
 				countTheme = list.data( "counttheme" ) || parentList.data( "counttheme" ) || o.countTheme,
@@ -4125,65 +4411,6 @@ $( "[data-role='listview']" ).live( "listviewcreate", function() {
 })( jQuery );
 
 
-/*
-* jQuery Mobile Framework : "dialog" plugin.
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* Note: Code is in draft form and is subject to change 
-*/
-(function($, undefined ) {
-$.widget( "mobile.dialog", $.mobile.widget, {
-	options: {},
-	_create: function(){	
-		var self = this,
-			$el = self.element,
-			$prevPage = $.mobile.activePage,
-			$closeBtn = $('<a href="#" data-icon="delete" data-iconpos="notext">Close</a>');
-	
-		$el.delegate("a, form", "click submit", function(e){
-			if( e.type == "click" && ( $(e.target).closest('[data-back]')[0] || this==$closeBtn[0] ) ){
-				self.close();
-				return false;
-			}
-			//otherwise, assume we're headed somewhere new. set activepage to dialog so the transition will work
-			$.mobile.activePage = self.element;
-		});
-	
-		this.element
-			.bind("pageshow",function(){
-				return false;
-			})
-			//add ARIA role
-			.attr("role","dialog")
-			.addClass('ui-page ui-dialog ui-body-a')
-			.find('[data-role=header]')
-			.addClass('ui-corner-top ui-overlay-shadow')
-				.prepend( $closeBtn )
-			.end()
-			.find('.ui-content:not([class*="ui-body-"])')
-				.addClass('ui-body-c')
-			.end()	
-			.find('.ui-content,[data-role=footer]')
-				.last()
-				.addClass('ui-corner-bottom ui-overlay-shadow');
-		
-		$(window).bind('hashchange',function(){
-			if( $el.is('.ui-page-active') ){
-				self.close();
-				$el.bind('pagehide',function(){
-					$.mobile.updateHash( $prevPage.attr('data-url'), true);
-				});
-			}
-		});		
-
-	},
-	
-	close: function(){
-		$.mobile.changePage([this.element, $.mobile.activePage], undefined, true, true );
-	}
-});
-})( jQuery );
-
 /*
 * jQuery Mobile Framework : "navbar" plugin
 * Copyright (c) jQuery Project
@@ -4219,99 +4446,47 @@ $.widget( "mobile.navbar", $.mobile.widget, {
 			});
 		
 		$navbar.delegate("a", "click",function(event){
-			$navbtns.removeClass("ui-btn-active");
+			$navbtns.removeClass( "ui-btn-active" );
+			$( this ).addClass( "ui-btn-active" );
 		});	
 	}
 });
 })( jQuery );
 
-/*
-* jQuery Mobile Framework : plugin for creating CSS grids
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/ 
-(function($, undefined ) {
-$.fn.grid = function(options){
-	return $(this).each(function(){
-		var o = $.extend({
-			grid: null
-		},options);
-	
-			
-		var $kids = $(this).children(),
-			gridCols = {a: 2, b:3, c:4, d:5},
-			grid = o.grid,
-			iterator;
-			
-			if( !grid ){
-				if( $kids.length <= 5 ){
-					for(var letter in gridCols){
-						if(gridCols[letter] == $kids.length){ grid = letter; }
-					}
-				}
-				else{
-					grid = 'a';
-				}
-			}
-			iterator = gridCols[grid];
-			
-		$(this).addClass('ui-grid-' + grid);
-	
-		$kids.filter(':nth-child(' + iterator + 'n+1)').addClass('ui-block-a');
-		$kids.filter(':nth-child(' + iterator + 'n+2)').addClass('ui-block-b');
-			
-		if(iterator > 2){	
-			$kids.filter(':nth-child(3n+3)').addClass('ui-block-c');
-		}	
-		if(iterator> 3){	
-			$kids.filter(':nth-child(4n+4)').addClass('ui-block-d');
-		}	
-		if(iterator > 4){	
-			$kids.filter(':nth-child(5n+5)').addClass('ui-block-e');
+//quick & dirty theme switcher, written to potentially work as a bookmarklet
+(function($){
+	$.themeswitcher = function(){
+		if( $('[data-url=themeswitcher]').length ){ return; }
+		var
+		  themesDir = '/stylesheets/compiled/jquery/mobile/',
+			themes = ['default','valencia'],
+			currentPage = $.mobile.activePage,
+			menuPage = $( '<div data-url="themeswitcher" data-role=\'dialog\' data-theme=\'a\'>' +
+						'<div data-role=\'header\' data-theme=\'b\'>' +
+							'<div class=\'ui-title\'>Switch Theme:</div>'+
+						'</div>'+
+						'<div data-role=\'content\' data-theme=\'c\'><ul data-role=\'listview\' data-inset=\'true\'></ul></div>'+
+					'</div>' )
+					.appendTo( $.mobile.pageContainer ),
+			menu = menuPage.find('ul');	
+		
+		//menu items	
+		$.each(themes, function( i ){
+			$('<li><a href="#" data-rel="back">' + themes[ i ].charAt(0).toUpperCase() + themes[ i ].substr(1) + '</a></li>')
+				.click(function(){
+					addTheme( themes[i] );
+					return false;
+				})
+				.appendTo(menu);
+		});	
+		
+		//remover, adder
+		function addTheme(theme){
+			$('head').append( '<link rel=\'stylesheet\' href=\''+ themesDir + theme +'.css\' />' );
 		}
-				
-	});	
-};
-})(jQuery);
-
 
+		//create page, listview
+		menuPage.page();
 
-//quick & dirty theme switcher, written to potentially work as a bookmarklet
-(function($){
-  $.themeswitcher = function(){
-  if( $('[data-url=themeswitcher]').length ){ return; }
-  var 
-    themesDir = '/stylesheets/compiled/jquery/mobile/',
-    //themesDir = 'http://jquerymobile.com/test/themes/',themesDir = 'http://jquerymobile.com/test/themes/',
-    themes = ['default','valencia'],
-    currentPage = $.mobile.activePage,
-    menuPage = $(
-      '<div data-url="themeswitcher" data-role=\'dialog\' data-theme=\'a\'>' +
-        '<div data-role=\'header\' data-theme=\'b\'>' +
-          '<div class=\'ui-title\'>Switch Theme:</div>'+
-        '</div>'+
-        '<div data-role=\'content\' data-theme=\'c\'><ul data-role=\'listview\' data-inset=\'true\'></ul></div>'+
-      '</div>' )
-    .appendTo( $.mobile.pageContainer ),
-    menu = menuPage.find('ul');	
-
-    //menu items	
-    $.each(themes, function( i ){
-      $('<li><a href=\'#\'>' + themes[ i ].charAt(0).toUpperCase() + themes[ i ].substr(1) + '</a></li>')
-      .click(function(){
-        addTheme( themes[i] );
-        menuPage.dialog('close');
-      })
-      .appendTo(menu);
-    });	
-    
-    //remover, adder
-    function addTheme(theme){
-      $('head').append( '<link rel=\'stylesheet\' href=\''+ themesDir + theme +'.css\' />' );
-    }
-    
-    //create page, listview
-    menuPage.page();
-  };
+	};	
 })(jQuery);