Commit 4fbd0d7d authored by Sven Franck's avatar Sven Franck

test commit for JSBIN

parent 352e6d72
......@@ -2757,6 +2757,9 @@ if ( !$.support.boxShadow ) {
// addNew is used whenever a new page is added
add: function( url, data ) {
console.log("ADDING entry to URL history")
console.log(url)
console.log(data)
data = data || {};
//if there's forward history, wipe it
......@@ -5203,6 +5206,8 @@ $.widget( "mobile.page", {
alreadyThere, newPageTitle,
params, cssTransitionDeferred,
beforeTransition;
console.log("transition");
console.log(toPage)
// If we are in the midst of a transition, queue the current request.
// We'll call changePage() once we're done with the current transition
......@@ -5258,7 +5263,7 @@ $.widget( "mobile.page", {
isDialog = ( settings.role === "dialog" ||
toPage.jqmData( "role" ) === "dialog" ) &&
toPage.jqmData( "dialog" ) !== true;
console.log("THIS IS A DIAOLIG transition");
// By default, we prevent changePage requests when the fromPage and toPage
// are the same element, but folks that generate content
// manually/dynamically and reuse pages want to be able to transition to
......@@ -5333,6 +5338,7 @@ $.widget( "mobile.page", {
// we're about to display another dialog, then we must add another hash
// and history entry on top so that one may navigate back to the
// original dialog
console.log("we are inside a isDialog and active")
if ( active.url &&
active.url.indexOf( $.mobile.dialogHashKey ) > -1 &&
this.activePage &&
......@@ -5341,8 +5347,9 @@ $.widget( "mobile.page", {
settings.changeHash = false;
alreadyThere = true;
console.log("and already there is set to true")
}
console.log(alreadyThere);
// Normally, we tack on a dialog hash key, but if this is the location
// of a stale dialog, we reuse the URL from the entry
url = ( active.url || "" );
......@@ -5380,6 +5387,10 @@ $.widget( "mobile.page", {
//add page to history stack if it's not back or forward
if ( !historyDir && alreadyThere ) {
console.log("ADDING page to history!")
console.log(historyDir)
console.log(!historyDir)
console.log(alreadyThere)
$.mobile.navigate.history.getActive().pageUrl = pageUrl;
}
......@@ -10578,8 +10589,9 @@ $.widget( "mobile.popup", {
var parsedDst, toUrl,
currentOptions = this.options,
immediate = false;
console.log("CLOSING")
if ( ( theEvent && theEvent.isDefaultPrevented() ) || $.mobile.popup.active !== this ) {
console.log("return = do nothing?");
return;
}
......@@ -10589,10 +10601,13 @@ $.widget( "mobile.popup", {
if ( theEvent && theEvent.type === "pagebeforechange" && data ) {
// Determine whether we need to rapid-close the popup, or whether we can
// take the time to run the closing transition
console.log("hm...data.toPage =")
console.log(data.toPage);
if ( typeof data.toPage === "string" ) {
parsedDst = data.toPage;
} else {
parsedDst = data.toPage.jqmData( "url" );
console.log("object, so parsedDst is toPage data-url ="+parsedDst);
}
parsedDst = $.mobile.path.parseUrl( parsedDst );
toUrl = parsedDst.pathname + parsedDst.search + parsedDst.hash;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment