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

data/templates/mobile/jquery.mobile.js

@@ -402,8 +402,8 @@ $(document).bind("mobileinit.htmlclass", function(){
 /*
 * jQuery Mobile Framework : support tests
 * Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
+* 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 ) {
 
@@ -420,7 +420,7 @@ function propExists( prop ){
 	var uc_prop = prop.charAt(0).toUpperCase() + prop.substr(1),
 		props   = (prop + ' ' + vendors.join(uc_prop + ' ') + uc_prop).split(' ');
 	for(var v in props){
-		if( fbCSS[ props[v] ] !== undefined ){
+		if( fbCSS[ v ] !== undefined ){
 			return true;
 		}
 	}
@@ -432,6 +432,7 @@ function baseTagTest(){
 		base = $("<base>", {"href": fauxBase}).appendTo("head"),
 		link = $( "<a href='testurl'></a>" ).prependTo( fakeBody ),
 		rebase = link[0].href;
+	base[0].href = location.pathname;	
 	base.remove();
 	return rebase.indexOf(fauxBase) === 0;
 };
@@ -1105,68 +1106,104 @@ $.each({
  */
 
 (function( $, window, undefined ) {
-	
+
 	//jQuery.mobile configurable options
 	$.extend( $.mobile, {
-		
-		//define the url parameter used for referencing widget-generated sub-pages. 
+
+		//define the url parameter used for referencing widget-generated sub-pages.
 		//Translates to to example.html&ui-page=subpageIdentifier
 		//hash segment before &ui-page= is used to make Ajax request
 		subPageUrlKey: 'ui-page',
-		
-		//anchor links with a data-rel, or pages with a data-role, that match these selectors will be untrackable in history 
+
+		//anchor links with a data-rel, or pages with a data-role, that match these selectors will be untrackable in history
 		//(no change in URL, not bookmarkable)
 		nonHistorySelectors: 'dialog',
-		
+
 		//class assigned to page currently in view, and during transitions
 		activePageClass: 'ui-page-active',
-		
+
 		//class used for "active" button state, from CSS framework
 		activeBtnClass: 'ui-btn-active',
-		
+
 		//automatically handle link clicks through Ajax, when possible
 		ajaxLinksEnabled: true,
-		
+
 		//automatically handle form submissions through Ajax, when possible
 		ajaxFormsEnabled: true,
-		
+
 		//set default transition - 'none' for no transitions
 		defaultTransition: 'slide',
-		
+
 		//show loading message during Ajax requests
 		//if false, message will not appear, but loading classes will still be toggled on html el
 		loadingMessage: "loading",
-		
+
 		//configure meta viewport tag's content attr:
 		metaViewportContent: "width=device-width, minimum-scale=1, maximum-scale=1",
-		
+
 		//support conditions that must be met in order to proceed
 		gradeA: function(){
 			return $.support.mediaquery;
+		},
+
+		//TODO might be useful upstream in jquery itself ?
+		keyCode: {
+			ALT: 18,
+			BACKSPACE: 8,
+			CAPS_LOCK: 20,
+			COMMA: 188,
+			COMMAND: 91,
+			COMMAND_LEFT: 91, // COMMAND
+			COMMAND_RIGHT: 93,
+			CONTROL: 17,
+			DELETE: 46,
+			DOWN: 40,
+			END: 35,
+			ENTER: 13,
+			ESCAPE: 27,
+			HOME: 36,
+			INSERT: 45,
+			LEFT: 37,
+			MENU: 93, // COMMAND_RIGHT
+			NUMPAD_ADD: 107,
+			NUMPAD_DECIMAL: 110,
+			NUMPAD_DIVIDE: 111,
+			NUMPAD_ENTER: 108,
+			NUMPAD_MULTIPLY: 106,
+			NUMPAD_SUBTRACT: 109,
+			PAGE_DOWN: 34,
+			PAGE_UP: 33,
+			PERIOD: 190,
+			RIGHT: 39,
+			SHIFT: 16,
+			SPACE: 32,
+			TAB: 9,
+			UP: 38,
+			WINDOWS: 91 // COMMAND
 		}
 	});
-	
-	
+
+
 //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() ) {
 		return;
-	}	
+	}
 
 
 //define vars for interal use
 	var $window = $(window),
 		$html = $('html'),
 		$head = $('head'),
-		
+
 		//loading div which appears during Ajax requests
 		//will not appear if $.mobile.loadingMessage is false
-		$loader = $.mobile.loadingMessage ? 
+		$loader = $.mobile.loadingMessage ?
 			$('<div class="ui-loader ui-body-a ui-corner-all">'+
 						'<span class="ui-icon ui-icon-loading spin"></span>'+
 						'<h1>'+ $.mobile.loadingMessage +'</h1>'+
@@ -1175,16 +1212,16 @@ $.each({
 
 
 //add mobile, initial load "rendering" classes to docEl
-	$html.addClass('ui-mobile ui-mobile-rendering');			
-		
-			
-//define & prepend meta viewport tag, if content is defined	
-	$.mobile.metaViewportContent ? $("<meta>", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined;			
+	$html.addClass('ui-mobile ui-mobile-rendering');
+
+
+//define & prepend meta viewport tag, if content is defined
+	$.mobile.metaViewportContent ? $("<meta>", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined;
+
 
-	
 //expose some core utilities
 	$.extend($.mobile, {
-	
+
 		// turn on/off page loading message.
 		pageLoading: function ( done ) {
 			if ( done ) {
@@ -1192,64 +1229,68 @@ $.each({
 			} else {
 				if( $.mobile.loadingMessage ){
 					$loader.appendTo($.mobile.pageContainer).css({top: $(window).scrollTop() + 75});
-				}	
+				}
 				$html.addClass( "ui-loading" );
 			}
 		},
-		
+
 		//scroll page vertically: scroll to 0 to hide iOS address bar, or pass a Y value
 		silentScroll: function( ypos ) {
 			// prevent scrollstart and scrollstop events
 			$.event.special.scrollstart.enabled = false;
 			setTimeout(function() {
 				window.scrollTo( 0, ypos || 0 );
-			},20);	
+			},20);
 			setTimeout(function() {
 				$.event.special.scrollstart.enabled = true;
 			}, 150 );
 		}
-	});	
-	
-	
+	});
+
+
 //dom-ready inits
 	$(function(){
-		
-		//find present pages		
+
+		//find present pages
 		var $pages = $("[data-role='page']");
-		
+
+		$pages.each(function(){
+			$(this).attr('data-url', $(this).attr('id'));
+		});
+
 		//set up active page
 		$.mobile.startPage = $.mobile.activePage = $pages.first();
-		
+
 		//set page container
 		$.mobile.pageContainer = $.mobile.startPage.parent().addClass('ui-mobile-viewport');
-		
+
 		//cue page loading message
 		$.mobile.pageLoading();
-		
+
 		//initialize all pages present
 		$pages.page();
-		
+
 		//trigger a new hashchange, hash or not
 		$window.trigger( "hashchange", [ true ] );
-		
+
 		//remove rendering class
 		$html.removeClass('ui-mobile-rendering');
 	});
-	
-	
-//window load event	
+
+
+//window load event
 	//hide iOS browser chrome on load
-	$window.load( $.mobile.silentScroll );	
-	
+	$window.load( $.mobile.silentScroll );
+
 })( jQuery, this );
 
 
 /*
-* jQuery Mobile Framework : core utilities for auto ajax navigation, base tag mgmt, 
+* jQuery Mobile Framework : core utilities for auto ajax navigation, base tag mgmt,
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
-*/ 
+*/
 (function($, undefined ) {
 
 	//define vars for interal use
@@ -1259,58 +1300,63 @@ $.each({
 
 		//url path helpers for use in relative url management
 		path = {
-			
+
 			//get path from current hash, or from a file path
 			get: function( newPath ){
 				if( newPath == undefined ){
 					newPath = location.hash;
 				}
 				newPath = newPath.replace(/#/,'').split('/');
-				newPath.pop();
+				if(newPath.length){
+					var lastSegment = newPath[newPath.length-1];
+					if( lastSegment.indexOf('.') > -1 || lastSegment == ''){
+						newPath.pop();
+					}
+				}
 				return newPath.join('/') + (newPath.length ? '/' : '');
 			},
-			
-			//return the substring of a filepath before the sub-page key, for making a server request 
+
+			//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.indexOf( splitkey ) > -1 ? path.split( splitkey )[0] : path;
+				return path && path.indexOf( splitkey ) > -1 ? path.split( splitkey )[0] : path;
 			},
-			
+
 			set: function( path, disableListening){
 				if(disableListening) { hashListener = false; }
 				location.hash = path;
 			},
-			
+
 			//location pathname from intial directory request
-			origin: null,
-			
+			origin: '',
+
 			setOrigin: function(){
 				path.origin = path.get( location.protocol + '//' + location.host + location.pathname );
 			}
 		},
-				
+
 		//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 ),
-			
+
 			//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 ));
 			},
-			
+
 			//set the generated BASE element's href attribute to a new page's base path
 			reset: function(){
 				base.element.attr('href', path.origin );
 			}
-			
-		} : 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)
@@ -1318,24 +1364,23 @@ $.each({
 			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;	
-		
+		hashListener = true;
+
 		//set location pathname from intial directory request
 		path.setOrigin();
-	
 
-/* 
+/*
 	internal utility functions
---------------------------------------*/	
+--------------------------------------*/
 
 
 	//direct focus to the page title, or otherwise first focusable element
@@ -1348,7 +1393,7 @@ $.each({
 			page.find( focusable ).eq(0).focus();
 		}
 	};
-	
+
 	//remove active classes after page transition or error
 	function removeActiveLinkClass( forceRemoval ){
 		if( !!$activeClickedLink && (!$activeClickedLink.closest( '.ui-page-active' ).length || forceRemoval )){
@@ -1357,7 +1402,7 @@ $.each({
 		$activeClickedLink = null;
 	};
 
-	
+
 	//animation complete callback
 	$.fn.animationComplete = function( callback ){
 		if($.support.cssTransitions){
@@ -1366,7 +1411,7 @@ $.each({
 		else{
 			callback();
 		}
-	};	
+	};
 
 
 
@@ -1374,11 +1419,11 @@ $.each({
 
 	//update location.hash, with or without triggering hashchange event
 	$.mobile.updateHash = path.set;
-	
+
 	//url stack, useful when plugins need to be aware of previous pages viewed
-	$.mobile.urlStack = urlStack;		
+	$.mobile.urlStack = urlStack;
 
-	// changepage function 
+	// changepage function
 	$.mobile.changePage = function( to, transition, back, changeHash){
 
 		//from is always the currently viewed page
@@ -1390,9 +1435,13 @@ $.each({
 			type = 'get',
 			isFormRequest = false,
 			duplicateCachedPage = null,
-			back = (back !== undefined) ? back : ( urlStack.length > 1 && urlStack[ urlStack.length - 2 ].url === url ),
-			transition = (transition !== undefined) ? transition : $.mobile.defaultTransition;
-		
+			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 ) {
+			return;
+		}
+
 		if( $.type(to) === "object" && to.url ){
 			url = to.url,
 			data = to.data,
@@ -1404,70 +1453,109 @@ $.each({
 				data = undefined;
 			}
 		}
-			
+
 		//reset base to pathname for new request
 		if(base){ base.reset(); }
-			
+
+		//kill the keyboard
+		$( window.document.activeElement ).add(':focus').blur();
+
+		function defaultTransition(){
+			if(transition === undefined){
+				transition = $.mobile.defaultTransition;
+			}
+		}
+
 		// if the new href is the same as the previous one
 		if ( back ) {
 			var pop = urlStack.pop();
-			if( 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() {
-				
-			//kill the keyboard
-			$( window.document.activeElement ).blur();
-			
+
 			//get current scroll distance
-			var currScroll = $window.scrollTop();
-			
+			var currScroll = $window.scrollTop(),
+					perspectiveTransitions = ["flip"],
+					pageContainerClasses = [];
+
 			//set as data for returning to that spot
 			from.data('lastScroll', currScroll);
-			
+
 			//trigger before show/hide events
 			from.data("page")._trigger("beforehide", {nextPage: to});
 			to.data("page")._trigger("beforeshow", {prevPage: from});
-			
+
 			function loadComplete(){
 				$.mobile.pageLoading( true );
-				//trigger show/hide events, allow preventing focus change through return false		
-				if( from.data("page")._trigger("hide", null, {nextPage: to}) !== false && to.data("page")._trigger("show", null, {prevPage: from}) !== false ){
-					$.mobile.activePage = to;
-				}
+
 				reFocus( to );
+
 				if( changeHash !== false && url ){
-					path.set(url, true);
+					path.set(url, (back !== true));
 				}
 				removeActiveLinkClass();
-				
+
 				//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
 				if( duplicateCachedPage != null ){
 					duplicateCachedPage.remove();
 				}
-				
+
 				//jump to top or prev scroll, if set
 				$.mobile.silentScroll( to.data( 'lastScroll' ) );
+
+				//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(transition && (transition !== 'none')){	
-				$.mobile.pageContainer.addClass('ui-mobile-viewport-transitioning');
+
+			function addContainerClass(className){
+				$.mobile.pageContainer.addClass(className);
+				pageContainerClasses.push(className);
+			};
+
+			function removeContainerClasses(){
+				$.mobile
+					.pageContainer
+					.removeClass(pageContainerClasses.join(" "));
+
+				pageContainerClasses = [];
+			};
+
+			if(transition && (transition !== 'none')){
+				if( perspectiveTransitions.indexOf(transition) >= 0 ){
+					addContainerClass('ui-mobile-viewport-perspective');
+				}
+
+				addContainerClass('ui-mobile-viewport-transitioning');
+
 				// animate in / out
 				from.addClass( transition + " out " + ( back ? "reverse" : "" ) );
 				to.addClass( $.mobile.activePageClass + " " + transition +
 					" in " + ( back ? "reverse" : "" ) );
-				
+
 				// callback - remove classes, etc
 				to.animationComplete(function() {
 					from.add( to ).removeClass("out in reverse " + transition );
 					from.removeClass( $.mobile.activePageClass );
 					loadComplete();
-					$.mobile.pageContainer.removeClass('ui-mobile-viewport-transitioning');
+					removeContainerClasses();
 				});
 			}
 			else{
@@ -1476,48 +1564,51 @@ $.each({
 				loadComplete();
 			}
 		};
-		
+
 		//shared page enhancements
 		function enhancePage(){
-			
+
 			//set next page role, if defined
-			if ( nextPageRole ) {
-				to.attr( "data-role", nextPageRole );
-				nextPageRole = undefined;
+			if ( nextPageRole || to.data('role') == 'dialog' ) {
+				changeHash = false;
+				if(nextPageRole){
+					to.attr( "data-role", nextPageRole );
+					nextPageRole = null;
+				}
 			}
-			
-			//run page plugin			
+
+			//run page plugin
 			to.page();
 		};
 
 		//if url is a string
 		if( url ){
-			to = $( "[id='" + url + "']" ),
+			to = $( "[data-url='" + url + "']" );
 			fileUrl = path.getFilePath(url);
 		}
 		else{ //find base url of element, if avail
-			var toID = to.attr('id'),
+			var toID = to.attr('data-url'),
 				toIDfileurl = path.getFilePath(toID);
-				
+
 			if(toID != toIDfileurl){
 				fileUrl = toIDfileurl;
-			}	
+			}
 		}
-		
+
 		// find the "to" page, either locally existing in the dom or by creating it through ajax
 		if ( to.length && !isFormRequest ) {
 			if( fileUrl && base ){
 				base.set( fileUrl );
-			}	
+			}
 			enhancePage();
 			transitionPages();
-		} else { 
-		
+		} else {
+
 			//if to exists in DOM, save a reference to it in duplicateCachedPage for removal after page change
 			if( to.length ){
 				duplicateCachedPage = to;
 			}
-			
+
 			$.mobile.pageLoading();
 
 			$.ajax({
@@ -1525,55 +1616,40 @@ $.each({
 				type: type,
 				data: data,
 				success: function( html ) {
-				
 					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;
-					to = all.find('[data-role="page"]');
-					
+					to = all.find('[data-role="page"], [data-role="dialog"]').first();
+
 					//rewrite src and href attrs to use a base url
 					if( !$.support.dynamicBaseTag ){
 						var newPath = path.get( fileUrl );
 						to.find('[src],link[href]').each(function(){
 							var thisAttr = $(this).is('[href]') ? 'href' : 'src',
 								thisUrl = $(this).attr(thisAttr);
-							
+
 							//if full path exists and is same, chop it - helps IE out
 							thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' );
-								
+
 							if( !/^(\w+:|#|\/)/.test(thisUrl) ){
 								$(this).attr(thisAttr, newPath + thisUrl);
 							}
 						});
 					}
-					
-					//preserve ID on a retrieved page
-					if ( to.attr('id') ) {
-						//wrap page and transfer data-attrs if it has an ID
-						var copyAttrs = ['data-role', 'data-theme', 'data-fullscreen'], //TODO: more page-level attrs?
-							wrapper = to.wrap( "<div>" ).parent();
-							
-						$.each(copyAttrs,function(i){
-							if( to.attr( copyAttrs[ i ] ) ){
-								wrapper.attr( copyAttrs[ i ], to.attr( copyAttrs[ i ] ) );
-								to.removeAttr( copyAttrs[ i ] );
-							}
-						});	
-						to = wrapper;
-					}
 
 					to
-						.attr( "id", fileUrl )
+						.attr( "data-url", fileUrl )
 						.appendTo( $.mobile.pageContainer );
-						
+
 					enhancePage();
 					transitionPages();
 				},
 				error: function() {
 					$.mobile.pageLoading( true );
 					removeActiveLinkClass(true);
+					base.set(path.get());
 					$("<div class='ui-loader ui-overlay-shadow ui-body-e ui-corner-all'><h1>Error Loading Page</h1></div>")
 						.css({ "display": "block", "opacity": 0.96, "top": $(window).scrollTop() + 100 })
 						.appendTo( $.mobile.pageContainer )
@@ -1588,27 +1664,25 @@ $.each({
 	};
 
 
+/* Event Bindings - hashchange, submit, and click */
 
-	
-/* Event Bindings - hashchange, submit, and click */	
-	
 	//bind to form submit events, handle with Ajax
 	$('form').live('submit', function(event){
 		if( !$.mobile.ajaxFormsEnabled ){ return; }
-		
+
 		var type = $(this).attr("method"),
-			url = $(this).attr( "action" ).replace( location.protocol + "//" + location.host, "");	
-		
+			url = $(this).attr( "action" ).replace( location.protocol + "//" + location.host, "");
+
 		//external submits use regular HTTP
 		if( /^(:?\w+:)/.test( url ) ){
 			return;
-		}	
-		
+		}
+
 		//if it's a relative href, prefix href with base url
 		if( url.indexOf('/') && url.indexOf('#') !== 0 ){
 			url = path.get() + url;
 		}
-			
+
 		$.mobile.changePage({
 				url: url,
 				type: type,
@@ -1619,11 +1693,12 @@ $.each({
 			true
 		);
 		event.preventDefault();
-	});	
-	
-	
+	});
+
+
 	//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
@@ -1631,20 +1706,19 @@ $.each({
 			//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]" ),
-			target = $this.is( "[target]" );
+			external = target || /^(:?\w+:)/.test( href ) || $this.is( "[rel=external]" );
 
 		if( href === '#' ){
 			//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
 			removeActiveLinkClass(true);
-			
+
 			//deliberately redirect, in case click was triggered
 			if( target ){
 				window.open(href);
@@ -1653,57 +1727,56 @@ $.each({
 				location.href = href;
 			}
 		}
-		else {	
+		else {
 			//use ajax
 			var transition = $this.data( "transition" ),
-				back = $this.data( "back" ),
-				changeHashOnSuccess = !$this.is( "[data-rel="+ $.mobile.nonHistorySelectors +"]" );
-				
-			nextPageRole = $this.attr( "data-rel" );	
-	
+				back = $this.data( "back" );
+
+			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;
 			}
-			
+
 			href.replace(/^#/,'');
-			
-			$.mobile.changePage(href, transition, back, changeHashOnSuccess);			
+
+			$.mobile.changePage(href, transition, back);
 		}
 		event.preventDefault();
 	});
-		
-		
-	
-	//hashchange event handler	
+
+
+
+	//hashchange event handler
 	$window.bind( "hashchange", function(e, triggered) {
-		if( !hashListener ){ 
+		if( !hashListener ){
 			hashListener = true;
-			return; 
-		} 
-		
+			return;
+		}
+
 		if( $(".ui-page-active").is("[data-role=" + $.mobile.nonHistorySelectors + "]") ){
 			return;
 		}
-		
+
 		var to = location.hash,
 			transition = triggered ? false : undefined;
-			
+
 		//if to is defined, use it
 		if ( to ){
-			$.mobile.changePage( to, transition);
+			$.mobile.changePage( to, transition, undefined, false);
 		}
 		//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 );
+			$.mobile.changePage( $.mobile.startPage, transition, true, false );
 		}
 		//probably the first page - show it
 		else{
 			$.mobile.startPage.trigger("pagebeforeshow", {prevPage: $('')});
 			$.mobile.startPage.addClass( $.mobile.activePageClass );
 			$.mobile.pageLoading( true );
-			
+
 			if( $.mobile.startPage.trigger("pageshow", {prevPage: $('')}) !== false ){
 				reFocus($.mobile.startPage);
 			}
@@ -1737,46 +1810,47 @@ $.widget( "mobile.page", $.mobile.widget, {
 			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;
 		}
-		
+
 		//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" );
 
-		this._enchanceControls();
-		
 		// 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;
 				}
@@ -1784,7 +1858,7 @@ $.widget( "mobile.page", $.mobile.widget, {
 				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.urlStack.length > 1 || $(".ui-page").length > 1) &&
@@ -1797,8 +1871,8 @@ $.widget( "mobile.page", $.mobile.widget, {
 						})
 						.prependTo( $this );
 				}
-				
-				//page title	
+
+				//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
@@ -1815,7 +1889,7 @@ $.widget( "mobile.page", $.mobile.widget, {
 			} else if ( role === "page" ) {
 				$this.addClass( "ui-body-" + (theme || "c") );
 			}
-			
+
 			switch(role) {
 				case "header":
 				case "footer":
@@ -1833,59 +1907,69 @@ $.widget( "mobile.page", $.mobile.widget, {
 			}
 		});
 		
+		//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" )
+		$elem.find( "[data-role='button'], .ui-bar > a, .ui-header > a, .ui-footer > a" )
 			.not( ".ui-btn" )
+			.not(this.keepNative)
 			.buttonMarkup();
 
-		$elem	
+		$elem
 			.find("[data-role='controlgroup']")
 			.controlgroup();
-		
+
 		//links within content areas
 		$elem.find( "a:not(.ui-btn):not(.ui-link-inherit)" )
-			.addClass( "ui-link" );	
-		
+			.not(this.keepNative)
+			.addClass( "ui-link" );
+
 		//fix toolbars
 		$elem.fixHeaderFooter();
 	},
-	
-	_enchanceControls: function() {
+
+	_enhanceControls: function() {
 		var o = this.options;
+
 		// degrade inputs to avoid poorly implemented native functionality
-		this.element.find( "input" ).each(function() {
+		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'" ) );
 			}
 		});
-		
+
 		// 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( ".ui-nojs" )
+			.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();
 	}
 });
@@ -2174,64 +2258,74 @@ $.fixedToolbars = (function(){
 		touchStartEvent = supportTouch ? "touchstart" : "mousedown",
 		touchStopEvent = supportTouch ? "touchend" : "mouseup",
 		stateBefore = null,
-		scrollTriggered = false;
-		
+		scrollTriggered = false,
+        touchToggleEnabled = true;
+
 	$(function() {
 		$(document)
 			.bind(touchStartEvent,function(event){
-				if( $(event.target).closest(ignoreTargets).length ){ return; }
-				stateBefore = currentstate;
-				$.fixedToolbars.hide(true);
+				if( touchToggleEnabled ) {
+					if( $(event.target).closest(ignoreTargets).length ){ return; }
+					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; }
-				$.fixedToolbars.hide(true);
+				if (stateBefore == 'overlay') {
+					$.fixedToolbars.hide(true);
+				}
 			})
 			.bind(touchStopEvent,function(event){
-				if( $(event.target).closest(ignoreTargets).length ){ return; }
-				if( !scrollTriggered ){
-					$.fixedToolbars.toggle(stateBefore);
-					stateBefore = null;
+				if( touchToggleEnabled ) {
+					if( $(event.target).closest(ignoreTargets).length ){ return; }
+					if( !scrollTriggered ){
+						$.fixedToolbars.toggle(stateBefore);
+						stateBefore = null;
+					}
 				}
 			})
 			.bind('scrollstop',function(event){
 				if( $(event.target).closest(ignoreTargets).length ){ return; }
 				scrollTriggered = false;
-				$.fixedToolbars.toggle( stateBefore == 'overlay' ? 'inline' : 'overlay' );
+				if (stateBefore == 'overlay') {
+					$.fixedToolbars.show();
+				}
 				stateBefore = null;
 			});
+	});
 		
-		//function to return another footer already in the dom with the same data-id
-		function findStickyFooter(el){
-			var thisFooter = el.find('[data-role="footer"]');
-			return $( '.ui-footer[data-id="'+ thisFooter.data('id') +'"]:not(.ui-footer-duplicate)' ).not(thisFooter);
-		}
-		
-		//before page is shown, check for duplicate footer
-		$('.ui-page').live('pagebeforeshow', function(event, ui){
-			stickyFooter = findStickyFooter( $(event.target) );
-			if( stickyFooter.length ){
-				//if the existing footer is the first of its kind, create a placeholder before stealing it 
-				if( stickyFooter.parents('.ui-page:eq(0)').find('.ui-footer[data-id="'+ stickyFooter.data('id') +'"]').length == 1 ){
-					stickyFooter.before( stickyFooter.clone().addClass('ui-footer-duplicate') );
-				}
-				$(event.target).find('[data-role="footer"]').addClass('ui-footer-duplicate');
-				stickyFooter.appendTo($.pageContainer).css('top',0);
-				setTop(stickyFooter);
+	//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');
+		if (id)
+		{
+			stickyFooter = $('.ui-footer[data-id="' + id + '"].ui-sticky-footer');
+			if (stickyFooter.length == 0) {
+				// No sticky footer exists for this data-id. We'll use this
+				// footer as the sticky footer for the group and then create
+				// a placeholder footer for the page.
+				stickyFooter = footer;
+				footer = stickyFooter.clone(); // footer placeholder
+				stickyFooter.addClass('ui-sticky-footer').before(footer);
 			}
-		});
+			footer.addClass('ui-footer-duplicate');
+			stickyFooter.appendTo($.pageContainer).css('top',0);
+			setTop(stickyFooter);
+		}
+	});
 
-		//after page is shown, append footer to new page
-		$('.ui-page').live('pageshow', function(event, ui){
-			if( stickyFooter && stickyFooter.length ){
-				stickyFooter.appendTo(event.target).css('top',0);
-			}
-			$.fixedToolbars.show(true, this);
-		});
-		
+	//after page is shown, append footer to new page
+	$('.ui-page').live('pageshow', function(event, ui){
+		if( stickyFooter && stickyFooter.length ){
+			stickyFooter.appendTo(event.target).css('top',0);
+		}
+		$.fixedToolbars.show(true, this);
 	});
+		
 	
 	// element.getBoundingClientRect() is broken in iOS 3.2.1 on the iPad. The
 	// coordinates inside of the rect it returns don't have the page scroll position
@@ -2300,9 +2394,9 @@ $.fixedToolbars = (function(){
 				el.addClass('ui-fixed-overlay').removeClass('ui-fixed-inline');	
 					
 				if( !alreadyVisible && !immediately ){
-					el.addClass('in').animationComplete(function(){
+					el.animationComplete(function(){
 						el.removeClass('in');
-					});
+					}).addClass('in');
 				}
 				setTop(el);
 			});	
@@ -2326,10 +2420,10 @@ $.fixedToolbars = (function(){
 					else{
 						if( el.css('top') !== 'auto' && parseFloat(el.css('top')) !== 0 ){
 							var classes = 'out reverse';
-							el.addClass(classes).animationComplete(function(){
+							el.animationComplete(function(){
 								el.removeClass(classes);
 								el.css('top',0);
-							});	
+							}).addClass(classes);	
 						}
 					}
 				}
@@ -2343,7 +2437,10 @@ $.fixedToolbars = (function(){
 		toggle: function(from){
 			if(from){ currentstate = from; }
 			return (currentstate == 'overlay') ? $.fixedToolbars.hide() : $.fixedToolbars.show();
-		}
+		},
+        setTouchToggleEnabled: function(enabled) {
+            touchToggleEnabled = enabled;
+        }
 	};
 })();
 
@@ -2368,7 +2465,12 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
 			uncheckedicon = "ui-icon-" + inputtype + "-off";
 
 		if ( inputtype != "checkbox" && inputtype != "radio" ) { return; }
-						
+
+		// If there's no selected theme...
+		if( !this.options.theme ) {
+			this.options.theme = this.element.data( "theme" );
+		}
+
 		label
 			.buttonMarkup({
 				theme: this.options.theme,
@@ -2575,28 +2677,34 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 		shadow: true,
 		iconshadow: true,
 		menuPageTheme: 'b',
-		overlayTheme: 'a'
+		overlayTheme: 'a',
+		hidePlaceholderMenuItems: true,
+		closeText: 'Close'
 	},
 	_create: function(){
 	
 		var self = this,
-		
+			
 			o = this.options,
 			
 			select = this.element
 						.attr( "tabindex", "-1" )
-						.wrap( "<div class='ui-select'>" ),		
+						.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>", { 
 					"href": "#",
 					"role": "button",
@@ -2615,7 +2723,7 @@ $.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 +"'>" +
@@ -2627,7 +2735,9 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 					.appendTo( $.mobile.pageContainer )
 					.page(),	
 					
-			menuPageContent = menuPage.find( ".ui-content" ),	
+			menuPageContent = menuPage.find( ".ui-content" ),
+			
+			menuPageClose = menuPage.find( ".ui-header a" ),
 					
 			screen = $( "<div>", {"class": "ui-selectmenu-screen ui-screen-hidden"})
 						.appendTo( thisPage ),		
@@ -2643,10 +2753,35 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 					"data-theme": theme
 				})
 				.appendTo( listbox ),
-				
-			menuType;	
 			
-		//expose to other methods	
+			header = $( "<div>", {
+					"data-role": "header",
+					"data-nobackbtn": true
+				})
+				.prependTo( listbox ),
+				
+			headerTitle = $( "<h1>" )
+				.appendTo( header ),
+				
+			headerClose = $( "<a>", {
+					"data-iconpos": "notext",
+					"data-icon": "delete",
+					"text": o.closeText,
+					"href": "#"
+				})
+				.appendTo( header ),
+				
+			menuType;
+		
+		// add counter for multi selects
+		if( isMultiple ){
+			self.buttonCount = $('<span>')
+				.addClass( 'ui-li-count ui-btn-up-c ui-btn-corner-all' )
+				.hide()
+				.appendTo( button );
+		}
+		
+		//expose to other methods
 		$.extend(self, {
 			select: select,
 			selectID: selectID,
@@ -2660,15 +2795,18 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 			screen:screen,
 			listbox:listbox,
 			list:list,
-			menuType:menuType
+			menuType:menuType,
+			header:header,
+			headerClose:headerClose,
+			headerTitle:headerTitle,
+			placeholder: ''
 		});
-					
 		
 		//create list from select, update state
 		self.refresh();
 		
 		//disable if specified
-		if( this.options.disabled ){ this.disable(); }
+		if( o.disabled ){ this.disable(); }
 
 		//events on native select
 		select
@@ -2678,76 +2816,188 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 			.focus(function(){
 				$(this).blur();
 				button.focus();
-			});		
+			});
 		
 		//button events
 		button.bind( $.support.touch ? "touchstart" : "click", function(event){
 			self.open();
-			return false;
+			event.preventDefault();
 		});
 		
 		//events for list items
-		list.delegate("li",'click', function(){
-				//update select	
-				var newIndex = list.find( "li" ).index( this ),
-					prevIndex = select[0].selectedIndex;
-
-				select[0].selectedIndex = newIndex;
-				
-				//trigger change event
-				if(newIndex !== prevIndex){ 
-					select.trigger( "change" ); 
-				}
-				
-				self.refresh();
-				
-				//hide custom select
+		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 
+			var newIndex = list.find( "li:not(.ui-li-divider)" ).index( this ),
+				option = options.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)
+					.find('.ui-icon')
+					.toggleClass('ui-icon-checkbox-on', option.selected)
+					.toggleClass('ui-icon-checkbox-off', !option.selected);
+			}
+			
+			// trigger change
+			select.trigger( "change" ); 
+			
+			//hide custom select for single selects only
+			if( !isMultiple ){
 				self.close();
-				return false;
-			});	
-	
-		//events on "screen" overlay
-		screen.click(function(){
+			}
+			
+			event.preventDefault();
+		});
+		
+		//events on "screen" overlay + close button
+		screen.add( headerClose ).add( menuPageClose ).click(function(event){
 			self.close();
-			return false;
-		});	
+			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 anchor = $("<a>", { 
-							"role": "option", 
-							"href": "#"
-						})
-						.text( $(this).text() );
+			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": "", 
+				"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');
+			}
 			
-			$( "<li>", {"data-icon": "checkbox-on"})
+			// 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();		
+		self.list.listview();
 	},
 	
 	refresh: function( forceRebuild ){
 		var self = this,
 			select = this.element,
-			selected = select[0].selectedIndex;
+			isMultiple = this.isMultiple,
+			options = 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( $(select[0].options.item(selected)).text() ); 
+		}
+		
+		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').removeClass( $.mobile.activeBtnClass ).attr('aria-selected', false)
-			.eq(selected).addClass( $.mobile.activeBtnClass ).find('a').attr('aria-selected', true);		
+			.find( 'li:not(.ui-li-divider)' )
+			.removeClass( $.mobile.activeBtnClass )
+			.attr( 'aria-selected', false )
+			.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');
+					}
+				}
+			});
 	},
 	
 	open: function(){
@@ -2812,6 +3062,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 		function focusButton(){
 			setTimeout(function(){
 				self.button.focus();
+				
 				//remove active class from button
 				self.button.removeClass( $.mobile.activeBtnClass );
 			}, 40);
@@ -2819,12 +3070,9 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 			self.listbox.removeAttr('style').append( self.list );
 		}
 		
-		if(self.menuType == "page"){			
+		if(self.menuType == "page"){
 			$.mobile.changePage([self.menuPage,self.thisPage], 'pop', true, false);
-			self.menuPage.one("pagehide",function(){
-				focusButton();
-				//return false;
-			});
+			self.menuPage.one("pagehide", focusButton);
 		}
 		else{
 			self.screen.addClass( "ui-screen-hidden" );
@@ -2934,7 +3182,7 @@ $.fn.buttonMarkup.defaults = {
 };
 
 var attachEvents = function() {
-	$(".ui-btn").live({
+	$(".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 );
@@ -2978,27 +3226,11 @@ $.widget( "mobile.button", $.mobile.widget, {
 	},
 	_create: function(){
 		var $el = this.element,
-			o = this.options,
-			type = $el.attr('type');
-			$el
-				.addClass('ui-btn-hidden')
-				.attr('tabindex','-1');
+			o = this.options;
 		
 		//add ARIA role
-		this.button = $( "<a>", { 
-				"href": "#",
-				"role": "button",
-				"aria-label": $el.attr( "type" ) 
-			} )
+		this.button = $( "<div></div>" )
 			.text( $el.text() || $el.val() )
-			.insertBefore( $el )
-			.click(function(){
-				if(!o.disabled){
-					$el.click(); 
-				}
-
-				return false;
-			})
 			.buttonMarkup({
 				theme: o.theme, 
 				icon: o.icon,
@@ -3007,7 +3239,24 @@ $.widget( "mobile.button", $.mobile.widget, {
 				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();
+				});
 			});
+		}
+			
 	},
 
 	enable: function(){
@@ -3029,7 +3278,7 @@ $.widget( "mobile.button", $.mobile.widget, {
 * Copyright (c) jQuery Project
 * Dual licensed under the MIT or GPL Version 2 licenses.
 * http://jquery.org/license
-*/  
+*/
 (function($, undefined ) {
 $.widget( "mobile.slider", $.mobile.widget, {
 	options: {
@@ -3037,19 +3286,19 @@ $.widget( "mobile.slider", $.mobile.widget, {
 		trackTheme: null,
 		disabled: false
 	},
-	_create: function(){	
+	_create: function(){
 		var self = this,
 
 			control = this.element,
-		
-			parentTheme = control.parents('[class*=ui-bar-],[class*=ui-body-]').eq(0),	
-			
+
+			parentTheme = control.parents('[class*=ui-bar-],[class*=ui-body-]').eq(0),
+
 			parentTheme = parentTheme.length ? parentTheme.attr('class').match(/ui-(bar|body)-([a-z])/)[2] : 'c',
-					
+
 			theme = this.options.theme ? this.options.theme : parentTheme,
-			
+
 			trackTheme = this.options.trackTheme ? this.options.trackTheme : parentTheme,
-			
+
 			cType = control[0].nodeName.toLowerCase(),
 			selectClass = (cType == 'select') ? 'ui-slider-switch' : '',
 			controlID = control.attr('id'),
@@ -3058,6 +3307,8 @@ $.widget( "mobile.slider", $.mobile.widget, {
 			val = (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)
@@ -3070,7 +3321,8 @@ $.widget( "mobile.slider", $.mobile.widget, {
 					'aria-valuetext': val,
 					'title': val,
 					'aria-labelledby': labelID
-				});
+				}),
+			switchValues = {'off' : 0, 'on': 1};
 
 		$.extend(this, {
 			slider: slider,
@@ -3082,32 +3334,32 @@ $.widget( "mobile.slider", $.mobile.widget, {
 		if(cType == 'select'){
 			slider.wrapInner('<div class="ui-slider-inneroffset"></div>');
 			var options = control.find('option');
-				
+
 			control.find('option').each(function(i){
 				var side = (i==0) ?'b':'a',
 					corners = (i==0) ? 'right' :'left',
 					theme = (i==0) ? ' ui-btn-down-' + trackTheme :' ui-btn-active';
-				$('<div class="ui-slider-labelbg ui-slider-labelbg-'+ side + theme +' ui-btn-corner-'+ corners+'"></div>').prependTo(slider);	
+				$('<div class="ui-slider-labelbg ui-slider-labelbg-'+ side + theme +' ui-btn-corner-'+ corners+'"></div>').prependTo(slider);
 				$('<span class="ui-slider-label ui-slider-label-'+ side + theme +' ui-btn-corner-'+ corners+'" role="img">'+$(this).text()+'</span>').prependTo(handle);
 			});
-			
-		}	
-		
+
+		}
+
 		label.addClass('ui-slider');
-		
+
 		control
 			.addClass((cType == 'input') ? 'ui-slider-input' : 'ui-slider-switch')
 			.keyup(function(){
 				self.refresh( $(this).val() );
 			});
-			
+
 		$(document).bind($.support.touch ? "touchmove" : "mousemove", function(event){
 			if ( self.dragging ) {
 				self.refresh( event );
 				return false;
 			}
 		});
-					
+
 		slider
 			.bind($.support.touch ? "touchstart" : "mousedown", function(event){
 				self.dragging = true;
@@ -3117,9 +3369,9 @@ $.widget( "mobile.slider", $.mobile.widget, {
 				self.refresh( event );
 				return false;
 			});
-			
+
 		slider
-			.add(document)	
+			.add(document)
 			.bind($.support.touch ? "touchend" : "mouseup", function(){
 				if ( self.dragging ) {
 					self.dragging = false;
@@ -3142,7 +3394,75 @@ $.widget( "mobile.slider", $.mobile.widget, {
 			});
 
 		slider.insertAfter(control);
-		handle.bind('click', function(e){ return false; });
+
+		// NOTE force focus on handle
+		this.handle
+			.bind($.support.touch ? "touchstart" : "mousedown", function(){
+				$(this).focus();
+			});
+
+		this.handle
+			.bind('keydown', function( event ) {
+				var valuenow = $( this ).attr( "aria-valuenow" ),
+					  index;
+
+				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:
+				 case $.mobile.keyCode.END:
+				 case $.mobile.keyCode.PAGE_UP:
+				 case $.mobile.keyCode.PAGE_DOWN:
+				 case $.mobile.keyCode.UP:
+				 case $.mobile.keyCode.RIGHT:
+				 case $.mobile.keyCode.DOWN:
+				 case $.mobile.keyCode.LEFT:
+					event.preventDefault();
+
+					if ( !self._keySliding ) {
+						self._keySliding = true;
+						$( this ).addClass( "ui-state-active" );
+					}
+					break;
+				}
+
+				// move the slider according to the keypress
+				switch ( event.keyCode ) {
+				 case $.mobile.keyCode.HOME:
+					self.refresh(min);
+					break;
+				 case $.mobile.keyCode.END:
+					self.refresh(max);
+					break;
+				 case $.mobile.keyCode.PAGE_UP:
+				 case $.mobile.keyCode.UP:
+				 case $.mobile.keyCode.RIGHT:
+					self.refresh(index + step);
+					break;
+				 case $.mobile.keyCode.PAGE_DOWN:
+				 case $.mobile.keyCode.DOWN:
+				 case $.mobile.keyCode.LEFT:
+					self.refresh(index - step);
+					break;
+				}
+			}) // remove active mark
+			.keyup(function( event ) {
+				if ( self._keySliding ) {
+					self._keySliding = false;
+					$( this ).removeClass( "ui-state-active" );
+				}
+			});
+
 		this.refresh();
 	},
 
@@ -3181,7 +3501,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 
 		//flip the stack of the bg colors
 		if ( percent > 60 && cType === "select" ) {
-			
+
 		}
 		this.handle.css("left", percent + "%");
 		this.handle.attr({
@@ -3223,7 +3543,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
 	}
 });
 })( jQuery );
-	
+
 
 
 /*
@@ -3612,13 +3932,15 @@ $.widget( "mobile.listview", $.mobile.widget, {
 			var a = item.find( "a" );
 				
 			if ( a.length ) {	
+				var icon = item.data("icon");
+				
 				item
 					.buttonMarkup({
 						wrapperEls: "div",
 						shadow: false,
 						corners: false,
 						iconpos: "right",
-						icon: a.length > 1 ? false : item.data("icon") || "arrow-r",
+						icon: a.length > 1 || icon === false ? false : icon || "arrow-r",
 						theme: o.theme
 					});
 
@@ -3676,8 +3998,9 @@ $.widget( "mobile.listview", $.mobile.widget, {
 							.end()
 							.find( ".ui-li-thumb" )
 								.addClass( "ui-corner-tl" );
-						
-						self._removeCorners( item.next() );		
+						if(item.next().next().length){
+							self._removeCorners( item.next() );		
+						}
 	
 				} else if ( pos === li.length - 1 ) {
 						itemClass += " ui-corner-bottom";
@@ -3690,7 +4013,9 @@ $.widget( "mobile.listview", $.mobile.widget, {
 							.find( ".ui-li-thumb" )
 								.addClass( "ui-corner-bl" );
 						
-						self._removeCorners( item.prev() );		
+						if(item.prev().prev().length){
+							self._removeCorners( item.prev() );		
+						}	
 				}
 			}
 
@@ -3718,7 +4043,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 	_createSubPages: function() {
 		var parentList = this.element,
 			parentPage = parentList.closest( ".ui-page" ),
-			parentId = parentPage.attr( "id" ),
+			parentId = parentPage.data( "url" ),
 			o = this.options,
 			self = this,
 			persistentFooterID = parentPage.find( "[data-role='footer']" ).data( "id" );
@@ -3726,7 +4051,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 		$( parentList.find( "ul, ol" ).toArray().reverse() ).each(function( i ) {
 			var list = $( this ),
 				parent = list.parent(),
-				title = parent.contents()[ 0 ].nodeValue.split("\n")[0],
+				title = $.trim(parent.contents()[ 0 ].nodeValue.split("\n")[0]) || 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,
@@ -3736,7 +4061,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
 								.after( persistentFooterID ? $( "<div>", { "data-role": "footer", "data-id": persistentFooterID, "class": "ui-footer-duplicate" } ) : "" )
 								.parent()
 									.attr({
-										id: id,
+										"data-url": id,
 										"data-theme": theme,
 										"data-count-theme": countTheme
 									})
@@ -3745,8 +4070,11 @@ $.widget( "mobile.listview", $.mobile.widget, {
 				
 				
 				newPage.page();		
-			
-			parent.html( "<a href='#" + id + "'>" + title + "</a>" );
+			var anchor = parent.find('a:first');
+			if (!anchor.length) {
+				anchor = $("<a></a>").html(title).prependTo(parent.empty());
+			}
+			anchor.attr('href','#' + id);
 		}).listview();
 	}
 });
@@ -3843,7 +4171,7 @@ $.widget( "mobile.dialog", $.mobile.widget, {
 			if( $el.is('.ui-page-active') ){
 				self.close();
 				$el.bind('pagehide',function(){
-					$.mobile.updateHash( $prevPage.attr('id'), true);
+					$.mobile.updateHash( $prevPage.attr('data-url'), true);
 				});
 			}
 		});		
@@ -3952,13 +4280,14 @@ $.fn.grid = function(options){
 //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-role=\'dialog\' data-theme=\'a\'>' +
+      '<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>'+
@@ -3972,6 +4301,7 @@ $.fn.grid = function(options){
       $('<li><a href=\'#\'>' + themes[ i ].charAt(0).toUpperCase() + themes[ i ].substr(1) + '</a></li>')
       .click(function(){
         addTheme( themes[i] );
+        menuPage.dialog('close');
       })
       .appendTo(menu);
     });	
@@ -3983,8 +4313,5 @@ $.fn.grid = function(options){
     
     //create page, listview
     menuPage.page();
-    
-    //change page now	
-    $.mobile.changePage([currentPage, menuPage], 'pop', false);
   };
 })(jQuery);