diff --git a/js/events/navigate.js b/js/events/navigate.js index 0edf414c42a..a4c5b7508d9 100644 --- a/js/events/navigate.js +++ b/js/events/navigate.js @@ -47,9 +47,11 @@ define([ return; } - if( event.historyState ){ + // GrabOne Modified + // to avoid automatic navigation when page is loaded. + /*if( event.historyState ){ $.extend(state, event.historyState); - } + }*/ // Make sure the original event is tracked for the end // user to inspect incase they want to do something special diff --git a/js/events/touch.js b/js/events/touch.js index 512a492f186..75cf1369642 100644 --- a/js/events/touch.js +++ b/js/events/touch.js @@ -44,7 +44,9 @@ define( [ "jquery", "../jquery.mobile.vmouse", "../jquery.mobile.support.touch" enabled: true, setup: function() { - + // Grabone Modified + // to reduce response time. + if (!$.mobile.isiOSApp) { var thisObject = this, $this = $( thisObject ), scrolling, @@ -71,6 +73,7 @@ define( [ "jquery", "../jquery.mobile.vmouse", "../jquery.mobile.support.touch" trigger( event, false ); }, 50 ); }); + } } }; diff --git a/js/jquery.mobile.buttonMarkup.js b/js/jquery.mobile.buttonMarkup.js index 36e4fa2a662..a6195d40dc3 100644 --- a/js/jquery.mobile.buttonMarkup.js +++ b/js/jquery.mobile.buttonMarkup.js @@ -52,7 +52,11 @@ $.fn.buttonMarkup = function( options ) { buttonElements; for ( key in o ) { - e.setAttribute( nsKey + key, o[ key ] ); + if ( o[ key ] === undefined || o[ key ] === null ) { + el.removeAttr( nsKey + key ); + } else { + e.setAttribute( nsKey + key, o[ key ] ); + } } if ( getAttrFixed( e, nsKey + "rel" ) === "popup" && el.attr( "href" ) ) { @@ -124,10 +128,6 @@ $.fn.buttonMarkup = function( options ) { } } - if ( o.iconpos && o.iconpos === "notext" && !el.attr( "title" ) ) { - el.attr( "title", el.getEncodedText() ); - } - if ( buttonElements ) { el.removeClass( buttonElements.bcls || "" ); } @@ -228,15 +228,19 @@ var attachEvents = function() { isTouchEvent = event.originalEvent && /^touch/.test( event.originalEvent.type ), evt = event.type; - if ( $btn.length ) { + // Grabone Modified + // to reduce response time. + if ( !isTouchEvent && $btn.length ) { theme = $btn.attr( "data-" + $.mobile.ns + "theme" ); if ( evt === "vmousedown" ) { if ( isTouchEvent ) { + // Grabone Modified + // to disable touch highlight. // Use a short delay to determine if the user is scrolling before highlighting - hov = setTimeout( function() { + /*hov = setTimeout( function() { updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-down-" + theme, undefined, "down" ); - }, hoverDelay ); + }, hoverDelay );*/ } else { updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-down-" + theme, undefined, "down" ); } @@ -244,30 +248,38 @@ var attachEvents = function() { updateButtonClass( $btn, "ui-btn-down-" + theme, "ui-btn-up-" + theme, undefined, "up" ); } else if ( evt === "vmouseover" || evt === "focus" ) { if ( isTouchEvent ) { + // Grabone Modified + // to disable touch highlight. // Use a short delay to determine if the user is scrolling before highlighting - foc = setTimeout( function() { + /*foc = setTimeout( function() { updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-hover-" + theme, true, "" ); - }, hoverDelay ); + }, hoverDelay );*/ } else { updateButtonClass( $btn, "ui-btn-up-" + theme, "ui-btn-hover-" + theme, true, "" ); } } else if ( evt === "vmouseout" || evt === "blur" || evt === "scrollstart" ) { updateButtonClass( $btn, "ui-btn-hover-" + theme + " ui-btn-down-" + theme, "ui-btn-up-" + theme, false, "up" ); - if ( hov ) { + + // Grabone Modified + // to disable touch highlight. + /*if ( hov ) { clearTimeout( hov ); } if ( foc ) { clearTimeout( foc ); - } + }*/ } } - }, + } + // Grabone Modified + // to reduce response time. + /*, "focusin focus": function( event ) { $( closestEnabledButton( event.target ) ).addClass( $.mobile.focusClass ); }, "focusout blur": function( event ) { $( closestEnabledButton( event.target ) ).removeClass( $.mobile.focusClass ); - } + }*/ }); attachEvents = null; diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 58554303802..0140f4f85d4 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -32,7 +32,7 @@ define( [ "jquery", "./jquery.mobile.ns", "text!../version.txt" ], function( jQu activeBtnClass: "ui-btn-active", // Class used for "focus" form element state, from CSS framework - focusClass: "ui-focus", + focusClass: "", // Automatically handle clicks and form submissions through Ajax, when same-domain ajaxEnabled: true, @@ -44,7 +44,7 @@ define( [ "jquery", "./jquery.mobile.ns", "text!../version.txt" ], function( jQu linkBindingEnabled: true, // Set default page transition - 'none' for no transitions - defaultPageTransition: "fade", + defaultPageTransition: "slide", // Set maximum window width for transitions to apply - 'false' for no limit maxTransitionWidth: false, diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js index 532a9077029..cf8329f0ea4 100644 --- a/js/jquery.mobile.navigation.js +++ b/js/jquery.mobile.navigation.js @@ -78,7 +78,16 @@ define( [ //urlHistory is purely here to make guesses at whether the back or forward button was clicked //and provide an appropriate transition urlHistory = $.mobile.navigate.history, - + + // Grabone Modified + // to detect ios and android app. + isiOSApp = (/scroller/i).test(navigator.userAgent), + isAndroidApp = (/grabone.*android/i).test(navigator.userAgent), + + // Grabone Modified + // to setup vclick event. + clickEvent = (isiOSApp) ? "click vclick" : "click", + //define first selector to receive focus when a page is shown focusable = "[tabindex],a,button:visible,select:visible,input", @@ -106,6 +115,42 @@ define( [ getScreenHeight = $.mobile.getScreenHeight; + // Grabone Modified + // to get ios app version. + var iOSAppVersion = 0; + var match = navigator.userAgent.match(/scroller\/(\d+)$/i); + if (match && match.length > 1) { + iOSAppVersion = match[1]; + } + + // Grabone Modified + // to get iphone os version. + var iPhoneOSVersion = 0; + match = navigator.userAgent.match(/iphone os (\d+)/i); + if (match && match.length > 1) { + iPhoneOSVersion = match[1]; + } + + // Grabone Modified + // to get ipad os version. + var iPadOSVersion = 0; + match = navigator.userAgent.match(/ipad; cpu os (\d+)/i); + if (match && match.length > 1) { + iPadOSVersion = match[1]; + } + + // Grabone Modified + // to get android app version. + var androidAppVersion = 0; + match = navigator.userAgent.match(/^grabone mobile (\d+) .*android/i); + if (match && match.length > 1) { + androidAppVersion = match[1]; + } + + // Grabone Modified + // to show loading dialogue on jelly bean. + var isExternalDelayed = (isAndroidApp && (/android 4\./i).test(navigator.userAgent)); + //base element management, defined depending on dynamic base tag support var base = $.support.dynamicBaseTag ? { @@ -186,6 +231,9 @@ define( [ } } + // Grabone Modified + // to reduce response time. + if (!$.mobile.isiOSApp) { // Save the last scroll distance per page, before it is hidden var setLastScrollEnabled = true, setLastScroll, delayedSetLastScroll; @@ -205,6 +253,11 @@ define( [ // Set active page's lastScroll prop. // If the location we're scrolling to is less than minScrollBack, let it go. active.lastScroll = lastScroll < $.mobile.minScrollBack ? $.mobile.defaultHomeScroll : lastScroll; + // Grabone Modified + // to remember the scroll position + if ($.mobile.activePage) { + $.mobile.activePage.data('lastScroll', lastScroll); + } } }; @@ -248,7 +301,8 @@ define( [ // bind to scrollstop for the first page as "pagechange" won't be fired in that case $window.bind( "scrollstop", delayedSetLastScroll ); - + } + // No-op implementation of transition degradation $.mobile._maybeDegradeTransition = $.mobile._maybeDegradeTransition || function( transition ) { return transition; @@ -340,9 +394,44 @@ define( [ //history stack $.mobile.urlHistory = urlHistory; - + + // Grabone Modified + // to detect ios and android app. + $.mobile.isiOSApp = isiOSApp; + $.mobile.isAndroidApp = isAndroidApp; + + // Grabone Modified + // to get ios app version. + $.mobile.iOSAppVersion = iOSAppVersion; + + // Grabone Modified + // to get iphone os version. + $.mobile.iPhoneOSVersion = iPhoneOSVersion; + + // Grabone Modified + // to get ipad os version. + $.mobile.iPadOSVersion = iPadOSVersion; + + // Grabone Modified + // to get ios version. + $.mobile.iOSVersion = iPhoneOSVersion || iPadOSVersion; + + // Grabone Modified + // to get android app version. + $.mobile.androidAppVersion = androidAppVersion; + + // Grabone Modified + // to setup vclick event. + $.mobile.clickEvent = clickEvent; + $.mobile.dialogHashKey = dialogHashKey; + // Grabone Modified + // to get whether pages are transitioning. + $.mobile.isPageTransitionLocked = function(){ + return isPageTransitioning; + }; + //enable cross-domain page support $.mobile.allowCrossDomainPages = false; @@ -503,149 +592,203 @@ define( [ if ( !( $.mobile.allowCrossDomainPages || path.isSameDomain( documentUrl, absUrl ) ) ) { deferred.reject( absUrl, options ); } else { + // GrabOne Modified + // to be able to trigger fail form ajax success. + var errorCallback = function( xhr, textStatus, errorThrown ) { + // GrabOne Modified + // to workaround error triggered when accessing offline content. + if (xhr.status == 0 && xhr.responseText) { + return successCallback(xhr.responseText, 'success', xhr); + } + + //set base back to current path + if( base ) { + base.set( path.get() ); + } + + // Add error info to our triggerData. + triggerData.xhr = xhr; + triggerData.textStatus = textStatus; + triggerData.errorThrown = errorThrown; + + var plfEvent = new $.Event( "pageloadfailed" ); + + // Let listeners know the page load failed. + settings.pageContainer.trigger( plfEvent, triggerData ); + + // If the default behavior is prevented, stop here! + // Note that it is the responsibility of the listener/handler + // that called preventDefault(), to resolve/reject the + // deferred object within the triggerData. + if( plfEvent.isDefaultPrevented() ){ + return; + } + + // Remove loading message. + if ( settings.showLoadMsg ) { + + // Remove loading message. + hideMsg(); + + // show error message + $.mobile.showPageLoadingMsg( $.mobile.pageLoadErrorMessageTheme, $.mobile.pageLoadErrorMessage, true ); + + // hide after delay + setTimeout( $.mobile.hidePageLoadingMsg, 1500 ); + } + + deferred.reject( absUrl, options ); + }; + + // GrabOne Modified + // to be able to trigger success form ajax error. + var successCallback = function( html, textStatus, xhr ) { + // GrabOne Modified + // to workaround 304 with undefined html in mobile safari on ios 4.3. + if (!html) { + return errorCallback(xhr, 'error', 'Not Found'); + } + + // Grabone Modified + // to workaround the limitation on redirection with cross-domain ajax. + var matches = html.match(/^Location: (.*)/) + if (matches) { + delete options.type; + delete options.data; + releasePageTransitionLock(); + $.mobile.changePage(matches[1], options); + return; + } + + //pre-parse html to check for a data-url, + //use it as the new fileUrl, base path, etc + var all = $( "" ), + + //page title regexp + newPageTitle = html.match( /]*>([^<]*)/ ) && RegExp.$1, + + // TODO handle dialogs again + pageElemRegex = new RegExp( "(<[^>]+\\bdata-" + $.mobile.ns + "role=[\"']?page[\"']?[^>]*>)" ), + dataUrlRegex = new RegExp( "\\bdata-" + $.mobile.ns + "url=[\"']?([^\"'>]*)[\"']?" ); + + // data-url must be provided for the base tag so resource requests can be directed to the + // correct url. loading into a temprorary element makes these requests immediately + if( pageElemRegex.test( html ) + && RegExp.$1 + && dataUrlRegex.test( RegExp.$1 ) + && RegExp.$1 ) { + url = fileUrl = path.getFilePath( $( "

" + RegExp.$1 + "

" ).text() ); + } + + //workaround to allow scripts to execute when included in page divs + all.get( 0 ).innerHTML = html; + page = all.find( ":jqmData(role='page'), :jqmData(role='dialog')" ).first(); + + //if page elem couldn't be found, create one and insert the body element's contents + if( !page.length ){ + page = $( "

" + ( html.split( /<\/?body[^>]*>/gmi )[1] || "" ) + "

" ); + } + + if ( newPageTitle && !page.jqmData( "title" ) ) { + if ( ~newPageTitle.indexOf( "&" ) ) { + newPageTitle = $( "

" + newPageTitle + "

" ).text(); + } + page.jqmData( "title", newPageTitle ); + } + + //rewrite src and href attrs to use a base url + if( !$.support.dynamicBaseTag ) { + var newPath = path.get( fileUrl ); + page.find( "[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]" ).each(function() { + var thisAttr = $( this ).is( '[href]' ) ? 'href' : + $(this).is('[src]') ? 'src' : 'action', + thisUrl = $( this ).attr( thisAttr ); + + // XXX_jblas: We need to fix this so that it removes the document + // base URL, and then prepends with the new page URL. + //if full path exists and is same, chop it - helps IE out + thisUrl = thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' ); + + if( !/^(\w+:|#|\/)/.test( thisUrl ) ) { + $( this ).attr( thisAttr, newPath + thisUrl ); + } + }); + } + + // GrabOne Modified + // to mark the page after reloaded. + if (settings.reloadPageServer) { + page.attr('data-reloaded', true); + } + + //append to page and enhance + // TODO taging a page with external to make sure that embedded pages aren't removed + // by the various page handling code is bad. Having page handling code in many + // places is bad. Solutions post 1.0 + page + .attr( "data-" + $.mobile.ns + "url", path.convertUrlToDataUrl( fileUrl ) ) + .attr( "data-" + $.mobile.ns + "external-page", true ) + .appendTo( settings.pageContainer ); + + // wait for page creation to leverage options defined on widget + page.one( 'pagecreate', $.mobile._bindPageRemove ); + + enhancePage( page, settings.role ); + + // Enhancing the page may result in new dialogs/sub pages being inserted + // into the DOM. If the original absUrl refers to a sub-page, that is the + // real page we are interested in. + if ( absUrl.indexOf( "&" + $.mobile.subPageUrlKey ) > -1 ) { + page = settings.pageContainer.children( "[data-" + $.mobile.ns +"url='" + dataUrl + "']" ); + } + + // Remove loading message. + if ( settings.showLoadMsg ) { + hideMsg(); + } + + // Add the page reference and xhr to our triggerData. + triggerData.xhr = xhr; + triggerData.textStatus = textStatus; + triggerData.page = page; + + // Let listeners know the page loaded successfully. + settings.pageContainer.trigger( "pageload", triggerData ); + + deferred.resolve( absUrl, options, page, dupCachedPage ); + }; + + // GrabOne Modified + // to ensure a fresh response from server. + var headers = {}; + if (settings.reloadPageServer) { + headers['If-None-Match'] = ''; + } + if (settings.reloadPageServerAt) { + headers['Invalidate-Before'] = settings.reloadPageServerAt; + } + // Load the new page. - $.ajax({ + // GrabOne Modified + // to be able to abort the ajax request. + var xhr = $.ajax({ url: fileUrl, type: settings.type, data: settings.data, dataType: "html", - success: function( html, textStatus, xhr ) { - //pre-parse html to check for a data-url, - //use it as the new fileUrl, base path, etc - var all = $( "

" ), - - //page title regexp - newPageTitle = html.match( /]*>([^<]*)/ ) && RegExp.$1, - - // TODO handle dialogs again - pageElemRegex = new RegExp( "(<[^>]+\\bdata-" + $.mobile.ns + "role=[\"']?page[\"']?[^>]*>)" ), - dataUrlRegex = new RegExp( "\\bdata-" + $.mobile.ns + "url=[\"']?([^\"'>]*)[\"']?" ); - - - // data-url must be provided for the base tag so resource requests can be directed to the - // correct url. loading into a temprorary element makes these requests immediately - if ( pageElemRegex.test( html ) && - RegExp.$1 && - dataUrlRegex.test( RegExp.$1 ) && - RegExp.$1 ) { - url = fileUrl = path.getFilePath( $( "

" + RegExp.$1 + "

" ).text() ); - } - - if ( base ) { - base.set( fileUrl ); - } - - //workaround to allow scripts to execute when included in page divs - all.get( 0 ).innerHTML = html; - page = all.find( ":jqmData(role='page'), :jqmData(role='dialog')" ).first(); - - //if page elem couldn't be found, create one and insert the body element's contents - if ( !page.length ) { - page = $( "

" + ( html.split( /<\/?body[^>]*>/gmi )[1] || "" ) + "

" ); - } - - if ( newPageTitle && !page.jqmData( "title" ) ) { - if ( ~newPageTitle.indexOf( "&" ) ) { - newPageTitle = $( "

" + newPageTitle + "

" ).text(); - } - page.jqmData( "title", newPageTitle ); - } - - //rewrite src and href attrs to use a base url - if ( !$.support.dynamicBaseTag ) { - var newPath = path.get( fileUrl ); - page.find( "[src], link[href], a[rel='external'], :jqmData(ajax='false'), a[target]" ).each(function() { - var thisAttr = $( this ).is( '[href]' ) ? 'href' : - $( this ).is( '[src]' ) ? 'src' : 'action', - thisUrl = $( this ).attr( thisAttr ); - - // XXX_jblas: We need to fix this so that it removes the document - // base URL, and then prepends with the new page URL. - //if full path exists and is same, chop it - helps IE out - thisUrl = thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' ); - - if ( !/^(\w+:|#|\/)/.test( thisUrl ) ) { - $( this ).attr( thisAttr, newPath + thisUrl ); - } - }); - } - - //append to page and enhance - // TODO taging a page with external to make sure that embedded pages aren't removed - // by the various page handling code is bad. Having page handling code in many - // places is bad. Solutions post 1.0 - page - .attr( "data-" + $.mobile.ns + "url", path.convertUrlToDataUrl( fileUrl ) ) - .attr( "data-" + $.mobile.ns + "external-page", true ) - .appendTo( settings.pageContainer ); - - // wait for page creation to leverage options defined on widget - page.one( 'pagecreate', $.mobile._bindPageRemove ); - - enhancePage( page, settings.role ); - - // Enhancing the page may result in new dialogs/sub pages being inserted - // into the DOM. If the original absUrl refers to a sub-page, that is the - // real page we are interested in. - if ( absUrl.indexOf( "&" + $.mobile.subPageUrlKey ) > -1 ) { - page = settings.pageContainer.children( "[data-" + $.mobile.ns +"url='" + dataUrl + "']" ); - } - - // Remove loading message. - if ( settings.showLoadMsg ) { - hideMsg(); - } - - // Add the page reference and xhr to our triggerData. - triggerData.xhr = xhr; - triggerData.textStatus = textStatus; - triggerData.page = page; - - // Let listeners know the page loaded successfully. - settings.pageContainer.trigger( "pageload", triggerData ); - - deferred.resolve( absUrl, options, page, dupCachedPage ); - }, - error: function( xhr, textStatus, errorThrown ) { - //set base back to current path - if ( base ) { - base.set( path.get() ); - } - - // Add error info to our triggerData. - triggerData.xhr = xhr; - triggerData.textStatus = textStatus; - triggerData.errorThrown = errorThrown; - - var plfEvent = new $.Event( "pageloadfailed" ); - - // Let listeners know the page load failed. - settings.pageContainer.trigger( plfEvent, triggerData ); - - // If the default behavior is prevented, stop here! - // Note that it is the responsibility of the listener/handler - // that called preventDefault(), to resolve/reject the - // deferred object within the triggerData. - if ( plfEvent.isDefaultPrevented() ) { - return; - } - - // Remove loading message. - if ( settings.showLoadMsg ) { - - // Remove loading message. - hideMsg(); - - // show error message - $.mobile.showPageLoadingMsg( $.mobile.pageLoadErrorMessageTheme, $.mobile.pageLoadErrorMessage, true ); - - // hide after delay - setTimeout( $.mobile.hidePageLoadingMsg, 1500 ); - } - - deferred.reject( absUrl, options ); - } + // GrabOne Modified + // to distinguish between requesting a full-page and a partial. + entirePage: true, + // GrabOne Modified + // to ensure a fresh response from server. + headers: headers, //{'X-Requested-With':'XMLHttpRequest'} + success: successCallback, + error: errorCallback }); + + if (settings.xhr) { + $.mobile.xhr = xhr; + } } return deferred.promise(); @@ -746,6 +889,12 @@ define( [ //clear out the active button state removeActiveLinkClass( true ); + + // Grabone Modified + // to avoid retrying a failed page. + if (pageTransitionQueue.length > 0 && toPage == pageTransitionQueue[0][0]) { + pageTransitionQueue.pop(); + } //release transition lock so navigation is free again releasePageTransitionLock(); @@ -753,6 +902,13 @@ define( [ }); return; } + + // Grabone Modified + // to skip intermediate pages and transition only to the last. + if (pageTransitionQueue.length > 0) { + releasePageTransitionLock(); + return; + } // If we are going to the first-page of the application, we need to make // sure settings.dataUrl is set to the application document url. This allows @@ -808,6 +964,9 @@ define( [ historyDir = options.direction === "back" ? -1 : 1; } + // Grabone Modified + // to reduce response time. + if (!isiOSApp) { // Kill the keyboard. // XXX_jblas: We need to stop crawling the entire document to kill focus. Instead, // we should be tracking focus with a delegate() handler so we already have @@ -821,6 +980,7 @@ define( [ $( "input:focus, textarea:focus, select:focus" ).blur(); } } catch( e ) {} + } // Record whether we are at a place in history where a dialog used to be - if so, do not add a new history entry and do not change the hash either var alreadyThere = false; @@ -996,6 +1156,10 @@ define( [ var getAjaxFormData = function( $form, calculateOnly ) { var type, target, url, ret = true, formData, vclickedName; if ( !$.mobile.ajaxEnabled || + // Grabone Modified + // to enable cross-domain ajax. + // (!$.mobile.allowCrossDomainPages && $form.is( "[rel='external']" )) || + $form.is( "[rel='external']" ) || // test that the form is, itself, ajax false $form.is( ":jqmData(ajax='false')" ) || // test that $.mobile.ignoreContentEnabled is set and @@ -1026,7 +1190,17 @@ define( [ url = path.makeUrlAbsolute( url, getClosestBaseUrl( $form ) ); - if ( ( path.isExternal( url ) && !path.isPermittedCrossDomainRequest( documentUrl, url ) ) || target ) { + //external submits use regular HTTP + if( path.isExternal( url ) || target ) { + // GrabOne Modified + // to show loading message when submitting to a cross-domain url. + if (navigator.onLine) { + $.mobile.showPageLoadingMsg(); + $(window).one('pagehide unload', function(){ + $.mobile.hidePageLoadingMsg(); + }); + } + return false; } @@ -1074,6 +1248,24 @@ define( [ $.mobile.changePage( formData.url, formData.options ); event.preventDefault(); } + else { + // GrabOne Modified + // to show loading message when submitting to a cross-domain url. + if (navigator.onLine) { + $.mobile.showPageLoadingMsg(); + $(window).one('pagehide unload', function(){ + $.mobile.hidePageLoadingMsg(); + }); + + // Grabone Modified + // to show loading dialogue on jelly bean. + if (isExternalDelayed && event.originalEvent) { + var $this = $(this); + setTimeout(function() { $this.submit(); }, 100); + event.preventDefault(); + } + } + } }); //add active state on vclick @@ -1144,18 +1336,18 @@ define( [ }); // click routing - direct to HTTP or Ajax, accordingly - $.mobile.document.bind( "click", function( event ) { - if ( !$.mobile.linkBindingEnabled || event.isDefaultPrevented() ) { - return; - } + $( document ).bind( clickEvent, function( event ) { + if( !$.mobile.linkBindingEnabled ){ + return; + } var link = findClosestLink( event.target ), $link = $( link ), httpCleanup; - // If there is no link associated with the click or its not a left - // click we want to ignore the click - // TODO teach $.mobile.hijackable to operate on raw dom elements so the link wrapping - // can be avoided - if ( !link || event.which > 1 || !$link.jqmHijackable().length ) { + // If there is no link associated with the click or its not a left + // click we want to ignore the click + // Grabone Modified + // to include middle click. + if ( !link || event.which > 2) { return; } @@ -1166,11 +1358,42 @@ define( [ //if there's a data-rel=back attr, go back in history if ( $link.is( ":jqmData(rel='back')" ) ) { - $.mobile.back(); + // GrabOne Modified + // to show loading message when going back in history. + if (navigator.onLine) { + $.mobile.showPageLoadingMsg(); + $(window).one('pagehide unload', function(){ + $.mobile.hidePageLoadingMsg(); + }); + } + + // Grabone Modified + // to avoid going back in history twice becuase of enabling vclick. + if (isiOSApp) { + if (event.type == 'vclick') { + $link.data('triggered', true); + $.mobile.back(); + } + else { + if ($link.data('triggered')) { + $link.removeData('triggered'); + } + else { + $.mobile.back(); + } + } + } + else { + $.mobile.back(); + } return false; } - var baseUrl = getClosestBaseUrl( $link ), + // Grabone Modified + // to reduce response time + // assuming we always use absolute path not relative path. + // var baseUrl = getClosestBaseUrl( $link ), + var baseUrl = documentBase.hrefNoHash, //get href, if defined, otherwise default to empty hash href = path.makeUrlAbsolute( $link.attr( "href" ) || "#", baseUrl ); @@ -1182,6 +1405,8 @@ define( [ return; } + // GrabOne Modified + // to fix when there is hash in an external url. // XXX_jblas: Ideally links to application pages should be specified as // an url to the application document with a hash that is either // the site relative path or id to the page. But some of the @@ -1191,7 +1416,7 @@ define( [ // the current value of the base tag is at the time this code // is called. For now we are just assuming that any url with a // hash in it is an application page reference. - if ( href.search( "#" ) !== -1 ) { + if ( !path.isExternal(href) && href.search( "#" ) != -1 ) { href = href.replace( /[^#]*#/, "" ); if ( !href ) { //link was an empty hash meant purely @@ -1207,8 +1432,12 @@ define( [ } } + // GrabOne Modified + // to use jquery mobile to handle target links as there is no tab in our apps. + // to workaround navigation for example from /cacher#/ to /cacher#/auckland. // Should we handle this link, or let the browser deal with it? - var useDefaultUrlHandling = $link.is( "[rel='external']" ) || $link.is( ":jqmData(ajax='false')" ) || $link.is( "[target]" ), + var u = path.parseUrl($link.attr('href')), + useDefaultUrlHandling = ($link.is( "[rel='external']" ) || $link.is( ":jqmData(ajax='false')" )) && (u.hash == '' || location.pathname != u.pathname),// || $link.is( "[target]" ), // Some embedded browsers, like the web view in Phone Gap, allow cross-domain XHR // requests if the document doing the request was loaded via the file:// protocol. @@ -1223,6 +1452,30 @@ define( [ isExternal = useDefaultUrlHandling || ( path.isExternal( href ) && !path.isPermittedCrossDomainRequest( documentUrl, href ) ); if ( isExternal ) { + // GrabOne Modified + // to show loading message when opening a grabone cross-domain page. + var u = path.parseUrl(href); + if (navigator.onLine + && (!u.protocol || u.protocol.indexOf('http') >= 0) + && (!u.hostname || u.hostname.indexOf('grabone') >= 0) + && (!u.search || u.search.indexOf('target_blank=') < 0)) { + + $.mobile.showPageLoadingMsg(); + $(window).one('pagehide unload', function(){ + $.mobile.hidePageLoadingMsg(); + }); + + // Grabone Modified + // to show loading dialogue on jelly bean. + if (isExternalDelayed) { + href = $link.attr('href'); + if (href) { + setTimeout(function() { window.location = href; }, 100); + event.preventDefault(); + } + } + } + httpCleanup(); //use default click handling return; @@ -1233,16 +1486,21 @@ define( [ reverse = $link.jqmData( "direction" ) === "reverse" || // deprecated - remove by 1.0 $link.jqmData( "back" ), - + // Grabone Modified + // to be able to explicitly reload a page. + reloadPage = ($link.jqmData( "cache" ) === 'reload'), + //this may need to be more specific as we use data-rel more role = $link.attr( "data-" + $.mobile.ns + "rel" ) || undefined; - $.mobile.changePage( href, { transition: transition, reverse: reverse, role: role, link: $link } ); + $.mobile.changePage( href, { transition: transition, reverse: reverse, role: role, link: $link, reloadPage: reloadPage } ); event.preventDefault(); }); + // Grabone Modified + // to disable default prefetch mechanism. //prefetch pages when anchors with data-prefetch are encountered - $.mobile.document.delegate( ".ui-page", "pageshow.prefetch", function() { + /*$.mobile.document.delegate( ".ui-page", "pageshow.prefetch", function() { var urls = []; $( this ).find( "a:jqmData(prefetch)" ).each(function() { var $link = $( this ), @@ -1254,7 +1512,7 @@ define( [ $.mobile.loadPage( url, { role: $link.attr( "data-" + $.mobile.ns + "rel" ) } ); } }); - }); + });*/ $.mobile._handleHashChange = function( url, data ) { //find first page via hash @@ -1272,7 +1530,10 @@ define( [ }; $.extend( changePageOptions, data, { - transition: (urlHistory.getLast() || {}).transition || transition + // GrabOne Modified + // to disable transition when navigating back and forth in history. + // transition: (urlHistory.getLast() || {}).transition || transition + transition: 'none' }); // special case for dialogs @@ -1348,8 +1609,17 @@ define( [ }); //set page min-heights to be device specific - $.mobile.document.bind( "pageshow", $.mobile.resetActivePageHeight ); - $.mobile.window.bind( "throttledresize", $.mobile.resetActivePageHeight ); + // Grabone modified + // to speed up response time. + if (!isiOSApp || iPadOSVersion) { + $.mobile.document.bind( "pageshow", $.mobile.resetActivePageHeight ); + $.mobile.window.bind( "throttledresize", $.mobile.resetActivePageHeight ); + } + else { + $.mobile.document.bind( "pagecreate", function(e) { + $(e.target).css( "min-height", getScreenHeight()); + }); + } };//navreadyDeferred done callback diff --git a/js/jquery.mobile.support.js b/js/jquery.mobile.support.js index 83795a53bca..301f5608c9f 100644 --- a/js/jquery.mobile.support.js +++ b/js/jquery.mobile.support.js @@ -18,7 +18,9 @@ function propExists( prop ) { } } -var fakeBody = $( "" ).prependTo( "html" ), +// GrabOne Modified +// to avoid a flash of blank screen. +var fakeBody = $( "" ),//.prependTo( "html" ), fbCSS = fakeBody[ 0 ].style, vendors = [ "Webkit", "Moz", "O" ], webos = "palmGetResource" in window, //only used to rule out scrollTop @@ -193,6 +195,8 @@ $.extend( $.support, { // https://developers.google.com/chrome/mobile/docs/user-agent#chrome_for_ios_user-agent pushState: "pushState" in history && "replaceState" in history && + // When running inside a FF iframe, calling replaceState causes an error + !( window.navigator.userAgent.indexOf( "Firefox" ) >= 0 && window.top !== window ) && ( window.navigator.userAgent.search(/CriOS/) === -1 ), mediaquery: $.mobile.media( "only all" ), diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js index a7411e5e683..7eecee191f8 100644 --- a/js/jquery.mobile.transition.js +++ b/js/jquery.mobile.transition.js @@ -21,11 +21,15 @@ var createHandler = function( sequential ) { var deferred = new $.Deferred(), reverseClass = reverse ? " reverse" : "", active = $.mobile.urlHistory.getActive(), - toScroll = active.lastScroll || $.mobile.defaultHomeScroll, + // Grabone Modified + // to remember the scroll position + toScroll = $to.data('lastScroll') || $.mobile.defaultHomeScroll, screenHeight = $.mobile.getScreenHeight(), - maxTransitionOverride = $.mobile.maxTransitionWidth !== false && $.mobile.window.width() > $.mobile.maxTransitionWidth, - none = !$.support.cssTransitions || maxTransitionOverride || !name || name === "none" || Math.max( $.mobile.window.scrollTop(), toScroll ) > $.mobile.getMaxScrollForTransition(), - toPreClass = " ui-page-pre-in", + // Grabone Modified + // to reduce response time. + //maxTransitionOverride = $.mobile.maxTransitionWidth !== false && $.mobile.window.width() > $.mobile.maxTransitionWidth, + none = !$.support.cssTransitions /*|| maxTransitionOverride*/ || !name || name === "none" /*|| Math.max( $.mobile.window.scrollTop(), toScroll ) > $.mobile.getMaxScrollForTransition()*/, + //toPreClass = " ui-page-pre-in", toggleViewportClass = function() { $.mobile.pageContainer.toggleClass( "ui-mobile-viewport-transitioning viewport-" + name ); }, @@ -44,7 +48,9 @@ var createHandler = function( sequential ) { cleanFrom = function() { $from .removeClass( $.mobile.activePageClass + " out in reverse " + name ) - .height( "" ); + // Grabone Modified + // to reduce response time. + ;//.height( "" ); }, startOut = function() { // if it's not sequential, call the doneOut transition to start the TO page animating in simultaneously @@ -57,8 +63,9 @@ var createHandler = function( sequential ) { // Set the from page's height and start it transitioning out // Note: setting an explicit height helps eliminate tiling in the transitions - $from - .height( screenHeight + $.mobile.window.scrollTop() ) + // Grabone Modified + // to reduce response time. + $from//.height( screenHeight + $.mobile.window.scrollTop() ) .addClass( name + " out" + reverseClass ); }, @@ -74,27 +81,40 @@ var createHandler = function( sequential ) { startIn = function() { // Prevent flickering in phonegap container: see comments at #4024 regarding iOS - $to.css( "z-index", -10 ); + // Grabone Modified + // to reduce response time. + //$to.css( "z-index", -10 ); - $to.addClass( $.mobile.activePageClass + toPreClass ); + // Set to page height + $to.height( screenHeight + toScroll ); + + // Grabone Modified + // to reduce response time. + $to.addClass( $.mobile.activePageClass /*+ toPreClass*/ ); // Send focus to page as it is now display: block - $.mobile.focusPage( $to ); + // Grabone Modified + // to reduce response time. + //$.mobile.focusPage( $to ); - // Set to page height - $to.height( screenHeight + toScroll ); - - scrollPage(); + // Grabone Modified + // to reduce response time. + if (!$.mobile.isiOSApp) { + scrollPage(); + } // Restores visibility of the new page: added together with $to.css( "z-index", -10 ); - $to.css( "z-index", "" ); + // Grabone Modified + // to reduce response time. + //$to.css( "z-index", "" ); if ( !none ) { $to.animationComplete( doneIn ); } - $to - .removeClass( toPreClass ) + // Grabone Modified + // to reduce response time. + $to//.removeClass( toPreClass ) .addClass( name + " in" + reverseClass ); if ( none ) { @@ -120,9 +140,11 @@ var createHandler = function( sequential ) { // In some browsers (iOS5), 3D transitions block the ability to scroll to the desired location during transition // This ensures we jump to that spot after the fact, if we aren't there already. - if ( $.mobile.window.scrollTop() !== toScroll ) { + // Grabone Modified + // to reduce response time. + /*if ( $.mobile.window.scrollTop() !== toScroll ) { scrollPage(); - } + }*/ deferred.resolve( name, reverse, $to, $from, true ); }; diff --git a/js/jquery.mobile.vmouse.js b/js/jquery.mobile.vmouse.js index 3760c053860..c92d0d2c54e 100644 --- a/js/jquery.mobile.vmouse.js +++ b/js/jquery.mobile.vmouse.js @@ -42,7 +42,9 @@ var dataPropertyName = "virtualMouseBindings", lastTouchID = 0, threshold; $.vmouse = { - moveDistanceThreshold: 10, + // GrabOne Modified + // to reduce accidental hit. + moveDistanceThreshold: 5, clickDistanceThreshold: 10, resetTimerDuration: 1500 }; @@ -192,9 +194,19 @@ function triggerVirtualEvent( eventType, event, flags ) { } function mouseEventCallback( event ) { - var touchID = $.data( event.target, touchTargetPropertyName ); + // GrabOne Modified + // to avoid random clicks triggered by drag-and-hold on ios. + if (didScroll && $.mobile.isiOSApp && event.type == 'click') { + event.preventDefault(); + event.stopPropagation(); + event.stopImmediatePropagation(); + return; + } + + var touchID = $.data(event.target, touchTargetPropertyName); + + if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ){ - if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ) { var ve = triggerVirtualEvent( "v" + event.type, event ); if ( ve ) { if ( ve.isDefaultPrevented() ) { @@ -307,7 +319,10 @@ function handleTouchEnd( event ) { } } triggerVirtualEvent( "vmouseout", event, flags); - didScroll = false; + + // GrabOne Modified + // to avoid random clicks triggered by drag-and-hold on ios. + // didScroll = false; startResetTimer(); } @@ -367,8 +382,8 @@ function getSpecialEventObject( eventType ) { activeDocHandlers[ "touchstart" ] = ( activeDocHandlers[ "touchstart" ] || 0) + 1; - if ( activeDocHandlers[ "touchstart" ] === 1 ) { - $document.bind( "touchstart", handleTouchStart ) + if (activeDocHandlers[ "touchstart" ] === 1) { + /*$document.bind( "touchstart", handleTouchStart ) .bind( "touchend", handleTouchEnd ) // On touch platforms, touching the screen and then dragging your finger @@ -382,7 +397,14 @@ function getSpecialEventObject( eventType ) { // or not a scroll happenens before the touchend event is fired. .bind( "touchmove", handleTouchMove ) - .bind( "scroll", handleScroll ); + .bind( "scroll", handleScroll );*/ + + // GrabOne Modified + // to improve response time. + document.addEventListener('touchstart', handleTouchStart, false); + document.addEventListener('touchend', handleTouchEnd, false); + document.addEventListener('touchmove', handleTouchMove, false); + document.addEventListener('scroll', handleScroll, false); } } }, diff --git a/js/navigation/navigator.js b/js/navigation/navigator.js index 2ce7d406073..31961c91fa7 100644 --- a/js/navigation/navigator.js +++ b/js/navigation/navigator.js @@ -158,7 +158,9 @@ define(["jquery", // // TODO grab the original event here and use it for the synthetic event in the // second half of the navigate execution that will follow this binding - popstate: function( event ) { + // GrabOne Modified + // to avoid automatic navigation when page is loaded. + /*popstate: function( event ) { var active, hash, state, closestIndex; // Partly to support our test suite which manually alters the support @@ -231,7 +233,7 @@ define(["jquery", event.historyState.direction = direction; } }); - }, + },*/ // NOTE must bind before `navigate` special event hashchange binding otherwise the // navigation data won't be attached to the hashchange event in time for those diff --git a/js/widgets/panel.js b/js/widgets/panel.js index e537284edc3..f697d30d195 100644 --- a/js/widgets/panel.js +++ b/js/widgets/panel.js @@ -43,7 +43,7 @@ $.widget( "mobile.panel", $.mobile.widget, { _closeLink: null, _page: null, _modal: null, - _pannelInner: null, + _panelInner: null, _wrapper: null, _fixedToolbar: null, @@ -57,11 +57,11 @@ $.widget( "mobile.panel", $.mobile.widget, { return $pageThemeClass; }, _getPanelInner = function() { - var $pannelInner = $el.find( "." + self.options.classes.panelInner ); - if ( $pannelInner.length === 0 ) { - $pannelInner = $el.children().wrapAll( '

' ).parent(); + var $panelInner = $el.find( "." + self.options.classes.panelInner ); + if ( $panelInner.length === 0 ) { + $panelInner = $el.children().wrapAll( '

' ).parent(); } - return $pannelInner; + return $panelInner; }, _getWrapper = function() { var $wrapper = page.find( "." + self.options.classes.contentWrap ); @@ -90,7 +90,7 @@ $.widget( "mobile.panel", $.mobile.widget, { _closeLink: $el.find( ":jqmData(rel='close')" ), _page: $el.closest( ":jqmData(role='page')" ), _pageTheme: _getPageTheme(), - _pannelInner: _getPanelInner(), + _panelInner: _getPanelInner(), _wrapper: _getWrapper(), _fixedToolbar: _getFixedToolbar() }); @@ -165,22 +165,22 @@ $.widget( "mobile.panel", $.mobile.widget, { _positionPanel: function() { var self = this, - pannelInnerHeight = self._pannelInner.outerHeight(), - expand = pannelInnerHeight > $.mobile.getScreenHeight(); + panelInnerHeight = self._panelInner.outerHeight(), + expand = panelInnerHeight > $.mobile.getScreenHeight(); if ( expand || !self.options.positionFixed ) { if ( expand ) { self._unfixPanel(); - $.mobile.resetActivePageHeight( pannelInnerHeight ); + $.mobile.resetActivePageHeight( panelInnerHeight ); } - self._scrollIntoView( pannelInnerHeight ); + self._scrollIntoView( panelInnerHeight ); } else { self._fixPanel(); } }, - _scrollIntoView: function( pannelInnerHeight ) { - if ( pannelInnerHeight < $( window ).scrollTop() ) { + _scrollIntoView: function( panelInnerHeight ) { + if ( panelInnerHeight < $( window ).scrollTop() ) { window.scrollTo( 0, 0 ); } }, @@ -437,7 +437,7 @@ $.widget( "mobile.panel", $.mobile.widget, { } } - this._pannelInner.children().unwrap(); + this._panelInner.children().unwrap(); this.element.removeClass( [ this._getPanelClasses(), classes.panelAnimate ].join( " " ) ) .off( "swipeleft.panel swiperight.panel" )