" ).parent();
- // callback - remove classes, etc
- to.animationComplete(function() {
- from.add( to ).removeClass(" out in reverse " + transitions );
- from.removeClass( activePageClass );
- loadComplete();
- });
- }
- else{
- from.removeClass( activePageClass );
- to.addClass( activePageClass );
- loadComplete();
- }
- };
+ $.each(copyAttrs,function(i){
+ if( newPage.attr( copyAttrs[ i ] ) ){
+ wrapper.attr( copyAttrs[ i ], newPage.attr( copyAttrs[ i ] ) );
+ newPage.removeAttr( copyAttrs[ i ] );
+ }
+ });
+ return wrapper;
+ }
- jQuery(function() {
- var preventLoad = false;
- $body = jQuery( "body" );
- pageLoading();
-
- // needs to be bound at domready (for IE6)
- // find or load content, make it active
- $window.bind( "hashchange", function(e, extras) {
- if ( preventLoad ) {
- preventLoad = false;
- return;
- }
+ //for getting or creating a new page
+ function changePage( to, transition, back, changeHash){
- var url = location.hash.replace( /^#/, "" ),
- stackLength = urlStack.length,
- // pageTransition only exists if the user clicked a link
- back = !pageTransition && stackLength > 1 &&
- urlStack[ stackLength - 2 ].url === url,
- transition = (extras && extras.manuallyTriggered) ? false : pageTransition || "slide",
- fileUrl = url;
- pageTransition = undefined;
+ //from is always the currently viewed page
+ var toIsArray = $.type(to) === "array",
+ from = toIsArray ? to[0] : $.activePage,
+ to = toIsArray ? to[1] : to,
+ url = fileUrl = $.type(to) === "string" ? to.replace( /^#/, "" ) : null,
+ back = (back !== undefined) ? back : (forceBack || ( urlStack.length > 1 && urlStack[ urlStack.length - 2 ].url === url )),
+ transition = (transition !== undefined) ? transition : ( pageTransition || "slide" );
+
+ //unset pageTransition, forceBack
+ pageTransition = undefined;
+ forceBack = undefined;
- //reset base to pathname for new request
- resetBaseURL();
+ //reset base to pathname for new request
+ resetBaseURL();
- // if the new href is the same as the previous one
- if ( back ) {
- transition = urlStack.pop().transition;
- } else {
- urlStack.push({ url: url, transition: transition });
- if ( forceBack ) back = true;
- }
- forceBack = undefined;
+ // if the new href is the same as the previous one
+ if ( back ) {
+ transition = urlStack.pop().transition;
+ } else {
+ urlStack.push({ url: url, transition: transition });
+ }
+
+ //function for transitioning between two existing pages
+ function transitionPages() {
+
+ //kill the keyboard
+ jQuery( document.activeElement ).blur();
- //function for setting role of next page
- function setPageRole( newPage ) {
- if ( nextPageRole ) {
- newPage.attr( "data-role", nextPageRole );
- nextPageRole = undefined;
+ //trigger before show/hide events
+ from.data("page")._trigger("beforehide", {nextPage: to});
+ to.data("page")._trigger("beforeshow", {prevPage: from});
+
+ function loadComplete(){
+ 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 ){
+ $.activePage = to;
+ }
+ reFocus( to );
+ if( changeHash && url ){
+ hashListener = false;
+ location.hash = url;
+ setTimeout(function(){
+ hashListener = true;
+ }, 500);
}
}
- //wrap page and transfer data-attrs if it has an ID
- function wrapNewPage( newPage ){
- var copyAttrs = ['data-role', 'data-theme', 'data-fullscreen'], //TODO: more page-level attrs?
- wrapper = newPage.wrap( "
" ).parent();
-
- $.each(copyAttrs,function(i){
- if( newPage.attr( copyAttrs[ i ] ) ){
- wrapper.attr( copyAttrs[ i ], newPage.attr( copyAttrs[ i ] ) );
- newPage.removeAttr( copyAttrs[ i ] );
- }
+ if(transition){
+ // animate in / out
+ from.addClass( transition + " out " + ( back ? "reverse" : "" ) );
+ to.addClass( activePageClass + " " + transition +
+ " in " + ( back ? "reverse" : "" ) );
+
+ // callback - remove classes, etc
+ to.animationComplete(function() {
+ from.add( to ).removeClass(" out in reverse " + transitions );
+ from.removeClass( activePageClass );
+ loadComplete();
});
- return wrapper;
}
+ else{
+ from.removeClass( activePageClass );
+ to.addClass( activePageClass );
+ loadComplete();
+ }
+ };
+
+ //shared page enhancements
+ function enhancePage(){
+ setPageRole( to );
+ to.page();
+ }
+
+ //get the actual file in a jq-mobile nested url
+ function getFileURL( url ){
+ return url.match( '&' + jQuery.mobile.subPageUrlKey ) ? url.split( '&' + jQuery.mobile.subPageUrlKey )[0] : url;
+ }
+
+ //if url is a string
+ if( url ){
+ to = jQuery( "[id='" + url + "']" ),
+ fileUrl = getFileURL(url);
+ }
+ else{ //find base url of element, if avail
+ var toID = to.attr('id'),
+ toIDfileurl = getFileURL(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 ) {
+ if( fileUrl ){
+ setBaseURL(fileUrl);
+ }
+ enhancePage();
+ transitionPages();
+ } else {
- if ( url ) {
- var active = jQuery( ".ui-page-active" );
+ pageLoading();
- // see if content is present already
- var localDiv = jQuery( "[id='" + url + "']" );
- if ( localDiv.length ) {
- if ( localDiv.is( "[data-role]" ) ) {
- setPageRole( localDiv );
- }
- setBaseURL();
- localDiv.page();
- changePage( active, localDiv, transition, back );
+ $.ajax({
+ url: fileUrl,
+ success: function( html ) {
+ setBaseURL(fileUrl);
+ var all = jQuery("
");
+ //workaround to allow scripts to execute when included in page divs
+ all.get(0).innerHTML = html;
+ to = all.find('[data-role="page"]');
- } else { //ajax it in
- pageLoading();
-
- if ( url.match( '&' + jQuery.mobile.subPageUrlKey ) ) {
- fileUrl = url.split( '&' + jQuery.mobile.subPageUrlKey )[0];
+ //preserve ID on a retrieved page
+ if ( to.attr('id') ) {
+ to = wrapNewPage( to );
}
- $.ajax({
- url: fileUrl,
- success: function( html ) {
- var all = jQuery("
");
- //workaround to allow scripts to execute when included in page divs
- all.get(0).innerHTML = html;
- var page = all.find('[data-role="page"]');
-
- if ( page.attr('id') ) {
- page = wrapNewPage( page );
- }
+ to
+ .attr( "id", fileUrl )
+ .appendTo( $pageContainer );
+
+ enhancePage();
+ transitionPages();
+ },
+ error: function() {
+ pageLoading( true );
- page
- .attr( "id", fileUrl )
- .appendTo( $pageContainer );
+ jQuery("
Error Loading Page
")
+ .css({ "display": "block", "opacity": 0.96, "top": $(window).scrollTop() + 100 })
+ .appendTo( $pageContainer )
+ .delay( 800 )
+ .fadeOut( 400, function(){
+ $(this).remove();
+ });
+ }
+ });
+ }
- setPageRole( page );
- page.page();
- changePage( active, page, transition, back );
- },
- error: function() {
- pageLoading( true );
+ };
- jQuery("
Error Loading Page
")
- .css({ "display": "block", "opacity": 0.96 })
- .appendTo( $pageContainer )
- .delay( 800 )
- .fadeOut( 400, function(){
- $(this).remove();
- });
+
+ jQuery(function() {
- preventLoad = true;
- history.back();
- }
- });
-
- setBaseURL();
- }
- } else {
- // either we've backed up to the root page url
- // or it's the first page load with no hash present
- var currentPage = jQuery( ".ui-page-active" );
- if ( currentPage.length && !$startPage.is( ".ui-page-active" ) ) {
- changePage( currentPage, $startPage, transition, back );
- } else {
- $startPage.trigger("pagebeforeshow", {prevPage: $('')});
- $startPage.addClass( activePageClass );
- pageLoading( true );
-
- if( $startPage.trigger("pageshow", {prevPage: $('')}) !== false ){
- reFocus($startPage);
- }
+ $body = jQuery( "body" );
+ pageLoading();
+
+ // needs to be bound at domready (for IE6)
+ // find or load content, make it active
+ $window.bind( "hashchange", function(e, extras) {
+ if( !hashListener ){ return; }
+ var to = location.hash,
+ transition = (extras && extras.manuallyTriggered) ? false : undefined;
+
+ // either we've backed up to the root page url
+ // or it's the first page load with no hash present
+ //there's a hash and it wasn't manually triggered
+ // > probably a new page, "back" will be figured out by changePage
+ if ( to ){
+ changePage( to, transition);
+ }
+ //there's no hash, the active page is not the start page, and it's not manually triggered hashchange
+ // > probably backed out to the first page visited
+ else if( $.activePage.length && !$startPage.is( $.activePage ) && !(extras && extras.manuallyTriggered) ) {
+ changePage( $startPage, transition, true );
+ }
+ else{
+ $startPage.trigger("pagebeforeshow", {prevPage: $('')});
+ $startPage.addClass( activePageClass );
+ pageLoading( true );
+
+ if( $startPage.trigger("pageshow", {prevPage: $('')}) !== false ){
+ reFocus($startPage);
}
}
+
});
});
@@ -368,7 +409,7 @@
jQuery(function(){
//set up active page
- $startPage = jQuery("[data-role='page']").first();
+ $startPage = $.activePage = jQuery("[data-role='page']").first();
//set page container
$pageContainer = $startPage.parent();
diff --git a/js/jquery.mobile.listview.js b/js/jquery.mobile.listview.js
index 58f0b5e648e..a6d26a4e956 100644
--- a/js/jquery.mobile.listview.js
+++ b/js/jquery.mobile.listview.js
@@ -27,7 +27,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
this.element.addClass( "ui-listview-inset ui-corner-all ui-shadow" );
}
- this.element.delegate("ui-li", "focusin", function() {
+ this.element.delegate(".ui-li", "focusin", function() {
jQuery(this).attr( "tabindex", "0" );
});
@@ -126,10 +126,7 @@ $.widget( "mobile.listview", $.mobile.widget, {
$list.find( ".ui-li-dec" ).remove();
}
- li
- .addClass( "ui-li" )
- .attr( "role", "option" )
- .attr( "tabindex", "-1" )
+ li.attr({ "role": "option", "tabindex": "-1" });
li.first().attr( "tabindex", "0" );
@@ -141,6 +138,8 @@ $.widget( "mobile.listview", $.mobile.widget, {
return;
}
+ item.addClass( "ui-li" );
+
var a = item.find( "a" );
if ( a.length ) {
diff --git a/js/jquery.mobile.page.js b/js/jquery.mobile.page.js
index 9c06e64f473..b7150a3085f 100644
--- a/js/jquery.mobile.page.js
+++ b/js/jquery.mobile.page.js
@@ -52,11 +52,8 @@ $.widget( "mobile.page", $.mobile.widget, {
//auto-add back btn on pages beyond first view
if ( $.mobile.addBackBtn && role === "header" && ($.mobile.urlStack.length > 1 || $('.ui-page').length > 1) && !leftbtn && !$this.data( "noBackBtn" ) ) {
$( "
Back" )
- .tap(function() {
- history.back();
- return false;
- })
.click(function() {
+ history.back();
return false;
})
.prependTo( $this );
diff --git a/js/manifest.php b/js/manifest.php
index a8440c98907..a5f8a182132 100644
--- a/js/manifest.php
+++ b/js/manifest.php
@@ -7,7 +7,6 @@
'jquery.mobile.event.js',
'jquery.mobile.hashchange.js',
'jquery.mobile.page.js',
- 'jquery.mobile.clickable.js',
'jquery.mobile.fixHeaderFooter.js',
'jquery.mobile.forms.checkboxradio.js',
'jquery.mobile.forms.textinput.js',