" ) : "" )
.parent()
.appendTo( $.mobile.pageContainer );
newPage.page();
- anchor = parent.find('a:first');
+ anchor = parent.find( 'a:first' );
if ( !anchor.length ) {
anchor = $( "
" ).html( nodeEls || title ).prependTo( parent.empty() );
@@ -5246,20 +5883,20 @@ $.widget( "mobile.listview", $.mobile.widget, {
// on pagehide, remove any nested pages along with the parent page, as long as they aren't active
// and aren't embedded
- if( hasSubPages &&
+ if ( hasSubPages &&
parentPage.is( ":jqmData(external-page='true')" ) &&
- parentPage.data("page").options.domCache === false ) {
+ parentPage.data( "page" ).options.domCache === false ) {
- var newRemove = function( e, ui ){
+ var newRemove = function( e, ui ) {
var nextPage = ui.nextPage, npURL,
prEvent = new $.Event( "pageremove" );
- if( ui.nextPage ){
+ if ( ui.nextPage ) {
npURL = nextPage.jqmData( "url" );
- if( npURL.indexOf( parentUrl + "&" + $.mobile.subPageUrlKey ) !== 0 ){
+ if ( npURL.indexOf( parentUrl + "&" + $.mobile.subPageUrlKey ) !== 0 ) {
self.childPages().remove();
parentPage.trigger( prEvent );
- if( !prEvent.isDefaultPrevented() ){
+ if ( !prEvent.isDefaultPrevented() ) {
parentPage.removeWithDependents();
}
}
@@ -5274,20 +5911,79 @@ $.widget( "mobile.listview", $.mobile.widget, {
},
// TODO sort out a better way to track sub pages of the listview this is brittle
- childPages: function(){
+ childPages: function() {
var parentUrl = this.parentPage.jqmData( "url" );
- return $( ":jqmData(url^='"+ parentUrl + "&" + $.mobile.subPageUrlKey +"')");
+ return $( ":jqmData(url^='"+ parentUrl + "&" + $.mobile.subPageUrlKey + "')" );
}
});
//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
$.mobile.listview.prototype.enhanceWithin( e.target );
});
})( jQuery );
+(function( $, undefined ) {
+
+$.mobile.listview.prototype.options.autodividers = false;
+$.mobile.listview.prototype.options.autodividersSelector = function( elt ) {
+ // look for the text in the given element
+ var text = elt.text() || null;
+
+ if ( !text ) {
+ return null;
+ }
+
+ // create the text for the divider (first uppercased letter)
+ text = text.slice( 0, 1 ).toUpperCase();
+
+ return text;
+};
+
+$( document ).delegate( "ul,ol", "listviewcreate", function() {
+
+ var list = $( this ),
+ listview = list.data( "listview" );
+
+ if ( !listview || !listview.options.autodividers ) {
+ return;
+ }
+
+ var replaceDividers = function () {
+ list.find( "li:jqmData(role='list-divider')" ).remove();
+
+ var lis = list.find( 'li' ),
+ lastDividerText = null, li, dividerText;
+
+ for ( var i = 0; i < lis.length ; i++ ) {
+ li = lis[i];
+ dividerText = listview.options.autodividersSelector( $( li ) );
+
+ if ( dividerText && lastDividerText !== dividerText ) {
+ var divider = document.createElement( 'li' );
+ divider.appendChild( document.createTextNode( dividerText ) );
+ divider.setAttribute( 'data-' + $.mobile.ns + 'role', 'list-divider' );
+ li.parentNode.insertBefore( divider, li );
+ }
+
+ lastDividerText = dividerText;
+ }
+ };
+
+ var afterListviewRefresh = function () {
+ list.unbind( 'listviewafterrefresh', afterListviewRefresh );
+ replaceDividers();
+ listview.refresh();
+ list.bind( 'listviewafterrefresh', afterListviewRefresh );
+ };
+
+ afterListviewRefresh();
+});
+
+})( jQuery );
+
/*
* "checkboxradio" plugin
*/
@@ -5303,12 +5999,12 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
var self = this,
input = this.element,
inheritAttr = function( input, dataAttr ) {
- return input.jqmData( dataAttr ) || input.closest( "form,fieldset" ).jqmData( dataAttr )
+ return input.jqmData( dataAttr ) || input.closest( "form, fieldset" ).jqmData( dataAttr );
},
// NOTE: Windows Phone could not find the label through a selector
// filter works though.
parentLabel = $( input ).closest( "label" ),
- label = parentLabel.length ? parentLabel : $( input ).closest( "form,fieldset,:jqmData(role='page'),:jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ),
+ label = parentLabel.length ? parentLabel : $( input ).closest( "form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')" ).find( "label" ).filter( "[for='" + input[0].id + "']" ).first(),
inputtype = input[0].type,
mini = inheritAttr( input, "mini" ),
checkedState = inputtype + "-on",
@@ -5336,7 +6032,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
});
// If there's no selected theme check the data attr
- if( !this.options.theme ) {
+ if ( !this.options.theme ) {
this.options.theme = $.mobile.getInheritedTheme( this.element, "c" );
}
@@ -5395,13 +6091,13 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
},
vclick: function() {
- var $this = $(this);
+ var $this = $( this );
// Adds checked attribute to checked input when keyboard is used
if ( $this.is( ":checked" ) ) {
$this.prop( "checked", true);
- self._getInputSet().not($this).prop( "checked", false );
+ self._getInputSet().not( $this ).prop( "checked", false );
} else {
$this.prop( "checked", false );
@@ -5424,25 +6120,25 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
_cacheVals: function() {
this._getInputSet().each(function() {
- $(this).jqmData( "cacheVal", this.checked );
+ $( this ).jqmData( "cacheVal", this.checked );
});
},
//returns either a set of radios with the same name attribute, or a single checkbox
- _getInputSet: function(){
- if(this.inputtype === "checkbox") {
+ _getInputSet: function() {
+ if ( this.inputtype === "checkbox" ) {
return this.element;
}
- return this.element.closest( "form,fieldset,:jqmData(role='page')" )
- .find( "input[name='"+ this.element[0].name +"'][type='"+ this.inputtype +"']" );
+ return this.element.closest( "form, fieldset, :jqmData(role='page'), :jqmData(role='dialog')" )
+ .find( "input[name='" + this.element[0].name + "'][type='" + this.inputtype + "']" );
},
_updateAll: function() {
var self = this;
this._getInputSet().each(function() {
- var $this = $(this);
+ var $this = $( this );
if ( this.checked || self.inputtype === "checkbox" ) {
$this.trigger( "change" );
@@ -5481,7 +6177,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
});
//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
$.mobile.checkboxradio.prototype.enhanceWithin( e.target, true );
});
@@ -5494,12 +6190,10 @@ $.widget( "mobile.button", $.mobile.widget, {
theme: null,
icon: null,
iconpos: null,
- inline: false,
corners: true,
shadow: true,
iconshadow: true,
- initSelector: "button, [type='button'], [type='submit'], [type='reset'], [type='image']",
- mini: false
+ initSelector: "button, [type='button'], [type='submit'], [type='reset']"
},
_create: function() {
var $el = this.element,
@@ -5507,14 +6201,19 @@ $.widget( "mobile.button", $.mobile.widget, {
o = this.options,
type,
name,
+ inline = o.inline || $el.jqmData( "inline" ),
+ mini = o.mini || $el.jqmData( "mini" ),
classes = "",
$buttonPlaceholder;
// if this is a link, check if it's been enhanced and, if not, use the right function
- if( $el[ 0 ].tagName === "A" ) {
- !$el.hasClass( "ui-btn" ) && $el.buttonMarkup();
- return;
- }
+ if ( $el[ 0 ].tagName === "A" ) {
+ if ( !$el.hasClass( "ui-btn" ) ) {
+ $el.buttonMarkup();
+ }
+
+ return;
+ }
// get the inherited theme
// TODO centralize for all widgets
@@ -5523,36 +6222,35 @@ $.widget( "mobile.button", $.mobile.widget, {
}
// TODO: Post 1.1--once we have time to test thoroughly--any classes manually applied to the original element should be carried over to the enhanced element, with an `-enhanced` suffix. See https://github.com/jquery/jquery-mobile/issues/3577
- /* if( $el[0].className.length ) {
+ /* if ( $el[0].className.length ) {
classes = $el[0].className;
} */
- if( !!~$el[0].className.indexOf( "ui-btn-left" ) ) {
+ if ( !!~$el[0].className.indexOf( "ui-btn-left" ) ) {
classes = "ui-btn-left";
}
- if( !!~$el[0].className.indexOf( "ui-btn-right" ) ) {
+ if ( !!~$el[0].className.indexOf( "ui-btn-right" ) ) {
classes = "ui-btn-right";
}
- if( $el.attr( "type" ) === "submit" || $el.attr( "type" ) === "reset" ) {
+ if ( $el.attr( "type" ) === "submit" || $el.attr( "type" ) === "reset" ) {
classes ? classes += " ui-submit" : classes = "ui-submit";
}
-
$( "label[for='" + $el.attr( "id" ) + "']" ).addClass( "ui-submit" );
// Add ARIA role
this.button = $( "
" )
- .text( $el.text() || $el.val() )
+ [ $el.html() ? "html" : "text" ]( $el.html() || $el.val() )
.insertBefore( $el )
.buttonMarkup({
theme: o.theme,
icon: o.icon,
iconpos: o.iconpos,
- inline: o.inline,
+ inline: inline,
corners: o.corners,
shadow: o.shadow,
iconshadow: o.iconshadow,
- mini: o.mini
+ mini: mini
})
.addClass( classes )
.append( $el.addClass( "ui-btn-hidden" ) );
@@ -5565,7 +6263,7 @@ $.widget( "mobile.button", $.mobile.widget, {
if ( type !== "button" && type !== "reset" && name ) {
$el.bind( "vclick", function() {
// Add hidden input if it doesn't already exist.
- if( $buttonPlaceholder === undefined ) {
+ if ( $buttonPlaceholder === undefined ) {
$buttonPlaceholder = $( "
", {
type: "hidden",
name: $el.attr( "name" ),
@@ -5573,7 +6271,7 @@ $.widget( "mobile.button", $.mobile.widget, {
}).insertBefore( $el );
// Bind to doc to remove after submit handling
- $( document ).one("submit", function(){
+ $( document ).one( "submit", function() {
$buttonPlaceholder.remove();
// reset the local var so that the hidden input
@@ -5584,15 +6282,15 @@ $.widget( "mobile.button", $.mobile.widget, {
});
}
- $el.bind({
- focus: function() {
- $button.addClass( $.mobile.focusClass );
- },
+ $el.bind({
+ focus: function() {
+ $button.addClass( $.mobile.focusClass );
+ },
- blur: function() {
- $button.removeClass( $.mobile.focusClass );
- }
- });
+ blur: function() {
+ $button.removeClass( $.mobile.focusClass );
+ }
+ });
this.refresh();
},
@@ -5619,12 +6317,12 @@ $.widget( "mobile.button", $.mobile.widget, {
}
// Grab the button's text element from its implementation-independent data item
- $( this.button.data( 'buttonElements' ).text ).text( $el.text() || $el.val() );
+ $( this.button.data( 'buttonElements' ).text )[ $el.html() ? "html" : "text" ]( $el.html() || $el.val() );
}
});
//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
$.mobile.button.prototype.enhanceWithin( e.target, true );
});
@@ -5648,21 +6346,30 @@ $.fn.controlgroup = function( options ) {
excludeInvisible: true,
mini: $el.jqmData( "mini" )
}, options ),
- groupheading = $el.children( "legend" ),
- flCorners = o.direction == "horizontal" ? [ "ui-corner-left", "ui-corner-right" ] : [ "ui-corner-top", "ui-corner-bottom" ],
+ grouplegend = $el.children( "legend" ),
+ groupheading = $el.children( ".ui-controlgroup-label" ),
+ groupcontrols = $el.children( ".ui-controlgroup-controls" ),
+ flCorners = o.direction === "horizontal" ? [ "ui-corner-left", "ui-corner-right" ] : [ "ui-corner-top", "ui-corner-bottom" ],
type = $el.find( "input" ).first().attr( "type" );
-
+
+ // First unwrap the controls if the controlgroup was already enhanced
+ if ( groupcontrols.length ) {
+ groupcontrols.contents().unwrap();
+ }
$el.wrapInner( "
" );
- // Replace legend with more stylable replacement div
- if ( groupheading.length ) {
- $( "
" + groupheading.html() + "
" ).insertBefore( $el.children(0) );
- groupheading.remove();
+ if ( grouplegend.length ) {
+ // Replace legend with more stylable replacement div
+ $( "
" + grouplegend.html() + "
" ).insertBefore( $el.children( 0 ) );
+ grouplegend.remove();
+ } else if ( groupheading.length ) {
+ // Just move the heading if the controlgroup was already enhanced
+ $el.prepend( groupheading );
}
$el.addClass( "ui-corner-all ui-controlgroup ui-controlgroup-" + o.direction );
- flipClasses( $el.find( ".ui-btn" + ( o.excludeInvisible ? ":visible" : "" ) ).not('.ui-slider-handle'), flCorners );
+ flipClasses( $el.find( ".ui-btn" + ( o.excludeInvisible ? ":visible" : "" ) ).not( '.ui-slider-handle' ), flCorners );
flipClasses( $el.find( ".ui-btn-inner" ), flCorners );
if ( o.shadow ) {
@@ -5682,7 +6389,7 @@ $.fn.controlgroup = function( options ) {
(function( $, undefined ) {
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
//links within content areas, tests included with page
$( e.target )
@@ -5696,34 +6403,843 @@ $( document ).bind( "pagecreate create", function( e ){
})( jQuery );
-( function( $ ) {
+(function( $, undefined ) {
+
+ function fitSegmentInsideSegment( winSize, segSize, offset, desired ) {
+ var ret = desired;
+
+ if ( winSize < segSize ) {
+ // Center segment if it's bigger than the window
+ ret = offset + ( winSize - segSize ) / 2;
+ } else {
+ // Otherwise center it at the desired coordinate while keeping it completely inside the window
+ ret = Math.min( Math.max( offset, desired - segSize / 2 ), offset + winSize - segSize );
+ }
+
+ return ret;
+ }
+
+ function windowCoords() {
+ var $win = $( window );
+
+ return {
+ x: $win.scrollLeft(),
+ y: $win.scrollTop(),
+ cx: ( window.innerWidth || $win.width() ),
+ cy: ( window.innerHeight || $win.height() )
+ };
+ }
+
+ $.widget( "mobile.popup", $.mobile.widget, {
+ options: {
+ theme: null,
+ overlayTheme: null,
+ shadow: true,
+ corners: true,
+ transition: "none",
+ positionTo: "origin",
+ tolerance: null,
+ initSelector: ":jqmData(role='popup')",
+ closeLinkSelector: "a:jqmData(rel='back')",
+ closeLinkEvents: "click.popup",
+ navigateEvents: "navigate.popup",
+ closeEvents: "navigate.popup pagebeforechange.popup",
+
+ // NOTE Windows Phone 7 has a scroll position caching issue that
+ // requires us to disable popup history management by default
+ // https://github.com/jquery/jquery-mobile/issues/4784
+ //
+ // NOTE this option is modified in _create!
+ history: !$.mobile.browser.ie
+ },
+
+ _eatEventAndClose: function( e ) {
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ this.close();
+ return false;
+ },
+
+ // Make sure the screen size is increased beyond the page height if the popup's causes the document to increase in height
+ _resizeScreen: function() {
+ var popupHeight = this._ui.container.outerHeight( true );
+
+ this._ui.screen.removeAttr( "style" );
+ if ( popupHeight > this._ui.screen.height() ) {
+ this._ui.screen.height( popupHeight );
+ }
+ },
+
+ _handleWindowKeyUp: function( e ) {
+ if ( this._isOpen && e.keyCode === $.mobile.keyCode.ESCAPE ) {
+ return this._eatEventAndClose( e );
+ }
+ },
+
+ _maybeRefreshTimeout: function() {
+ var winCoords = windowCoords();
+
+ if ( this._resizeData ) {
+ if ( winCoords.x === this._resizeData.winCoords.x &&
+ winCoords.y === this._resizeData.winCoords.y &&
+ winCoords.cx === this._resizeData.winCoords.cx &&
+ winCoords.cy === this._resizeData.winCoords.cy ) {
+ // timeout not refreshed
+ return false;
+ } else {
+ // clear existing timeout - it will be refreshed below
+ clearTimeout( this._resizeData.timeoutId );
+ }
+ }
+
+ this._resizeData = {
+ timeoutId: setTimeout( $.proxy( this, "_resizeTimeout" ), 200 ),
+ winCoords: winCoords
+ };
+
+ return true;
+ },
+
+ _resizeTimeout: function() {
+ if ( !this._maybeRefreshTimeout() ) {
+ // effectively rapid-open the popup while leaving the screen intact
+ this._trigger( "beforeposition" );
+ this._ui.container
+ .removeClass( "ui-selectmenu-hidden" )
+ .offset( this._placementCoords( this._desiredCoords( undefined, undefined, "window" ) ) );
+
+ this._resizeScreen();
+ this._resizeData = null;
+ this._orientationchangeInProgress = false;
+ }
+ },
+
+ _handleWindowResize: function( e ) {
+ if ( this._isOpen ) {
+ this._maybeRefreshTimeout();
+ }
+ },
+
+ _handleWindowOrientationchange: function( e ) {
+
+ if ( !this._orientationchangeInProgress ) {
+ // effectively rapid-close the popup while leaving the screen intact
+ this._ui.container
+ .addClass( "ui-selectmenu-hidden" )
+ .removeAttr( "style" );
+
+ this._orientationchangeInProgress = true;
+ }
+ },
+
+ _create: function() {
+ var ui = {
+ screen: $( "" ),
+ placeholder: $( "
" ),
+ container: $( "" )
+ },
+ thisPage = this.element.closest( ".ui-page" ),
+ myId = this.element.attr( "id" ),
+ self = this;
+
+ // We need to adjust the history option to be false if there's no AJAX nav.
+ // We can't do it in the option declarations because those are run before
+ // it is determined whether there shall be AJAX nav.
+ this.options.history = this.options.history && $.mobile.ajaxEnabled && $.mobile.hashListeningEnabled;
+
+ if ( thisPage.length === 0 ) {
+ thisPage = $( "body" );
+ }
+
+ // define the container for navigation event bindings
+ // TODO this would be nice at the the mobile widget level
+ this.options.container = this.options.container || $.mobile.pageContainer;
+
+ // Apply the proto
+ thisPage.append( ui.screen );
+ ui.container.insertAfter( ui.screen );
+ // Leave a placeholder where the element used to be
+ ui.placeholder.insertAfter( this.element );
+ if ( myId ) {
+ ui.screen.attr( "id", myId + "-screen" );
+ ui.container.attr( "id", myId + "-popup" );
+ ui.placeholder.html( "" );
+ }
+ ui.container.append( this.element );
+
+ // Add class to popup element
+ this.element.addClass( "ui-popup" );
+
+ // Define instance variables
+ $.extend( this, {
+ _page: thisPage,
+ _ui: ui,
+ _fallbackTransition: "",
+ _currentTransition: false,
+ _prereqs: null,
+ _isOpen: false,
+ _tolerance: null,
+ _resizeData: null,
+ _orientationchangeInProgress: false,
+ _globalHandlers: [
+ {
+ src: $( window ),
+ handler: {
+ orientationchange: $.proxy( this, "_handleWindowOrientationchange" ),
+ resize: $.proxy( this, "_handleWindowResize" ),
+ keyup: $.proxy( this, "_handleWindowKeyUp" )
+ }
+ }
+ ]
+ });
+
+ $.each( this.options, function( key, value ) {
+ // Cause initial options to be applied by their handler by temporarily setting the option to undefined
+ // - the handler then sets it to the initial value
+ self.options[ key ] = undefined;
+ self._setOption( key, value, true );
+ });
+
+ ui.screen.bind( "vclick", $.proxy( this, "_eatEventAndClose" ) );
+
+ $.each( this._globalHandlers, function( idx, value ) {
+ value.src.bind( value.handler );
+ });
+ },
+
+ _applyTheme: function( dst, theme, prefix ) {
+ var classes = ( dst.attr( "class" ) || "").split( " " ),
+ alreadyAdded = true,
+ currentTheme = null,
+ matches,
+ themeStr = String( theme );
+
+ while ( classes.length > 0 ) {
+ currentTheme = classes.pop();
+ matches = ( new RegExp( "^ui-" + prefix + "-([a-z])$" ) ).exec( currentTheme );
+ if ( matches && matches.length > 1 ) {
+ currentTheme = matches[ 1 ];
+ break;
+ } else {
+ currentTheme = null;
+ }
+ }
+
+ if ( theme !== currentTheme ) {
+ dst.removeClass( "ui-" + prefix + "-" + currentTheme );
+ if ( ! ( theme === null || theme === "none" ) ) {
+ dst.addClass( "ui-" + prefix + "-" + themeStr );
+ }
+ }
+ },
+
+ _setTheme: function( value ) {
+ this._applyTheme( this.element, value, "body" );
+ },
+
+ _setOverlayTheme: function( value ) {
+ this._applyTheme( this._ui.screen, value, "overlay" );
+
+ if ( this._isOpen ) {
+ this._ui.screen.addClass( "in" );
+ }
+ },
+
+ _setShadow: function( value ) {
+ this.element.toggleClass( "ui-overlay-shadow", value );
+ },
+
+ _setCorners: function( value ) {
+ this.element.toggleClass( "ui-corner-all", value );
+ },
+
+ _applyTransition: function( value ) {
+ this._ui.container.removeClass( this._fallbackTransition );
+ if ( value && value !== "none" ) {
+ this._fallbackTransition = $.mobile._maybeDegradeTransition( value );
+ this._ui.container.addClass( this._fallbackTransition );
+ }
+ },
+
+ _setTransition: function( value ) {
+ if ( !this._currentTransition ) {
+ this._applyTransition( value );
+ }
+ },
+
+ _setTolerance: function( value ) {
+ var tol = { t: 30, r: 15, b: 30, l: 15 };
+
+ if ( value ) {
+ var ar = String( value ).split( "," );
+
+ $.each( ar, function( idx, val ) { ar[ idx ] = parseInt( val, 10 ); } );
+
+ switch( ar.length ) {
+ // All values are to be the same
+ case 1:
+ if ( !isNaN( ar[ 0 ] ) ) {
+ tol.t = tol.r = tol.b = tol.l = ar[ 0 ];
+ }
+ break;
+
+ // The first value denotes top/bottom tolerance, and the second value denotes left/right tolerance
+ case 2:
+ if ( !isNaN( ar[ 0 ] ) ) {
+ tol.t = tol.b = ar[ 0 ];
+ }
+ if ( !isNaN( ar[ 1 ] ) ) {
+ tol.l = tol.r = ar[ 1 ];
+ }
+ break;
+
+ // The array contains values in the order top, right, bottom, left
+ case 4:
+ if ( !isNaN( ar[ 0 ] ) ) {
+ tol.t = ar[ 0 ];
+ }
+ if ( !isNaN( ar[ 1 ] ) ) {
+ tol.r = ar[ 1 ];
+ }
+ if ( !isNaN( ar[ 2 ] ) ) {
+ tol.b = ar[ 2 ];
+ }
+ if ( !isNaN( ar[ 3 ] ) ) {
+ tol.l = ar[ 3 ];
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ this._tolerance = tol;
+ },
+
+ _setOption: function( key, value ) {
+ var exclusions, setter = "_set" + key.charAt( 0 ).toUpperCase() + key.slice( 1 );
+
+ if ( this[ setter ] !== undefined ) {
+ this[ setter ]( value );
+ }
+
+ // TODO REMOVE FOR 1.2.1 by moving them out to a default options object
+ exclusions = [
+ "initSelector",
+ "closeLinkSelector",
+ "closeLinkEvents",
+ "navigateEvents",
+ "closeEvents",
+ "history",
+ "container"
+ ];
+
+ $.mobile.widget.prototype._setOption.apply( this, arguments );
+ if ( $.inArray( key, exclusions ) === -1 ) {
+ // Record the option change in the options and in the DOM data-* attributes
+ this.element.attr( "data-" + ( $.mobile.ns || "" ) + ( key.replace( /([A-Z])/, "-$1" ).toLowerCase() ), value );
+ }
+ },
+
+ // Try and center the overlay over the given coordinates
+ _placementCoords: function( desired ) {
+ // rectangle within which the popup must fit
+ var
+ winCoords = windowCoords(),
+ rc = {
+ x: this._tolerance.l,
+ y: winCoords.y + this._tolerance.t,
+ cx: winCoords.cx - this._tolerance.l - this._tolerance.r,
+ cy: winCoords.cy - this._tolerance.t - this._tolerance.b
+ },
+ menuSize, ret;
+
+ // Clamp the width of the menu before grabbing its size
+ this._ui.container.css( "max-width", rc.cx );
+ menuSize = {
+ cx: this._ui.container.outerWidth( true ),
+ cy: this._ui.container.outerHeight( true )
+ };
+
+ // Center the menu over the desired coordinates, while not going outside
+ // the window tolerances. This will center wrt. the window if the popup is too large.
+ ret = {
+ x: fitSegmentInsideSegment( rc.cx, menuSize.cx, rc.x, desired.x ),
+ y: fitSegmentInsideSegment( rc.cy, menuSize.cy, rc.y, desired.y )
+ };
+
+ // Make sure the top of the menu is visible
+ ret.y = Math.max( 0, ret.y );
+
+ // If the height of the menu is smaller than the height of the document
+ // align the bottom with the bottom of the document
+
+ // fix for $( document ).height() bug in core 1.7.2.
+ var docEl = document.documentElement, docBody = document.body,
+ docHeight = Math.max( docEl.clientHeight, docBody.scrollHeight, docBody.offsetHeight, docEl.scrollHeight, docEl.offsetHeight );
+
+ ret.y -= Math.min( ret.y, Math.max( 0, ret.y + menuSize.cy - docHeight ) );
+
+ return { left: ret.x, top: ret.y };
+ },
+
+ _createPrereqs: function( screenPrereq, containerPrereq, whenDone ) {
+ var self = this, prereqs;
+
+ // It is important to maintain both the local variable prereqs and self._prereqs. The local variable remains in
+ // the closure of the functions which call the callbacks passed in. The comparison between the local variable and
+ // self._prereqs is necessary, because once a function has been passed to .animationComplete() it will be called
+ // next time an animation completes, even if that's not the animation whose end the function was supposed to catch
+ // (for example, if an abort happens during the opening animation, the .animationComplete handler is not called for
+ // that animation anymore, but the handler remains attached, so it is called the next time the popup is opened
+ // - making it stale. Comparing the local variable prereqs to the widget-level variable self._prereqs ensures that
+ // callbacks triggered by a stale .animationComplete will be ignored.
+
+ prereqs = {
+ screen: $.Deferred(),
+ container: $.Deferred()
+ };
+
+ prereqs.screen.then( function() {
+ if ( prereqs === self._prereqs ) {
+ screenPrereq();
+ }
+ });
+
+ prereqs.container.then( function() {
+ if ( prereqs === self._prereqs ) {
+ containerPrereq();
+ }
+ });
+
+ $.when( prereqs.screen, prereqs.container ).done( function() {
+ if ( prereqs === self._prereqs ) {
+ self._prereqs = null;
+ whenDone();
+ }
+ });
+
+ self._prereqs = prereqs;
+ },
+
+ _animate: function( args ) {
+ // NOTE before removing the default animation of the screen
+ // this had an animate callback that would relove the deferred
+ // now the deferred is resolved immediately
+ // TODO remove the dependency on the screen deferred
+ this._ui.screen
+ .removeClass( args.classToRemove )
+ .addClass( args.screenClassToAdd );
+
+ args.prereqs.screen.resolve();
+
+ if ( args.transition && args.transition !== "none" ) {
+ if ( args.applyTransition ) {
+ this._applyTransition( args.transition );
+ }
+ this._ui.container
+ .animationComplete( $.proxy( args.prereqs.container, "resolve" ) )
+ .addClass( args.containerClassToAdd )
+ .removeClass( args.classToRemove );
+ } else {
+ args.prereqs.container.resolve();
+ }
+ },
+
+ // The desired coordinates passed in will be returned untouched if no reference element can be identified via
+ // desiredPosition.positionTo. Nevertheless, this function ensures that its return value always contains valid
+ // x and y coordinates by specifying the center middle of the window if the coordinates are absent.
+ _desiredCoords: function( x, y, positionTo ) {
+ var dst = null, offset, winCoords = windowCoords();
+
+ // Establish which element will serve as the reference
+ if ( positionTo && positionTo !== "origin" ) {
+ if ( positionTo === "window" ) {
+ x = winCoords.cx / 2 + winCoords.x;
+ y = winCoords.cy / 2 + winCoords.y;
+ } else {
+ try {
+ dst = $( positionTo );
+ } catch( e ) {
+ dst = null;
+ }
+ if ( dst ) {
+ dst.filter( ":visible" );
+ if ( dst.length === 0 ) {
+ dst = null;
+ }
+ }
+ }
+ }
+
+ // If an element was found, center over it
+ if ( dst ) {
+ offset = dst.offset();
+ x = offset.left + dst.outerWidth() / 2;
+ y = offset.top + dst.outerHeight() / 2;
+ }
+
+ // Make sure x and y are valid numbers - center over the window
+ if ( $.type( x ) !== "number" || isNaN( x ) ) {
+ x = winCoords.cx / 2 + winCoords.x;
+ }
+ if ( $.type( y ) !== "number" || isNaN( y ) ) {
+ y = winCoords.cy / 2 + winCoords.y;
+ }
+
+ return { x: x, y: y };
+ },
+
+ _openPrereqsComplete: function() {
+ var self = this;
+
+ self._ui.container.addClass( "ui-popup-active" );
+ self._isOpen = true;
+ self._resizeScreen();
+
+ // Android appears to trigger the animation complete before the popup
+ // is visible. Allowing the stack to unwind before applying focus prevents
+ // the "blue flash" of element focus in android 4.0
+ setTimeout(function(){
+ self._ui.container.attr( "tabindex", "0" ).focus();
+ self._trigger( "afteropen" );
+ });
+ },
+
+ _open: function( options ) {
+ var coords, transition,
+ androidBlacklist = ( function() {
+ var w = window,
+ ua = navigator.userAgent,
+ // Rendering engine is Webkit, and capture major version
+ wkmatch = ua.match( /AppleWebKit\/([0-9\.]+)/ ),
+ wkversion = !!wkmatch && wkmatch[ 1 ],
+ androidmatch = ua.match( /Android (\d+(?:\.\d+))/ ),
+ andversion = !!androidmatch && androidmatch[ 1 ],
+ chromematch = ua.indexOf( "Chrome" ) > -1;
+
+ // Platform is Android, WebKit version is greater than 534.13 ( Android 3.2.1 ) and not Chrome.
+ if( androidmatch !== null && andversion === "4.0" && wkversion && wkversion > 534.13 && !chromematch ) {
+ return true;
+ }
+ return false;
+ }());
+
+ // Make sure options is defined
+ options = ( options || {} );
+
+ // Copy out the transition, because we may be overwriting it later and we don't want to pass that change back to the caller
+ transition = options.transition || this.options.transition;
+
+ // Give applications a chance to modify the contents of the container before it appears
+ this._trigger( "beforeposition" );
+
+ coords = this._placementCoords( this._desiredCoords( options.x, options.y, options.positionTo || this.options.positionTo || "origin" ) );
+
+ // Count down to triggering "popupafteropen" - we have two prerequisites:
+ // 1. The popup window animation completes (container())
+ // 2. The screen opacity animation completes (screen())
+ this._createPrereqs(
+ $.noop,
+ $.noop,
+ $.proxy( this, "_openPrereqsComplete" ) );
+
+ if ( transition ) {
+ this._currentTransition = transition;
+ this._applyTransition( transition );
+ } else {
+ transition = this.options.transition;
+ }
+
+ if ( !this.options.theme ) {
+ this._setTheme( this._page.jqmData( "theme" ) || $.mobile.getInheritedTheme( this._page, "c" ) );
+ }
+
+ this._ui.screen.removeClass( "ui-screen-hidden" );
+
+ this._ui.container
+ .removeClass( "ui-selectmenu-hidden" )
+ .offset( coords );
+
+ if ( this.options.overlayTheme && androidBlacklist ) {
+ /* TODO:
+ The native browser on Android 4.0.X ("Ice Cream Sandwich") suffers from an issue where the popup overlay appears to be z-indexed
+ above the popup itself when certain other styles exist on the same page -- namely, any element set to `position: fixed` and certain
+ types of input. These issues are reminiscent of previously uncovered bugs in older versions of Android's native browser:
+ https://github.com/scottjehl/Device-Bugs/issues/3
+
+ This fix closes the following bugs ( I use "closes" with reluctance, and stress that this issue should be revisited as soon as possible ):
+
+ https://github.com/jquery/jquery-mobile/issues/4816
+ https://github.com/jquery/jquery-mobile/issues/4844
+ https://github.com/jquery/jquery-mobile/issues/4874
+ */
+
+ // TODO sort out why this._page isn't working
+ this.element.closest( ".ui-page" ).addClass( "ui-popup-open" );
+ }
+ this._animate({
+ additionalCondition: true,
+ transition: transition,
+ classToRemove: "",
+ screenClassToAdd: "in",
+ containerClassToAdd: "in",
+ applyTransition: false,
+ prereqs: this._prereqs
+ });
+ },
+
+ _closePrereqScreen: function() {
+ this._ui.screen
+ .removeClass( "out" )
+ .addClass( "ui-screen-hidden" );
+ },
+
+ _closePrereqContainer: function() {
+ this._ui.container
+ .removeClass( "reverse out" )
+ .addClass( "ui-selectmenu-hidden" )
+ .removeAttr( "style" );
+ },
+
+ _closePrereqsDone: function() {
+ var self = this, opts = self.options;
+
+ self._ui.container.removeAttr( "tabindex" );
+
+ // remove nav bindings if they are still present
+ opts.container.unbind( opts.closeEvents );
+
+ // unbind click handlers added when history is disabled
+ self.element.undelegate( opts.closeLinkSelector, opts.closeLinkEvents );
+
+ // remove the global mutex for popups
+ $.mobile.popup.active = undefined;
+
+ // alert users that the popup is closed
+ self._trigger( "afterclose" );
+ },
+
+ _close: function() {
+ this._ui.container.removeClass( "ui-popup-active" );
+ this._page.removeClass( "ui-popup-open" );
+
+ this._isOpen = false;
+
+ // Count down to triggering "popupafterclose" - we have two prerequisites:
+ // 1. The popup window reverse animation completes (container())
+ // 2. The screen opacity animation completes (screen())
+ this._createPrereqs(
+ $.proxy( this, "_closePrereqScreen" ),
+ $.proxy( this, "_closePrereqContainer" ),
+ $.proxy( this, "_closePrereqsDone" ) );
+
+ this._animate( {
+ additionalCondition: this._ui.screen.hasClass( "in" ),
+ transition: ( this._currentTransition || this.options.transition ),
+ classToRemove: "in",
+ screenClassToAdd: "out",
+ containerClassToAdd: "reverse out",
+ applyTransition: true,
+ prereqs: this._prereqs
+ });
+ },
+
+ _destroy: function() {
+ var self = this;
+
+ // hide and remove bindings
+ self._close();
+
+ // Put the element back to where the placeholder was and remove the "ui-popup" class
+ self._setTheme( "none" );
+ self.element
+ .insertAfter( self._ui.placeholder )
+ .removeClass( "ui-popup ui-overlay-shadow ui-corner-all" );
+ self._ui.screen.remove();
+ self._ui.container.remove();
+ self._ui.placeholder.remove();
+
+ // Unbind handlers that were bound to elements outside self.element (the window, in self case)
+ $.each( self._globalHandlers, function( idx, oneSrc ) {
+ $.each( oneSrc.handler, function( eventType, handler ) {
+ oneSrc.src.unbind( eventType, handler );
+ });
+ });
+ },
+
+ // any navigation event after a popup is opened should close the popup
+ // NOTE the pagebeforechange is bound to catch navigation events that don't
+ // alter the url (eg, dialogs from popups)
+ _bindContainerClose: function() {
+ var self = this;
+
+ self.options.container
+ .one( self.options.closeEvents, $.proxy( self._close, self ));
+ },
+
+ // TODO no clear deliniation of what should be here and
+ // what should be in _open. Seems to be "visual" vs "history" for now
+ open: function( options ) {
+ var self = this, opts = this.options, url, hashkey, activePage, currentIsDialog, hasHash, urlHistory;
+
+ // make sure open is idempotent
+ if( $.mobile.popup.active ) {
+ return;
+ }
+
+ // set the global popup mutex
+ $.mobile.popup.active = this;
+
+ // if history alteration is disabled close on navigate events
+ // and leave the url as is
+ if( !( opts.history ) ) {
+ self._open( options );
+ self._bindContainerClose();
+
+ // When histoy is disabled we have to grab the data-rel
+ // back link clicks so we can close the popup instead of
+ // relying on history to do it for us
+ self.element
+ .delegate( opts.closeLinkSelector, opts.closeLinkEvents, function( e ) {
+ self._close();
+
+ // NOTE prevent the browser and navigation handlers from
+ // working with the link's rel=back. This may cause
+ // issues for developers expecting the event to bubble
+ return false;
+ });
+
+ return;
+ }
+
+ // cache some values for min/readability
+ hashkey = $.mobile.dialogHashKey;
+ activePage = $.mobile.activePage;
+ currentIsDialog = activePage.is( ".ui-dialog" );
+ url = $.mobile.urlHistory.getActive().url;
+ hasHash = ( url.indexOf( hashkey ) > -1 ) && !currentIsDialog;
+ urlHistory = $.mobile.urlHistory;
+
+ if ( hasHash ) {
+ self._open( options );
+ self._bindContainerClose();
+ return;
+ }
+
+ // if the current url has no dialog hash key proceed as normal
+ // otherwise, if the page is a dialog simply tack on the hash key
+ if ( url.indexOf( hashkey ) === -1 && !currentIsDialog ){
+ url = url + hashkey;
+ } else {
+ url = $.mobile.path.parseLocation().hash + hashkey;
+ }
+
+ // Tack on an extra hashkey if this is the first page and we've just reconstructed the initial hash
+ if ( urlHistory.activeIndex === 0 && url === urlHistory.initialDst ) {
+ url += hashkey;
+ }
+
+ // swallow the the initial navigation event, and bind for the next
+ opts.container.one( opts.navigateEvents, function( e ) {
+ e.preventDefault();
+ self._open( options );
+ self._bindContainerClose();
+ });
+
+ urlHistory.ignoreNextHashChange = currentIsDialog;
+
+ // Gotta love methods with 1mm args :(
+ urlHistory.addNew( url, undefined, undefined, undefined, "dialog" );
+
+ // set the new url with (or without) the new dialog hash key
+ $.mobile.path.set( url );
+ },
+
+ close: function() {
+ // make sure close is idempotent
+ if( !$.mobile.popup.active ){
+ return;
+ }
+
+ if( this.options.history ) {
+ $.mobile.back();
+ } else {
+ this._close();
+ }
+ }
+ });
+
+
+ // TODO this can be moved inside the widget
+ $.mobile.popup.handleLink = function( $link ) {
+ var closestPage = $link.closest( ":jqmData(role='page')" ),
+ scope = ( ( closestPage.length === 0 ) ? $( "body" ) : closestPage ),
+ // NOTE make sure to get only the hash, ie7 (wp7) return the absolute href
+ // in this case ruining the element selection
+ popup = $( $.mobile.path.parseUrl($link.attr( "href" )).hash, scope[0] ),
+ offset;
+
+ if ( popup.data( "popup" ) ) {
+ offset = $link.offset();
+ popup.popup( "open", {
+ x: offset.left + $link.outerWidth() / 2,
+ y: offset.top + $link.outerHeight() / 2,
+ transition: $link.jqmData( "transition" ),
+ positionTo: $link.jqmData( "position-to" ),
+ link: $link
+ });
+ }
+
+ //remove after delay
+ setTimeout( function() {
+ $link.removeClass( $.mobile.activeBtnClass );
+ }, 300 );
+ };
+
+ // TODO move inside _create
+ $( document ).bind( "pagebeforechange", function( e, data ) {
+ if ( data.options.role === "popup" ) {
+ $.mobile.popup.handleLink( data.options.link );
+ e.preventDefault();
+ }
+ });
+
+ $( document ).bind( "pagecreate create", function( e ) {
+ $.mobile.popup.prototype.enhanceWithin( e.target, true );
+ });
+
+})( jQuery );
+
+(function( $ ) {
var meta = $( "meta[name=viewport]" ),
- initialContent = meta.attr( "content" ),
- disabledZoom = initialContent + ",maximum-scale=1, user-scalable=no",
- enabledZoom = initialContent + ",maximum-scale=10, user-scalable=yes",
+ initialContent = meta.attr( "content" ),
+ disabledZoom = initialContent + ",maximum-scale=1, user-scalable=no",
+ enabledZoom = initialContent + ",maximum-scale=10, user-scalable=yes",
disabledInitially = /(user-scalable[\s]*=[\s]*no)|(maximum-scale[\s]*=[\s]*1)[$,\s]/.test( initialContent );
-
+
$.mobile.zoom = $.extend( {}, {
enabled: !disabledInitially,
locked: false,
disable: function( lock ) {
- if( !disabledInitially && !$.mobile.zoom.locked ){
- meta.attr( "content", disabledZoom );
- $.mobile.zoom.enabled = false;
+ if ( !disabledInitially && !$.mobile.zoom.locked ) {
+ meta.attr( "content", disabledZoom );
+ $.mobile.zoom.enabled = false;
$.mobile.zoom.locked = lock || false;
}
},
enable: function( unlock ) {
- if( !disabledInitially && ( !$.mobile.zoom.locked || unlock === true ) ){
- meta.attr( "content", enabledZoom );
- $.mobile.zoom.enabled = true;
+ if ( !disabledInitially && ( !$.mobile.zoom.locked || unlock === true ) ) {
+ meta.attr( "content", enabledZoom );
+ $.mobile.zoom.enabled = true;
$.mobile.zoom.locked = false;
}
},
restore: function() {
- if( !disabledInitially ){
- meta.attr( "content", initialContent );
- $.mobile.zoom.enabled = true;
+ if ( !disabledInitially ) {
+ meta.attr( "content", initialContent );
+ $.mobile.zoom.enabled = true;
}
}
});
@@ -5738,19 +7254,27 @@ $.widget( "mobile.textinput", $.mobile.widget, {
// This option defaults to true on iOS devices.
preventFocusZoom: /iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1,
initSelector: "input[type='text'], input[type='search'], :jqmData(type='search'), input[type='number'], :jqmData(type='number'), input[type='password'], input[type='email'], input[type='url'], input[type='tel'], textarea, input[type='time'], input[type='date'], input[type='month'], input[type='week'], input[type='datetime'], input[type='datetime-local'], input[type='color'], input:not([type])",
- clearSearchButtonText: "clear text"
+ clearSearchButtonText: "clear text",
+ disabled: false
},
_create: function() {
- var input = this.element,
+ var self = this,
+ input = this.element,
o = this.options,
theme = o.theme || $.mobile.getInheritedTheme( this.element, "c" ),
themeclass = " ui-body-" + theme,
- mini = input.jqmData("mini") == true,
+ mini = input.jqmData( "mini" ) === true,
miniclass = mini ? " ui-mini" : "",
focusedEl, clearbtn;
+ function toggleClear() {
+ setTimeout( function() {
+ clearbtn.toggleClass( "ui-input-clear-hidden", !input.val() );
+ }, 0 );
+ }
+
$( "label[for='" + input.attr( "id" ) + "']" ).addClass( "ui-input-text" );
focusedEl = input.addClass("ui-input-text ui-body-"+ theme );
@@ -5792,15 +7316,9 @@ $.widget( "mobile.textinput", $.mobile.widget, {
mini: mini
});
- function toggleClear() {
- setTimeout(function() {
- clearbtn.toggleClass( "ui-input-clear-hidden", !input.val() );
- }, 0);
- }
-
toggleClear();
- input.bind('paste cut keyup focus change blur', toggleClear);
+ input.bind( 'paste cut keyup focus change blur', toggleClear );
} else {
input.addClass( "ui-corner-all ui-shadow-inset" + themeclass + miniclass );
@@ -5809,17 +7327,17 @@ $.widget( "mobile.textinput", $.mobile.widget, {
input.focus(function() {
focusedEl.addClass( $.mobile.focusClass );
})
- .blur(function(){
+ .blur(function() {
focusedEl.removeClass( $.mobile.focusClass );
})
// In many situations, iOS will zoom into the select upon tap, this prevents that from happening
.bind( "focus", function() {
- if( o.preventFocusZoom ){
+ if ( o.preventFocusZoom ) {
$.mobile.zoom.disable( true );
}
})
.bind( "blur", function() {
- if( o.preventFocusZoom ){
+ if ( o.preventFocusZoom ) {
$.mobile.zoom.enable( true );
}
});
@@ -5828,47 +7346,65 @@ $.widget( "mobile.textinput", $.mobile.widget, {
if ( input.is( "textarea" ) ) {
var extraLineHeight = 15,
keyupTimeoutBuffer = 100,
- keyup = function() {
- var scrollHeight = input[ 0 ].scrollHeight,
- clientHeight = input[ 0 ].clientHeight;
-
- if ( clientHeight < scrollHeight ) {
- input.height(scrollHeight + extraLineHeight);
- }
- },
keyupTimeout;
+ this._keyup = function() {
+ var scrollHeight = input[ 0 ].scrollHeight,
+ clientHeight = input[ 0 ].clientHeight;
+
+ if ( clientHeight < scrollHeight ) {
+ input.height(scrollHeight + extraLineHeight);
+ }
+ };
+
input.keyup(function() {
clearTimeout( keyupTimeout );
- keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer );
+ keyupTimeout = setTimeout( self._keyup, keyupTimeoutBuffer );
});
// binding to pagechange here ensures that for pages loaded via
// ajax the height is recalculated without user input
- $( document ).one( "pagechange", keyup );
+ this._on( $(document), {"pagechange": "_keyup" });
// Issue 509: the browser is not providing scrollHeight properly until the styles load
if ( $.trim( input.val() ) ) {
// bind to the window load to make sure the height is calculated based on BOTH
// the DOM and CSS
- $( window ).load( keyup );
+ this._on( $(window), {"load": "_keyup"});
}
}
+ if ( input.attr( "disabled" ) ) {
+ this.disable();
+ }
},
- disable: function(){
- ( this.element.attr( "disabled", true ).is( "[type='search'],:jqmData(type='search')" ) ?
- this.element.parent() : this.element ).addClass( "ui-disabled" );
+ disable: function() {
+ var $el;
+ if ( this.element.attr( "disabled", true ).is( "[type='search'], :jqmData(type='search')" ) ) {
+ $el = this.element.parent();
+ } else {
+ $el = this.element;
+ }
+ $el.addClass( "ui-disabled" );
+ return this._setOption( "disabled", true );
},
- enable: function(){
- ( this.element.attr( "disabled", false).is( "[type='search'],:jqmData(type='search')" ) ?
- this.element.parent() : this.element ).removeClass( "ui-disabled" );
+ enable: function() {
+ var $el;
+
+ // TODO using more than one line of code is acceptable ;)
+ if ( this.element.attr( "disabled", false ).is( "[type='search'], :jqmData(type='search')" ) ) {
+ $el = this.element.parent();
+ } else {
+ $el = this.element;
+ }
+ $el.removeClass( "ui-disabled" );
+ return this._setOption( "disabled", false );
}
});
//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
$.mobile.textinput.prototype.enhanceWithin( e.target, true );
});
@@ -5879,9 +7415,12 @@ $( document ).bind( "pagecreate create", function( e ){
$.mobile.listview.prototype.options.filter = false;
$.mobile.listview.prototype.options.filterPlaceholder = "Filter items...";
$.mobile.listview.prototype.options.filterTheme = "c";
-$.mobile.listview.prototype.options.filterCallback = function( text, searchValue ){
- return text.toLowerCase().indexOf( searchValue ) === -1;
-};
+// TODO rename callback/deprecate and default to the item itself as the first argument
+var defaultFilterCallback = function( text, searchValue, item ) {
+ return text.toString().toLowerCase().indexOf( searchValue ) === -1;
+ };
+
+$.mobile.listview.prototype.options.filterCallback = defaultFilterCallback;
$( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function() {
@@ -5903,19 +7442,23 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(
.jqmData( "lastval", "" )
.bind( "keyup change", function() {
- var $this = $(this),
+ var $this = $( this ),
val = this.value.toLowerCase(),
listItems = null,
lastval = $this.jqmData( "lastval" ) + "",
childItems = false,
itemtext = "",
- item;
+ item,
+ // Check if a custom filter callback applies
+ isCustomFilterCallback = listview.options.filterCallback !== defaultFilterCallback;
+
+ listview._trigger( "beforefilter", "beforefilter", { input: this } );
// Change val as lastval for next execution
$this.jqmData( "lastval" , val );
- if ( val.length < lastval.length || val.indexOf(lastval) !== 0 ) {
+ if ( isCustomFilterCallback || val.length < lastval.length || val.indexOf( lastval ) !== 0 ) {
- // Removed chars or pasted something totally different, check all items
+ // Custom filter callback applies or removed chars or pasted something totally different, check all items
listItems = list.children();
} else {
@@ -5939,7 +7482,7 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(
// New bucket!
childItems = false;
- } else if ( listview.options.filterCallback( itemtext, val ) ) {
+ } else if ( listview.options.filterCallback( itemtext, val, item ) ) {
//mark to be hidden
item.toggleClass( "ui-filter-hidequeue" , true );
@@ -5983,9 +7526,11 @@ $( document ).delegate( ":jqmData(role='listview')", "listviewcreate", function(
})( jQuery );
-( function( $, undefined ) {
+(function( $, undefined ) {
$.widget( "mobile.slider", $.mobile.widget, {
+ widgetEventPrefix: "slide",
+
options: {
theme: null,
trackTheme: null,
@@ -6009,7 +7554,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
cType = control[ 0 ].nodeName.toLowerCase(),
- selectClass = ( cType == "select" ) ? "ui-slider-switch" : "",
+ selectClass = ( cType === "select" ) ? "ui-slider-switch" : "",
controlID = control.attr( "id" ),
@@ -6020,26 +7565,26 @@ $.widget( "mobile.slider", $.mobile.widget, {
label = $label.attr( "id", labelID ),
val = function() {
- return cType == "input" ? parseFloat( control.val() ) : control[0].selectedIndex;
+ return cType === "input" ? parseFloat( control.val() ) : control[0].selectedIndex;
},
- min = cType == "input" ? parseFloat( control.attr( "min" ) ) : 0,
+ min = cType === "input" ? parseFloat( control.attr( "min" ) ) : 0,
- max = cType == "input" ? parseFloat( control.attr( "max" ) ) : control.find( "option" ).length-1,
+ max = cType === "input" ? parseFloat( control.attr( "max" ) ) : control.find( "option" ).length-1,
step = window.parseFloat( control.attr( "step" ) || 1 ),
- inlineClass = ( this.options.inline || control.jqmData("inline") == true ) ? " ui-slider-inline" : "",
+ inlineClass = ( this.options.inline || control.jqmData( "inline" ) === true ) ? " ui-slider-inline" : "",
- miniClass = ( this.options.mini || control.jqmData("mini") ) ? " ui-slider-mini" : "",
+ miniClass = ( this.options.mini || control.jqmData( "mini" ) ) ? " ui-slider-mini" : "",
- domHandle = document.createElement('a'),
+ domHandle = document.createElement( 'a' ),
handle = $( domHandle ),
- domSlider = document.createElement('div'),
+ domSlider = document.createElement( 'div' ),
slider = $( domSlider ),
- valuebg = control.jqmData("highlight") && cType != "select" ? (function() {
+ valuebg = control.jqmData( "highlight" ) && cType !== "select" ? (function() {
var bg = document.createElement('div');
bg.className = 'ui-slider-bg ' + $.mobile.activeBtnClass + ' ui-btn-corner-all';
return $( bg ).prependTo( slider );
@@ -6047,11 +7592,13 @@ $.widget( "mobile.slider", $.mobile.widget, {
options;
- domHandle.setAttribute( 'href', "#" );
+ this._type = cType;
+
+ domHandle.setAttribute( 'href', "#" );
domSlider.setAttribute('role','application');
- domSlider.className = ['ui-slider ',selectClass," ui-btn-down-",trackTheme,' ui-btn-corner-all', inlineClass, miniClass].join("");
+ domSlider.className = ['ui-slider ',selectClass," ui-btn-down-",trackTheme,' ui-btn-corner-all', inlineClass, miniClass].join( "" );
domHandle.className = 'ui-slider-handle';
- domSlider.appendChild(domHandle);
+ domSlider.appendChild( domHandle );
handle.buttonMarkup({ corners: true, theme: theme, shadow: true })
.attr({
@@ -6074,15 +7621,15 @@ $.widget( "mobile.slider", $.mobile.widget, {
mouseMoved: false
});
- if ( cType == "select" ) {
+ if ( cType === "select" ) {
var wrapper = document.createElement('div');
wrapper.className = 'ui-slider-inneroffset';
- for(var j = 0,length = domSlider.childNodes.length;j < length;j++){
- wrapper.appendChild(domSlider.childNodes[j]);
+ for ( var j = 0,length = domSlider.childNodes.length;j < length;j++ ) {
+ wrapper.appendChild( domSlider.childNodes[j] );
}
- domSlider.appendChild(wrapper);
+ domSlider.appendChild( wrapper );
// slider.wrapInner( "
" );
@@ -6091,15 +7638,15 @@ $.widget( "mobile.slider", $.mobile.widget, {
options = control.find( "option" );
- for(var i = 0, optionsCount = options.length; i < optionsCount; i++){
- var side = !i ? "b":"a",
- sliderTheme = !i ? " ui-btn-down-" + trackTheme :( " " + $.mobile.activeBtnClass ),
- sliderLabel = document.createElement('div'),
- sliderImg = document.createElement('span');
+ for ( var i = 0, optionsCount = options.length; i < optionsCount; i++ ) {
+ var side = !i ? "b" : "a",
+ sliderTheme = !i ? " ui-btn-down-" + trackTheme : ( " " + $.mobile.activeBtnClass ),
+ sliderLabel = document.createElement( 'div' ),
+ sliderImg = document.createElement( 'span' );
- sliderImg.className = ['ui-slider-label ui-slider-label-',side,sliderTheme," ui-btn-corner-all"].join("");
+ sliderImg.className = ['ui-slider-label ui-slider-label-',side,sliderTheme," ui-btn-corner-all"].join( "" );
sliderImg.setAttribute('role','img');
- sliderImg.appendChild(document.createTextNode(options[i].innerHTML));
+ sliderImg.appendChild( document.createTextNode( options[i].innerHTML ) );
$(sliderImg).prependTo( slider );
}
@@ -6111,22 +7658,24 @@ $.widget( "mobile.slider", $.mobile.widget, {
// monitor the input for updated values
control.addClass( cType === "input" ? "ui-slider-input" : "ui-slider-switch" )
- .change( function() {
+ .change(function() {
// if the user dragged the handle, the "change" event was triggered from inside refresh(); don't call refresh() again
- if (!self.mouseMoved) {
+ if ( !self.mouseMoved ) {
self.refresh( val(), true );
}
})
- .keyup( function() { // necessary?
+ .keyup(function() { // necessary?
self.refresh( val(), true, true );
})
- .blur( function() {
+ .blur(function() {
self.refresh( val(), true );
});
- // prevent screen drag when slider activated
- $( document ).bind( "vmousemove", function( event ) {
- if ( self.dragging ) {
+ this._preventDocumentDrag = function( event ) {
+ // NOTE: we don't do this in refresh because we still want to
+ // support programmatic alteration of disabled inputs
+ if ( self.dragging && !self.options.disabled ) {
+
// self.mouseMoved must be updated before refresh() because it will be used in the control "change" event
self.mouseMoved = true;
@@ -6141,9 +7690,22 @@ $.widget( "mobile.slider", $.mobile.widget, {
self.userModified = self.beforeStart !== control[0].selectedIndex;
return false;
}
- });
+ }
+
+ this._on( $( document ), { "vmousemove": this._preventDocumentDrag });
+
+ // it appears the clicking the up and down buttons in chrome on
+ // range/number inputs doesn't trigger a change until the field is
+ // blurred. Here we check thif the value has changed and refresh
+ control.bind( "vmouseup", $.proxy( self._checkedRefresh, self));
slider.bind( "vmousedown", function( event ) {
+ // NOTE: we don't do this in refresh because we still want to
+ // support programmatic alteration of disabled inputs
+ if ( self.options.disabled ) {
+ return false;
+ }
+
self.dragging = true;
self.userModified = false;
self.mouseMoved = false;
@@ -6153,49 +7715,45 @@ $.widget( "mobile.slider", $.mobile.widget, {
}
self.refresh( event );
+ self._trigger( "start" );
return false;
})
.bind( "vclick", false );
- slider.add( document )
- .bind( "vmouseup", function() {
- if ( self.dragging ) {
+ this._sliderMouseUp = function() {
+ if ( self.dragging ) {
+ self.dragging = false;
- self.dragging = false;
-
- if ( cType === "select") {
-
- // make the handle move with a smooth transition
- handle.addClass( "ui-slider-handle-snapping" );
-
- if ( self.mouseMoved ) {
-
- // this is a drag, change the value only if user dragged enough
- if ( self.userModified ) {
- self.refresh( self.beforeStart == 0 ? 1 : 0 );
- }
- else {
- self.refresh( self.beforeStart );
- }
+ if ( cType === "select") {
+ // make the handle move with a smooth transition
+ handle.addClass( "ui-slider-handle-snapping" );
+ if ( self.mouseMoved ) {
+ // this is a drag, change the value only if user dragged enough
+ if ( self.userModified ) {
+ self.refresh( self.beforeStart === 0 ? 1 : 0 );
}
else {
- // this is just a click, change the value
- self.refresh( self.beforeStart == 0 ? 1 : 0 );
+ self.refresh( self.beforeStart );
}
-
}
-
- self.mouseMoved = false;
-
- return false;
+ else {
+ // this is just a click, change the value
+ self.refresh( self.beforeStart === 0 ? 1 : 0 );
+ }
}
- });
+ self.mouseMoved = false;
+ self._trigger( "stop" );
+ return false;
+ }
+ };
+
+ this._on( slider.add( document ), { "vmouseup": this._sliderMouseUp });
slider.insertAfter( control );
// Only add focus class to toggle switch, sliders get it automatically from ui-btn
- if( cType == 'select' ) {
+ if ( cType === 'select' ) {
this.handle.bind({
focus: function() {
slider.addClass( $.mobile.focusClass );
@@ -6270,20 +7828,36 @@ $.widget( "mobile.slider", $.mobile.widget, {
}
});
- this.refresh(undefined, undefined, true);
+ this.refresh( undefined, undefined, true );
+ },
+
+ _checkedRefresh: function() {
+ if( this.value != this._value() ){
+ this.refresh( this._value() );
+ }
+ },
+
+ _value: function() {
+ return this._type === "input" ?
+ parseFloat( this.element.val() ) : this.element[0].selectedIndex;
},
refresh: function( val, isfromControl, preventInputUpdate ) {
+ // NOTE: we don't return here because we want to support programmatic
+ // alteration of the input value, which should still update the slider
if ( this.options.disabled || this.element.attr('disabled')) {
this.disable();
}
+ // set the stored value for comparison later
+ this.value = this._value();
+
var control = this.element, percent,
cType = control[0].nodeName.toLowerCase(),
min = cType === "input" ? parseFloat( control.attr( "min" ) ) : 0,
max = cType === "input" ? parseFloat( control.attr( "max" ) ) : control.find( "option" ).length - 1,
- step = (cType === "input" && parseFloat( control.attr( "step" ) ) > 0) ? parseFloat(control.attr("step")) : 1;
+ step = ( cType === "input" && parseFloat( control.attr( "step" ) ) > 0 ) ? parseFloat( control.attr( "step" ) ) : 1;
if ( typeof val === "object" ) {
var data = val,
@@ -6341,7 +7915,10 @@ $.widget( "mobile.slider", $.mobile.widget, {
"aria-valuetext": cType === "input" ? newval : control.find( "option" ).eq( newval ).getEncodedText(),
title: cType === "input" ? newval : control.find( "option" ).eq( newval ).getEncodedText()
});
- this.valuebg && this.valuebg.css( "width", percent + "%" );
+
+ if ( this.valuebg ) {
+ this.valuebg.css( "width", percent + "%" );
+ }
// drag the label widths
if ( this._labels ) {
@@ -6349,8 +7926,8 @@ $.widget( "mobile.slider", $.mobile.widget, {
aPercent = percent && handlePercent + ( 100 - handlePercent ) * percent / 100,
bPercent = percent === 100 ? 0 : Math.min( handlePercent + 100 - aPercent, 100 );
- this._labels.each(function(){
- var ab = $(this).is( ".ui-slider-label-a" );
+ this._labels.each(function() {
+ var ab = $( this ).is( ".ui-slider-label-a" );
$( this ).width( ( ab ? aPercent : bPercent ) + "%" );
});
}
@@ -6387,7 +7964,7 @@ $.widget( "mobile.slider", $.mobile.widget, {
});
//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
$.mobile.slider.prototype.enhanceWithin( e.target, true );
});
@@ -6411,11 +7988,11 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
nativeMenu: true,
// This option defaults to true on iOS devices.
preventFocusZoom: /iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1,
- initSelector: "select:not(:jqmData(role='slider'))",
+ initSelector: "select:not( :jqmData(role='slider') )",
mini: false
},
- _button: function(){
+ _button: function() {
return $( "
" );
},
@@ -6433,25 +8010,25 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
}, 40);
},
- _selectOptions: function() {
- return this.select.find( "option" );
- },
+ _selectOptions: function() {
+ return this.select.find( "option" );
+ },
// setup items that are generally necessary for select menu extension
- _preExtension: function(){
+ _preExtension: function() {
var classes = "";
// TODO: Post 1.1--once we have time to test thoroughly--any classes manually applied to the original element should be carried over to the enhanced element, with an `-enhanced` suffix. See https://github.com/jquery/jquery-mobile/issues/3577
- /* if( $el[0].className.length ) {
+ /* if ( $el[0].className.length ) {
classes = $el[0].className;
} */
- if( !!~this.element[0].className.indexOf( "ui-btn-left" ) ) {
+ if ( !!~this.element[0].className.indexOf( "ui-btn-left" ) ) {
classes = " ui-btn-left";
}
-
- if( !!~this.element[0].className.indexOf( "ui-btn-right" ) ) {
+
+ if ( !!~this.element[0].className.indexOf( "ui-btn-right" ) ) {
classes = " ui-btn-right";
}
-
+
this.select = this.element.wrap( "
" );
this.selectID = this.select.attr( "id" );
this.label = $( "label[for='"+ this.selectID +"']" ).addClass( "ui-select" );
@@ -6464,7 +8041,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
_create: function() {
this._preExtension();
- // Allows for extension of the native select for custom selects and other plugins
+ // Allows for extension of the native select for custom selects and other plugins
// see select.custom for example extension
// TODO explore plugin registration
this._trigger( "beforeCreate" );
@@ -6476,17 +8053,16 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
options = this.options,
inline = options.inline || this.select.jqmData( "inline" ),
- mini = options.mini || this.select.jqmData( "mini" ),
+ mini = options.mini || this.select.jqmData( "mini" ),
iconpos = options.icon ? ( options.iconpos || this.select.jqmData( "iconpos" ) ) : false,
// IE throws an exception at options.item() function when
// there is no selected item
// select first in this case
- selectedIndex = this.select[ 0 ].selectedIndex == -1 ? 0 : this.select[ 0 ].selectedIndex,
+ selectedIndex = this.select[ 0 ].selectedIndex === -1 ? 0 : this.select[ 0 ].selectedIndex,
// TODO values buttonId and menuId are undefined here
button = this.button
- .text( $( this.select[ 0 ].options.item( selectedIndex ) ).text() )
.insertBefore( this.select )
.buttonMarkup( {
theme: options.theme,
@@ -6499,13 +8075,15 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
mini: mini
});
+ this.setButtonText();
+
// Opera does not properly support opacity on select elements
// In Mini, it hides the element, but not its text
// On the desktop,it seems to do the opposite
// for these reasons, using the nativeMenu option results in a full native select in Opera
if ( options.nativeMenu && window.opera && window.opera.version ) {
button.addClass( "ui-select-nativeonly" );
- }
+ }
// Add counter for multi selects
if ( this.isMultiple ) {
@@ -6521,7 +8099,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
}
// Events on native select
- this.select.change( function() {
+ this.select.change(function() {
self.refresh();
});
@@ -6537,12 +8115,12 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
// Add active class to button
self.button.addClass( $.mobile.activeBtnClass );
})
- .bind( "focus", function() {
- self.button.addClass( $.mobile.focusClass );
- })
- .bind( "blur", function() {
- self.button.removeClass( $.mobile.focusClass );
- })
+ .bind( "focus", function() {
+ self.button.addClass( $.mobile.focusClass );
+ })
+ .bind( "blur", function() {
+ self.button.removeClass( $.mobile.focusClass );
+ })
.bind( "focus vmouseover", function() {
self.button.trigger( "vmouseover" );
})
@@ -6560,13 +8138,14 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
// In many situations, iOS will zoom into the select upon tap, this prevents that from happening
self.button.bind( "vmousedown", function() {
- if( self.options.preventFocusZoom ){
+ if ( self.options.preventFocusZoom ) {
$.mobile.zoom.disable( true );
}
- })
- .bind( "mouseup", function() {
- if( self.options.preventFocusZoom ){
- $.mobile.zoom.enable( true );
+ }).bind( "mouseup", function() {
+ if ( self.options.preventFocusZoom ) {
+ setTimeout(function() {
+ $.mobile.zoom.enable( true );
+ }, 0);
}
});
},
@@ -6578,22 +8157,30 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
selectedIndices: function() {
var self = this;
- return this.selected().map( function() {
+ return this.selected().map(function() {
return self._selectOptions().index( this );
}).get();
},
setButtonText: function() {
- var self = this, selected = this.selected();
+ var self = this,
+ selected = this.selected(),
+ text = this.placeholder,
+ span = $( document.createElement( "span" ) );
- this.button.find( ".ui-btn-text" ).text( function() {
- if ( !self.isMultiple ) {
- return selected.text();
+ this.button.find( ".ui-btn-text" ).html(function() {
+ if ( selected.length ) {
+ text = selected.map(function() {
+ return $( this ).text();
+ }).get().join( ", " );
+ } else {
+ text = self.placeholder;
}
- return selected.length ? selected.map( function() {
- return $( this ).text();
- }).get().join( ", " ) : self.placeholder;
+ // TODO possibly aggregate multiple select option classes
+ return span.text( text )
+ .addClass( self.select.attr( "class" ) )
+ .addClass( selected.attr( "class" ) );
});
},
@@ -6628,7 +8215,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
});
//auto self-init widgets
-$( document ).bind( "pagecreate create", function( e ){
+$( document ).bind( "pagecreate create", function( e ) {
$.mobile.selectmenu.prototype.enhanceWithin( e.target, true );
});
})( jQuery );
@@ -6638,13 +8225,12 @@ $( document ).bind( "pagecreate create", function( e ){
*/
(function( $, undefined ) {
- var extendSelect = function( widget ){
+ var extendSelect = function( widget ) {
var select = widget.select,
selectID = widget.selectID,
label = widget.label,
thisPage = widget.select.closest( ".ui-page" ),
- screen = $( "
", {"class": "ui-selectmenu-screen ui-screen-hidden"} ).appendTo( thisPage ),
selectOptions = widget._selectOptions(),
isMultiple = widget.isMultiple = widget.select[ 0 ].multiple,
buttonId = selectID + "-button",
@@ -6656,7 +8242,7 @@ $( document ).bind( "pagecreate create", function( e ){
"
"+
"
" ),
- listbox = $("
", { "class": "ui-selectmenu ui-selectmenu-hidden ui-overlay-shadow ui-corner-all ui-body-" + widget.options.overlayTheme + " " + $.mobile.defaultDialogTransition } ).insertAfter(screen),
+ listbox = $( "
", { "class": "ui-selectmenu" } ).insertAfter( widget.select ).popup( { theme: "a" } ),
list = $( "
", {
"class": "ui-selectmenu-list",
@@ -6677,7 +8263,7 @@ $( document ).bind( "pagecreate create", function( e ){
menuPageClose,
headerClose;
- if( widget.isMultiple ) {
+ if ( widget.isMultiple ) {
headerClose = $( "", {
"text": widget.options.closeText,
"href": "#",
@@ -6693,7 +8279,6 @@ $( document ).bind( "pagecreate create", function( e ){
thisPage: thisPage,
menuPage: menuPage,
label: label,
- screen: screen,
selectOptions: selectOptions,
isMultiple: isMultiple,
theme: widget.options.theme,
@@ -6719,9 +8304,9 @@ $( document ).bind( "pagecreate create", function( e ){
// Button events
self.button.bind( "vclick keydown" , function( event ) {
- if ( event.type == "vclick" ||
- event.keyCode && ( event.keyCode === $.mobile.keyCode.ENTER ||
- event.keyCode === $.mobile.keyCode.SPACE ) ) {
+ if (event.type === "vclick" ||
+ event.keyCode && (event.keyCode === $.mobile.keyCode.ENTER ||
+ event.keyCode === $.mobile.keyCode.SPACE)) {
self.open();
event.preventDefault();
@@ -6730,13 +8315,13 @@ $( document ).bind( "pagecreate create", function( e ){
// Events for list items
self.list.attr( "role", "listbox" )
- .bind( "focusin", function( e ){
+ .bind( "focusin", function( e ) {
$( e.target )
.attr( "tabindex", "0" )
.trigger( "vmouseover" );
})
- .bind( "focusout", function( e ){
+ .bind( "focusout", function( e ) {
$( e.target )
.attr( "tabindex", "-1" )
.trigger( "vmouseout" );
@@ -6783,10 +8368,10 @@ $( document ).bind( "pagecreate create", function( e ){
// switch logic based on which key was pressed
switch ( event.keyCode ) {
// up or left arrow keys
- case 38:
+ case 38:
prev = li.prev().not( ".ui-selectmenu-placeholder" );
- if( prev.is( ".ui-li-divider" ) ) {
+ if ( prev.is( ".ui-li-divider" ) ) {
prev = prev.prev();
}
@@ -6800,13 +8385,11 @@ $( document ).bind( "pagecreate create", function( e ){
}
return false;
- break;
-
// down or right arrow keys
- case 40:
+ case 40:
next = li.next();
- if( next.is( ".ui-li-divider" ) ) {
+ if ( next.is( ".ui-li-divider" ) ) {
next = next.next();
}
@@ -6820,15 +8403,12 @@ $( document ).bind( "pagecreate create", function( e ){
}
return false;
- break;
-
// If enter or space is pressed, trigger click
- case 13:
- case 32:
+ case 13:
+ case 32:
target.trigger( "click" );
return false;
- break;
}
});
@@ -6853,15 +8433,15 @@ $( document ).bind( "pagecreate create", function( e ){
$.mobile._bindPageRemove.call( self.thisPage );
});
- // Events on "screen" overlay
- self.screen.bind( "vclick", function( event ) {
+ // Events on the popup
+ self.listbox.bind( "popupafterclose", function( event ) {
self.close();
});
// Close button on small overlays
- if( self.isMultiple ){
- self.headerClose.click( function() {
- if ( self.menuType == "overlay" ) {
+ if ( self.isMultiple ) {
+ self.headerClose.click(function() {
+ if ( self.menuType === "overlay" ) {
self.close();
return false;
}
@@ -6884,10 +8464,10 @@ $( document ).bind( "pagecreate create", function( e ){
},
selected: function() {
- return this._selectOptions().filter( ":selected:not(:jqmData(placeholder='true'))" );
+ return this._selectOptions().filter( ":selected:not( :jqmData(placeholder='true') )" );
},
- refresh: function( forceRebuild , foo ){
+ refresh: function( forceRebuild , foo ) {
var self = this,
select = this.element,
isMultiple = this.isMultiple,
@@ -6917,7 +8497,7 @@ $( document ).bind( "pagecreate create", function( e ){
if ( self.isMultiple ) {
item.find( ".ui-icon" ).removeClass( "ui-icon-checkbox-off" ).addClass( "ui-icon-checkbox-on" );
} else {
- if( item.is( ".ui-selectmenu-placeholder" ) ) {
+ if ( item.is( ".ui-selectmenu-placeholder" ) ) {
item.next().addClass( $.mobile.activeBtnClass );
} else {
item.addClass( $.mobile.activeBtnClass );
@@ -6934,14 +8514,13 @@ $( document ).bind( "pagecreate create", function( e ){
var self = this;
- if ( self.menuType == "page" ) {
+ if ( self.menuType === "page" ) {
// doesn't solve the possible issue with calling change page
// where the objects don't define data urls which prevents dialog key
// stripping - changePage has incoming refactor
- window.history.back();
+ $.mobile.back();
} else {
- self.screen.addClass( "ui-screen-hidden" );
- self.listbox.addClass( "ui-selectmenu-hidden" ).removeAttr( "style" ).removeClass( "in" );
+ self.listbox.popup( "close" );
self.list.appendTo( self.listbox );
self._focusButton();
}
@@ -6956,12 +8535,11 @@ $( document ).bind( "pagecreate create", function( e ){
}
var self = this,
- $window = $( window ),
- selfListParent = self.list.parent(),
+ $window = $( window ),
+ selfListParent = self.list.parent(),
menuHeight = selfListParent.outerHeight(),
menuWidth = selfListParent.outerWidth(),
- activePage = $( ".ui-page-active" ),
- tScrollElem = activePage,
+ activePage = $( "." + $.mobile.activePageClass ),
scrollTop = $window.scrollTop(),
btnOffset = self.button.offset().top,
screenHeight = $window.height(),
@@ -6978,7 +8556,7 @@ $( document ).bind( "pagecreate create", function( e ){
function focusMenuItem() {
var selector = self.list.find( "." + $.mobile.activeBtnClass + " a" );
if ( selector.length === 0 ) {
- selector = self.list.find( "li.ui-btn:not(:jqmData(placeholder='true')) a" );
+ selector = self.list.find( "li.ui-btn:not( :jqmData(placeholder='true') ) a" );
}
selector.first().focus().closest( "li" ).addClass( "ui-btn-down-" + widget.options.theme );
}
@@ -6995,7 +8573,7 @@ $( document ).bind( "pagecreate create", function( e ){
self.thisPage.unbind( "pagehide.remove" );
//for WebOS/Opera Mini (set lastscroll using button offset)
- if ( scrollTop == 0 && btnOffset > screenHeight ) {
+ if ( scrollTop === 0 && btnOffset > screenHeight ) {
self.thisPage.one( "pagehide", function() {
$( this ).jqmData( "lastScroll", btnOffset );
});
@@ -7015,48 +8593,12 @@ $( document ).bind( "pagecreate create", function( e ){
} else {
self.menuType = "overlay";
- self.screen.height( $(document).height() )
- .removeClass( "ui-screen-hidden" );
-
- // Try and center the overlay over the button
- var roomtop = btnOffset - scrollTop,
- roombot = scrollTop + screenHeight - btnOffset,
- halfheight = menuHeight / 2,
- maxwidth = parseFloat( self.list.parent().css( "max-width" ) ),
- newtop, newleft;
-
- if ( roomtop > menuHeight / 2 && roombot > menuHeight / 2 ) {
- newtop = btnOffset + ( self.button.outerHeight() / 2 ) - halfheight;
- } else {
- // 30px tolerance off the edges
- newtop = roomtop > roombot ? scrollTop + screenHeight - menuHeight - 30 : scrollTop + 30;
- }
-
- // If the menuwidth is smaller than the screen center is
- if ( menuWidth < maxwidth ) {
- newleft = ( screenWidth - menuWidth ) / 2;
- } else {
-
- //otherwise insure a >= 30px offset from the left
- newleft = self.button.offset().left + self.button.outerWidth() / 2 - menuWidth / 2;
-
- // 30px tolerance off the edges
- if ( newleft < 30 ) {
- newleft = 30;
- } else if ( (newleft + menuWidth) > screenWidth ) {
- newleft = screenWidth - menuWidth - 30;
- }
- }
-
- self.listbox.append( self.list )
- .removeClass( "ui-selectmenu-hidden" )
- .css({
- top: newtop,
- left: newleft
- })
- .addClass( "in" );
-
- focusMenuItem();
+ self.listbox
+ .one( "popupafteropen", focusMenuItem )
+ .popup( "open", {
+ x: self.button.offset().left + self.button.outerWidth() / 2,
+ y: self.button.offset().top + self.button.outerHeight() / 2
+ });
// duplicate with value set in page show for dialog sized selects
self.isOpen = true;
@@ -7074,7 +8616,7 @@ $( document ).bind( "pagecreate create", function( e ){
self.list.empty().filter( ".ui-listview" ).listview( "destroy" );
- var $options = self.select.find("option"),
+ var $options = self.select.find( "option" ),
numOptions = $options.length,
select = this.select[ 0 ],
dataPrefix = 'data-' + $.mobile.ns,
@@ -7086,32 +8628,32 @@ $( document ).bind( "pagecreate create", function( e ){
isPlaceholderItem = false,
optGroup;
- for (var i = 0; i < numOptions;i++, isPlaceholderItem = false){
+ for (var i = 0; i < numOptions;i++, isPlaceholderItem = false) {
var option = $options[i],
- $option = $(option),
+ $option = $( option ),
parent = option.parentNode,
text = $option.text(),
- anchor = document.createElement('a'),
+ anchor = document.createElement( 'a' ),
classes = [];
- anchor.setAttribute('href','#');
- anchor.appendChild(document.createTextNode(text));
+ anchor.setAttribute( 'href', '#' );
+ anchor.appendChild( document.createTextNode( text ) );
// Are we inside an optgroup?
- if (parent !== select && parent.nodeName.toLowerCase() === "optgroup"){
- var optLabel = parent.getAttribute('label');
- if ( optLabel != optGroup) {
- var divider = document.createElement('li');
- divider.setAttribute(dataRoleAttr,'list-divider');
- divider.setAttribute('role','option');
- divider.setAttribute('tabindex','-1');
- divider.appendChild(document.createTextNode(optLabel));
- fragment.appendChild(divider);
+ if ( parent !== select && parent.nodeName.toLowerCase() === "optgroup" ) {
+ var optLabel = parent.getAttribute( 'label' );
+ if ( optLabel !== optGroup ) {
+ var divider = document.createElement( 'li' );
+ divider.setAttribute( dataRoleAttr, 'list-divider' );
+ divider.setAttribute( 'role', 'option' );
+ divider.setAttribute( 'tabindex', '-1' );
+ divider.appendChild( document.createTextNode( optLabel ) );
+ fragment.appendChild( divider );
optGroup = optLabel;
}
}
- if (needPlaceholder && (!option.getAttribute( "value" ) || text.length == 0 || $option.jqmData( "placeholder" ))) {
+ if ( needPlaceholder && ( !option.getAttribute( "value" ) || text.length === 0 || $option.jqmData( "placeholder" ) ) ) {
needPlaceholder = false;
isPlaceholderItem = true;
@@ -7130,19 +8672,19 @@ $( document ).bind( "pagecreate create", function( e ){
classes.push( "ui-disabled" );
item.setAttribute('aria-disabled',true);
}
- item.setAttribute(dataIndexAttr,i);
- item.setAttribute(dataIconAttr,dataIcon);
+ item.setAttribute( dataIndexAttr,i );
+ item.setAttribute( dataIconAttr, dataIcon );
if ( isPlaceholderItem ) {
item.setAttribute( dataPlaceholderAttr, true );
}
- item.className = classes.join(" ");
- item.setAttribute('role','option');
- anchor.setAttribute('tabindex','-1');
- item.appendChild(anchor);
- fragment.appendChild(item);
+ item.className = classes.join( " " );
+ item.setAttribute( 'role', 'option' );
+ anchor.setAttribute( 'tabindex', '-1' );
+ item.appendChild( anchor );
+ fragment.appendChild( item );
}
- self.list[0].appendChild(fragment);
+ self.list[0].appendChild( fragment );
// Hide header if it's not a multiselect and there's no placeholder
if ( !this.isMultiple && !placeholder.length ) {
@@ -7155,7 +8697,7 @@ $( document ).bind( "pagecreate create", function( e ){
self.list.listview();
},
- _button: function(){
+ _button: function() {
return $( "", {
"href": "#",
"role": "button",
@@ -7170,11 +8712,12 @@ $( document ).bind( "pagecreate create", function( e ){
});
};
- // issue #3894 - core doesn't triggered events on disabled delegates
- $( document ).bind( "selectmenubeforecreate", function( event ){
+ // issue #3894 - core doesn't trigger events on disabled delegates
+ $( document ).bind( "selectmenubeforecreate", function( event ) {
var selectmenuWidget = $( event.target ).data( "selectmenu" );
- if( !selectmenuWidget.options.nativeMenu ){
+ if ( !selectmenuWidget.options.nativeMenu &&
+ selectmenuWidget.element.parents( ":jqmData(role='popup')" ).length === 0 ) {
extendSelect( selectmenuWidget );
}
});
@@ -7190,7 +8733,7 @@ $( document ).bind( "pagecreate create", function( e ){
transition: "slide", //can be none, fade, slide (slide maps to slideup or slidedown)
fullscreen: false,
tapToggle: true,
- tapToggleBlacklist: "a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed",
+ tapToggleBlacklist: "a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup",
hideDuringFocus: "input, textarea, select",
updatePagePadding: true,
trackPersistentToolbars: true,
@@ -7201,7 +8744,7 @@ $( document ).bind( "pagecreate create", function( e ){
// Testing fixed positioning is also pretty obtrusive to page load, requiring injected elements and scrolling the window
// The following function serves to rule out some popular browsers with known fixed-positioning issues
// This is a plugin option like any other, so feel free to improve or overwrite it
- supportBlacklist: function(){
+ supportBlacklist: function() {
var w = window,
ua = navigator.userAgent,
platform = navigator.platform,
@@ -7215,25 +8758,18 @@ $( document ).bind( "pagecreate create", function( e ){
if(
// iOS 4.3 and older : Platform is iPhone/Pad/Touch and Webkit version is less than 534 (ios5)
- ( ( platform.indexOf( "iPhone" ) > -1 || platform.indexOf( "iPad" ) > -1 || platform.indexOf( "iPod" ) > -1 ) && wkversion && wkversion < 534 )
- ||
+ ( ( platform.indexOf( "iPhone" ) > -1 || platform.indexOf( "iPad" ) > -1 || platform.indexOf( "iPod" ) > -1 ) && wkversion && wkversion < 534 ) ||
// Opera Mini
- ( w.operamini && ({}).toString.call( w.operamini ) === "[object OperaMini]" )
- ||
- ( operammobilematch && omversion < 7458 )
- ||
+ ( w.operamini && ({}).toString.call( w.operamini ) === "[object OperaMini]" ) ||
+ ( operammobilematch && omversion < 7458 ) ||
//Android lte 2.1: Platform is Android and Webkit version is less than 533 (Android 2.2)
- ( ua.indexOf( "Android" ) > -1 && wkversion && wkversion < 533 )
- ||
+ ( ua.indexOf( "Android" ) > -1 && wkversion && wkversion < 533 ) ||
// Firefox Mobile before 6.0 -
- ( ffversion && ffversion < 6 )
- ||
+ ( ffversion && ffversion < 6 ) ||
// WebOS less than 3
- ( "palmGetResource" in window && wkversion && wkversion < 534 )
- ||
+ ( "palmGetResource" in window && wkversion && wkversion < 534 ) ||
// MeeGo
- ( ua.indexOf( "MeeGo" ) > -1 && ua.indexOf( "NokiaBrowser/8.5.0" ) > -1 )
- ){
+ ( ua.indexOf( "MeeGo" ) > -1 && ua.indexOf( "NokiaBrowser/8.5.0" ) > -1 ) ) {
return true;
}
@@ -7248,10 +8784,10 @@ $( document ).bind( "pagecreate create", function( e ){
o = self.options,
$el = self.element,
tbtype = $el.is( ":jqmData(role='header')" ) ? "header" : "footer",
- $page = $el.closest(".ui-page");
+ $page = $el.closest( ".ui-page" );
// Feature detecting support for
- if( o.supportBlacklist() ){
+ if ( o.supportBlacklist() ) {
self.destroy();
return;
}
@@ -7259,7 +8795,7 @@ $( document ).bind( "pagecreate create", function( e ){
$el.addClass( "ui-"+ tbtype +"-fixed" );
// "fullscreen" overlay positioning
- if( o.fullscreen ){
+ if ( o.fullscreen ) {
$el.addClass( "ui-"+ tbtype +"-fullscreen" );
$page.addClass( "ui-page-" + tbtype + "-fullscreen" );
}
@@ -7273,12 +8809,12 @@ $( document ).bind( "pagecreate create", function( e ){
self._bindToggleHandlers();
},
- _addTransitionClass: function(){
+ _addTransitionClass: function() {
var tclass = this.options.transition;
- if( tclass && tclass !== "none" ){
+ if ( tclass && tclass !== "none" ) {
// use appropriate slide for header or footer
- if( tclass === "slide" ){
+ if ( tclass === "slide" ) {
tclass = this.element.is( ".ui-header" ) ? "slidedown" : "slideup";
}
@@ -7286,7 +8822,7 @@ $( document ).bind( "pagecreate create", function( e ){
}
},
- _bindPageEvents: function(){
+ _bindPageEvents: function() {
var self = this,
o = self.options,
$el = self.element;
@@ -7295,50 +8831,48 @@ $( document ).bind( "pagecreate create", function( e ){
// Fixed toolbars require page zoom to be disabled, otherwise usability issues crop up
// This method is meant to disable zoom while a fixed-positioned toolbar page is visible
$el.closest( ".ui-page" )
- .bind( "pagebeforeshow", function(){
- if( o.disablePageZoom ){
+ .bind( "pagebeforeshow", function() {
+ if ( o.disablePageZoom ) {
$.mobile.zoom.disable( true );
}
- if( !o.visibleOnPageShow ){
+ if ( !o.visibleOnPageShow ) {
self.hide( true );
}
} )
- .bind( "webkitAnimationStart animationstart updatelayout", function(){
+ .bind( "webkitAnimationStart animationstart updatelayout", function() {
var thisPage = this;
- if( o.updatePagePadding ){
+ if ( o.updatePagePadding ) {
self.updatePagePadding( thisPage );
}
})
- .bind( "pageshow", function(){
+ .bind( "pageshow", function() {
var thisPage = this;
self.updatePagePadding( thisPage );
- if( o.updatePagePadding ){
- $( window ).bind( "throttledresize." + self.widgetName, function(){
- self.updatePagePadding( thisPage );
+ if ( o.updatePagePadding ) {
+ $( window ).bind( "throttledresize." + self.widgetName, function() {
+ self.updatePagePadding( thisPage );
});
}
})
- .bind( "pagebeforehide", function( e, ui ){
- if( o.disablePageZoom ){
+ .bind( "pagebeforehide", function( e, ui ) {
+ if ( o.disablePageZoom ) {
$.mobile.zoom.enable( true );
}
- if( o.updatePagePadding ){
+ if ( o.updatePagePadding ) {
$( window ).unbind( "throttledresize." + self.widgetName );
}
- if( o.trackPersistentToolbars ){
+ if ( o.trackPersistentToolbars ) {
var thisFooter = $( ".ui-footer-fixed:jqmData(id)", this ),
thisHeader = $( ".ui-header-fixed:jqmData(id)", this ),
- nextFooter = thisFooter.length && ui.nextPage && $( ".ui-footer-fixed:jqmData(id='" + thisFooter.jqmData( "id" ) + "')", ui.nextPage ),
- nextHeader = thisHeader.length && ui.nextPage && $( ".ui-header-fixed:jqmData(id='" + thisHeader.jqmData( "id" ) + "')", ui.nextPage );
+ nextFooter = thisFooter.length && ui.nextPage && $( ".ui-footer-fixed:jqmData(id='" + thisFooter.jqmData( "id" ) + "')", ui.nextPage ) || $(),
+ nextHeader = thisHeader.length && ui.nextPage && $( ".ui-header-fixed:jqmData(id='" + thisHeader.jqmData( "id" ) + "')", ui.nextPage ) || $();
- nextFooter = nextFooter || $();
-
- if( nextFooter.length || nextHeader.length ){
+ if ( nextFooter.length || nextHeader.length ) {
nextFooter.add( nextHeader ).appendTo( $.mobile.pageContainer );
- ui.nextPage.one( "pageshow", function(){
+ ui.nextPage.one( "pageshow", function() {
nextFooter.add( nextHeader ).appendTo( this );
});
}
@@ -7354,13 +8888,13 @@ $( document ).bind( "pagecreate create", function( e ){
header = $el.is( ".ui-header" );
// This behavior only applies to "fixed", not "fullscreen"
- if( this.options.fullscreen ){ return; }
+ if ( this.options.fullscreen ) { return; }
tbPage = tbPage || $el.closest( ".ui-page" );
$( tbPage ).css( "padding-" + ( header ? "top" : "bottom" ), $el.outerHeight() );
},
-
- _useTransition: function( notransition ){
+
+ _useTransition: function( notransition ) {
var $win = $( window ),
$el = this.element,
scroll = $win.scrollTop(),
@@ -7368,7 +8902,7 @@ $( document ).bind( "pagecreate create", function( e ){
pHeight = $el.closest( ".ui-page" ).height(),
viewportHeight = $.mobile.getScreenHeight(),
tbtype = $el.is( ":jqmData(role='header')" ) ? "header" : "footer";
-
+
return !notransition &&
( this.options.transition && this.options.transition !== "none" &&
(
@@ -7378,11 +8912,11 @@ $( document ).bind( "pagecreate create", function( e ){
);
},
- show: function( notransition ){
+ show: function( notransition ) {
var hideClass = "ui-fixed-hidden",
$el = this.element;
- if( this._useTransition( notransition ) ){
+ if ( this._useTransition( notransition ) ) {
$el
.removeClass( "out " + hideClass )
.addClass( "in" );
@@ -7393,17 +8927,17 @@ $( document ).bind( "pagecreate create", function( e ){
this._visible = true;
},
- hide: function( notransition ){
+ hide: function( notransition ) {
var hideClass = "ui-fixed-hidden",
$el = this.element,
// if it's a slide transition, our new transitions need the reverse class as well to slide outward
outclass = "out" + ( this.options.transition === "slide" ? " reverse" : "" );
- if( this._useTransition( notransition ) ){
+ if( this._useTransition( notransition ) ) {
$el
.addClass( outclass )
.removeClass( "in" )
- .animationComplete( function(){
+ .animationComplete(function() {
$el.addClass( hideClass ).removeClass( outclass );
});
}
@@ -7413,30 +8947,30 @@ $( document ).bind( "pagecreate create", function( e ){
this._visible = false;
},
- toggle: function(){
+ toggle: function() {
this[ this._visible ? "hide" : "show" ]();
},
- _bindToggleHandlers: function(){
+ _bindToggleHandlers: function() {
var self = this,
o = self.options,
$el = self.element;
// tap toggle
$el.closest( ".ui-page" )
- .bind( "vclick", function( e ){
- if( o.tapToggle && !$( e.target ).closest( o.tapToggleBlacklist ).length ){
+ .bind( "vclick", function( e ) {
+ if ( o.tapToggle && !$( e.target ).closest( o.tapToggleBlacklist ).length ) {
self.toggle();
}
})
- .bind( "focusin focusout", function( e ){
- if( screen.width < 500 && $( e.target ).is( o.hideDuringFocus ) && !$( e.target ).closest( ".ui-header-fixed, .ui-footer-fixed" ).length ){
+ .bind( "focusin focusout", function( e ) {
+ if ( screen.width < 500 && $( e.target ).is( o.hideDuringFocus ) && !$( e.target ).closest( ".ui-header-fixed, .ui-footer-fixed" ).length ) {
self[ ( e.type === "focusin" && self._visible ) ? "hide" : "show" ]();
}
});
},
- destroy: function(){
+ destroy: function() {
this.element.removeClass( "ui-header-fixed ui-footer-fixed ui-header-fullscreen ui-footer-fullscreen in out fade slidedown slideup ui-fixed-hidden" );
this.element.closest( ".ui-page" ).removeClass( "ui-page-header-fixed ui-page-footer-fixed ui-page-header-fullscreen ui-page-footer-fullscreen" );
}
@@ -7445,59 +8979,63 @@ $( document ).bind( "pagecreate create", function( e ){
//auto self-init widgets
$( document )
- .bind( "pagecreate create", function( e ){
-
+ .bind( "pagecreate create", function( e ) {
+
// DEPRECATED in 1.1: support for data-fullscreen=true|false on the page element.
// This line ensures it still works, but we recommend moving the attribute to the toolbars themselves.
- if( $( e.target ).jqmData( "fullscreen" ) ){
+ if ( $( e.target ).jqmData( "fullscreen" ) ) {
$( $.mobile.fixedtoolbar.prototype.options.initSelector, e.target ).not( ":jqmData(fullscreen)" ).jqmData( "fullscreen", true );
}
-
+
$.mobile.fixedtoolbar.prototype.enhanceWithin( e.target );
});
})( jQuery );
-( function( $, window ) {
-
+(function( $, window ) {
+
// This fix addresses an iOS bug, so return early if the UA claims it's something else.
- if( !(/iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1 ) ){
+ if ( !(/iPhone|iPad|iPod/.test( navigator.platform ) && navigator.userAgent.indexOf( "AppleWebKit" ) > -1 ) ) {
return;
}
-
- var zoom = $.mobile.zoom,
+
+ var zoom = $.mobile.zoom,
evt, x, y, z, aig;
-
- function checkTilt( e ){
+
+ function checkTilt( e ) {
evt = e.originalEvent;
aig = evt.accelerationIncludingGravity;
-
+
x = Math.abs( aig.x );
y = Math.abs( aig.y );
z = Math.abs( aig.z );
-
- // If portrait orientation and in one of the danger zones
- if( !window.orientation && ( x > 7 || ( ( z > 6 && y < 8 || z < 8 && y > 6 ) && x > 5 ) ) ){
- if( zoom.enabled ){
- zoom.disable();
- }
- }
- else if( !zoom.enabled ){
- zoom.enable();
- }
- }
- $( window )
+ // If portrait orientation and in one of the danger zones
+ if ( !window.orientation && ( x > 7 || ( ( z > 6 && y < 8 || z < 8 && y > 6 ) && x > 5 ) ) ) {
+ if ( zoom.enabled ) {
+ zoom.disable();
+ }
+ } else if ( !zoom.enabled ) {
+ zoom.enable();
+ }
+ }
+
+ $( window )
.bind( "orientationchange.iosorientationfix", zoom.enable )
.bind( "devicemotion.iosorientationfix", checkTilt );
}( jQuery, this ));
-( function( $, window, undefined ) {
+(function( $, window, undefined ) {
var $html = $( "html" ),
$head = $( "head" ),
$window = $( window );
+ //remove initial build class (only present on first pageshow)
+ function hideRenderingClass() {
+ $html.removeClass( "ui-mobile-rendering" );
+ }
+
// trigger mobileinit event - useful hook for configuring $.mobile settings before they're used
$( window.document ).trigger( "mobileinit" );
@@ -7521,81 +9059,13 @@ $( document ).bind( "pagecreate create", function( e ){
// this ensures the rendering class is removed after 5 seconds, so content is visible and accessible
setTimeout( hideRenderingClass, 5000 );
- // loading div which appears during Ajax requests
- // will not appear if $.mobile.loadingMessage is false
- var loaderClass = "ui-loader",
- $loader = $( "
" );
-
- // For non-fixed supportin browsers. Position at y center (if scrollTop supported), above the activeBtn (if defined), or just 100px from top
- function fakeFixLoader(){
- var activeBtn = $( "." + $.mobile.activeBtnClass ).first();
-
- $loader
- .css({
- top: $.support.scrollTop && $window.scrollTop() + $window.height() / 2 ||
- activeBtn.length && activeBtn.offset().top || 100
- });
- }
-
- // check position of loader to see if it appears to be "fixed" to center
- // if not, use abs positioning
- function checkLoaderPosition(){
- var offset = $loader.offset(),
- scrollTop = $window.scrollTop(),
- screenHeight = $.mobile.getScreenHeight();
-
- if( offset.top < scrollTop || (offset.top - scrollTop) > screenHeight ) {
- $loader.addClass( "ui-loader-fakefix" );
- fakeFixLoader();
- $window
- .unbind( "scroll", checkLoaderPosition )
- .bind( "scroll", fakeFixLoader );
- }
- }
-
- //remove initial build class (only present on first pageshow)
- function hideRenderingClass(){
- $html.removeClass( "ui-mobile-rendering" );
- }
-
- $.extend($.mobile, {
- // turn on/off page loading message.
- showPageLoadingMsg: function( theme, msgText, textonly ) {
- $html.addClass( "ui-loading" );
-
- if ( $.mobile.loadingMessage ) {
- // text visibility from argument takes priority
- var textVisible = textonly || $.mobile.loadingMessageTextVisible;
-
- theme = theme || $.mobile.loadingMessageTheme,
-
- $loader
- .attr( "class", loaderClass + " ui-corner-all ui-body-" + ( theme || "a" ) + " ui-loader-" + ( textVisible ? "verbose" : "default" ) + ( textonly ? " ui-loader-textonly" : "" ) )
- .find( "h1" )
- .text( msgText || $.mobile.loadingMessage )
- .end()
- .appendTo( $.mobile.pageContainer );
-
- checkLoaderPosition();
- $window.bind( "scroll", checkLoaderPosition );
- }
- },
-
- hidePageLoadingMsg: function() {
- $html.removeClass( "ui-loading" );
-
- if( $.mobile.loadingMessage ){
- $loader.removeClass( "ui-loader-fakefix" );
- }
-
- $( window ).unbind( "scroll", fakeFixLoader );
- $( window ).unbind( "scroll", checkLoaderPosition );
- },
-
+ $.extend( $.mobile, {
// find and enhance the pages in the dom and transition to the first page.
initializePage: function() {
// find present pages
- var $pages = $( ":jqmData(role='page'), :jqmData(role='dialog')" );
+ var $pages = $( ":jqmData(role='page'), :jqmData(role='dialog')" ),
+ hash = $.mobile.path.parseLocation().hash.replace("#", ""),
+ hashPage = document.getElementById( hash );
// if no pages are found, create one with body's inner html
if ( !$pages.length ) {
@@ -7604,10 +9074,10 @@ $( document ).bind( "pagecreate create", function( e ){
// add dialogs, set data-url attrs
$pages.each(function() {
- var $this = $(this);
+ var $this = $( this );
// unless the data url is already set set it to the pathname
- if ( !$this.jqmData("url") ) {
+ if ( !$this.jqmData( "url" ) ) {
$this.attr( "data-" + $.mobile.ns + "url", $this.attr( "id" ) || location.pathname + location.search );
}
});
@@ -7633,9 +9103,15 @@ $( document ).bind( "pagecreate create", function( e ){
// or there is no page with that hash, change to the first page in the DOM
// Remember, however, that the hash can also be a path!
if ( ! ( $.mobile.hashListeningEnabled &&
- $.mobile.path.isHashValid( location.hash ) &&
- ( $( location.hash + ':jqmData(role="page")' ).length ||
- $.mobile.path.isPath( location.hash ) ) ) ) {
+ $.mobile.path.isHashValid( location.hash ) &&
+ ( $( hashPage ).is( ':jqmData(role="page")' ) ||
+ $.mobile.path.isPath( hash ) ||
+ hash === $.mobile.dialogHashKey ) ) ) {
+
+ // Store the initial destination
+ if ( $.mobile.path.isHashValid( location.hash ) ) {
+ $.mobile.urlHistory.initialDst = hash.replace( "#", "" );
+ }
$.mobile.changePage( $.mobile.firstPage, { transition: "none", reverse: true, changeHash: false, fromHashChange: true } );
}
// otherwise, trigger a hashchange to load a deeplink
@@ -7657,13 +9133,13 @@ $( document ).bind( "pagecreate create", function( e ){
// if defaultHomeScroll hasn't been set yet, see if scrollTop is 1
// it should be 1 in most browsers, but android treats 1 as 0 (for hiding addr bar)
// so if it's 1, use 0 from now on
- $.mobile.defaultHomeScroll = ( !$.support.scrollTop || $(window).scrollTop() === 1 ) ? 0 : 1;
+ $.mobile.defaultHomeScroll = ( !$.support.scrollTop || $( window ).scrollTop() === 1 ) ? 0 : 1;
// TODO: Implement a proper registration mechanism with dependency handling in order to not have exceptions like the one below
//auto self-init widgets for those widgets that have a soft dependency on others
if ( $.fn.controlgroup ) {
- $( document ).bind( "pagecreate create", function( e ){
+ $( document ).bind( "pagecreate create", function( e ) {
$( ":jqmData(role='controlgroup')", e.target )
.jqmEnhanceable()
.controlgroup({ excludeInvisible: false });
@@ -7671,7 +9147,7 @@ $( document ).bind( "pagecreate create", function( e ){
}
//dom-ready inits
- if( $.mobile.autoInitializePage ){
+ if ( $.mobile.autoInitializePage ) {
$.mobile.initializePage();
}
@@ -7694,5 +9170,4 @@ $( document ).bind( "pagecreate create", function( e ){
});
}( jQuery, this ));
-
}));
diff --git a/theme/mymobile/lang/en/theme_mymobile.php b/theme/mymobile/lang/en/theme_mymobile.php
old mode 100644
new mode 100755
index f80ddb3204d..91e86d44ff1
--- a/theme/mymobile/lang/en/theme_mymobile.php
+++ b/theme/mymobile/lang/en/theme_mymobile.php
@@ -40,6 +40,8 @@ $string['showfullsizeimages'] = 'Show full images on site index and course pages
$string['showfullsizeimages_desc'] = 'Show full size images on site index and course pages instead of replaced thumb icon method. Default is to not show full size images.';
$string['usetableview'] = 'Tablet View';
$string['usetableview_desc'] = 'Use the tablet view for larger devices (yes by default).';
+$string['useajax'] = 'Use Ajax Page Loading';
+$string['useajax_desc'] = 'Use ajax page loading. Turn off if experiencing problems (yes by default).';
$string['yes'] = 'Yes';
$string['customcss'] = 'Custom CSS';
$string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.';
\ No newline at end of file
diff --git a/theme/mymobile/layout/embedded.php b/theme/mymobile/layout/embedded.php
old mode 100644
new mode 100755
diff --git a/theme/mymobile/layout/general.php b/theme/mymobile/layout/general.php
old mode 100644
new mode 100755
index d956b853f3b..4e14bb4cee8
--- a/theme/mymobile/layout/general.php
+++ b/theme/mymobile/layout/general.php
@@ -71,10 +71,16 @@ if (!empty($PAGE->theme->settings->usetableview)) {
$showusetableview = 'tabshow';
}
-// TODO: Fix this hardcoding there are other course formats that peopleuse.
-// Probably changing to an appropriate regex will do.
-if ($mypagetype == 'course-view-topics' || $mypagetype == 'course-view-weeks') {
- // jump to current topic only in course pages
+if (!empty($PAGE->theme->settings->useajax)) {
+ $useajax = $PAGE->theme->settings->useajax;
+} else {
+ $useajax = 'ajaxyes';
+}
+
+
+// Course format
+if ($mylayoutype == 'course') {
+ // Jump to current topic only in course pages.
$jumptocurrent = 'true';
} else {
$jumptocurrent = 'false';
@@ -89,19 +95,10 @@ $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
$hasfooter = (empty($PAGE->layout_options['nofooter']));
$hasmyblocks = $PAGE->blocks->region_has_content('myblocks', $OUTPUT);
-$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
-if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
- $courseheader = $OUTPUT->course_header();
- $coursecontentheader = $OUTPUT->course_content_header();
- if (empty($PAGE->layout_options['nocoursefooter'])) {
- $coursecontentfooter = $OUTPUT->course_content_footer();
- $coursefooter = $OUTPUT->course_footer();
- }
-}
-
$bodyclasses = array();
$bodyclasses[] = (string)$hasithumb;
$bodyclasses[] = (string)$showsitetopic;
+$bodyclasses[] = (string)$useajax;
// add ithumb class to decide whether to show or hide images and site topic
// TODO: Better illustrate preceedence
@@ -124,7 +121,7 @@ echo $OUTPUT->doctype() ?>
-
+
standard_head_html() ?>
@@ -132,16 +129,13 @@ echo $OUTPUT->doctype() ?>
standard_top_of_body_html() ?>
-
class="mymobileheader" data-position="fixed">
+
class="mymobileheader">
heading ?>
login_info();
} ?>
-
-
-
@@ -186,9 +180,7 @@ echo $OUTPUT->doctype() ?>
theme->settings->showmobileintro; ?>
-
main_content(); ?>
-
@@ -225,7 +217,7 @@ echo $OUTPUT->doctype() ?>
-