Merge branch 'master' into fix-4423

Author: Gabriel Schulhof

build/config.js

@@ -101,22 +101,37 @@ module.exports = function( grunt ) {
 	};
 
 	grunt.registerTask( 'test_config', 'glob all the test files', function() {
-		var done = this.async(), test_paths, server_paths = [];
+		var done = this.async(), test_paths, server_paths = [], env = process.env;
 
+
+		// TODO move the glob to a legit config or pull the one from the qunit config
 		test_paths = glob.glob( 'tests/unit/*/' );
 		test_paths = test_paths.concat( glob.glob('tests/unit/**/*-tests.html') );
+
+		// select the proper domain + paths
 		test_paths.forEach( function( file_path ) {
-			var final_path = process.env.ROOT_DOMAIN + file_path;
+			var full_path = env.ROOT_DOMAIN + file_path;
 
 			// if no test path is defined or if the path matches that specified in the env
 			// add it to the config
 			if( !process.env.TEST_PATH || file_path.indexOf(process.env.TEST_PATH) >= 0 ) {
-				server_paths.push( final_path );
+				server_paths.push( full_path );
 			}
 		});
 
-		grunt.config.set( 'qunit', { all: server_paths });
+		// append the jquery version query param where defined
+		var paths_with_jquery = [];
+		if( env.JQUERY ){
+			server_paths.forEach(function( full_path ) {
+				env.JQUERY.split( "," ).forEach( function( version ) {
+					paths_with_jquery.push(full_path + "?jquery=" + version);
+				});
+			});
 
+			server_paths = paths_with_jquery;
+		}
+
+		grunt.config.set( 'qunit', { all: server_paths });
 		done();
 	});
 

build/tasks/qunit/qunit.js

@@ -22,6 +22,9 @@ function sendMessage() {
 	alert(JSON.stringify(args));
 }
 
+sendMessage('console', "" );
+sendMessage('console', "jquery version: " + $.fn.jquery + " pathname: " + location.pathname );
+
 QUnit.log = function(obj) {
 	// What is this I don’t even
 	if (obj.message === '[object Object], undefined:undefined') { return; }

css/structure/jquery.mobile.listview.css

@@ -5,6 +5,9 @@
 .ui-li, .ui-li.ui-field-contain { display: block; margin:0; position: relative; overflow: visible; text-align: left; border-width: 0; border-top-width: 1px; }
 .ui-li .ui-btn-text a.ui-link-inherit { text-overflow: ellipsis; overflow: hidden; white-space: nowrap;  }
 .ui-li-divider, .ui-li-static { padding: .5em 15px; font-size: 14px; font-weight: bold;  }
+/* Fixes #4254 to prevent inherit font-size from .ui-li-divider, .ui-li-static */
+.ui-li-divider .ui-btn-text, .ui-li-static .ui-btn-text { font-size: 16px; }
+.ui-li-divider .ui-mini .ui-btn-text, .ui-li-static .ui-mini .ui-btn-text { font-size: inherit; }
 .ui-li-divider { counter-reset: listnumbering;  }
 ol.ui-listview .ui-link-inherit:before, ol.ui-listview .ui-li-static:before, .ui-li-dec { font-size: .8em; display: inline-block; padding-right: .3em; font-weight: normal;counter-increment: listnumbering; content: counter(listnumbering) ". "; }
 ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid chance of duplication */

docs/api/events.html

@@ -48,17 +48,17 @@ <h2>Touch events</h2>
 			<dt><code>taphold</code></dt>
 			<dd><p>Triggers after a held complete touch event (close to one second).</p>
 			<ul>
-				<li><code>tapholdThreshold</code> (default: 750ms) – This value dictates how long the user must hold their tap before the taphold event is fired on the target element.</li>
+				<li><code>$.event.special.tap.tapholdThreshold</code> (default: 750ms) – This value dictates how long the user must hold their tap before the taphold event is fired on the target element.</li>
 			</ul>
 			</dd>
 
 			<dt><code>swipe</code></dt>
 			<dd><p>Triggers when a horizontal drag of 30px or more (and less than 20px vertically) occurs within 1 second duration but these can be configured:</p>
 			  <ul>
-			  	<li><code>scrollSupressionThreshold</code> (default: 10px) – More than this horizontal displacement, and we will suppress scrolling</li>
-			  	<li><code>durationThreshold</code> (default: 1000ms) – More time than this, and it isn’t a swipe</li>
-			  	<li><code>horizontalDistanceThreshold</code> (default: 30px) – Swipe horizontal displacement must be more than this.</li>
-			  	<li><code>verticalDistanceThreshold</code> (default: 75px) – Swipe vertical displacement must be less than this.</li>
+			  	<li><code>$.event.special.swipe.scrollSupressionThreshold</code> (default: 10px) – More than this horizontal displacement, and we will suppress scrolling.</li>
+			  	<li><code>$.event.special.swipe.durationThreshold</code> (default: 1000ms) – More time than this, and it isn’t a swipe.</li>
+			  	<li><code>$.event.special.swipe.horizontalDistanceThreshold</code> (default: 30px) – Swipe horizontal displacement must be more than this.</li>
+			  	<li><code>$.event.special.swipe.verticalDistanceThreshold</code> (default: 75px) – Swipe vertical displacement must be less than this.</li>
 			  	</ul>
 			</dd>
 
@@ -73,16 +73,19 @@ <h2>Virtual mouse events</h2>
 			<p>We provide a set of "virtual" mouse events that attempt to abstract away mouse and touch events. This allows the developer to register listeners for the basic mouse events, such as mousedown, mousemove, mouseup, and click, and the plugin will take care of registering the correct listeners behind the scenes to invoke the listener at the fastest possible time for that device. In touch environments, the plugin retains the order of event firing that is seen in traditional mouse environments, so for example, vmouseup is always dispatched before vmousedown, and vmousedown before vclick, etc. The virtual mouse events also normalize how coordinate information is extracted from the event, so in touch based environments, coordinates are available from the pageX, pageY, screenX, screenY, clientX, and clientY properties, directly on the event object.</p>
 			<dl>
 				<dt><code>vmouseover</code></dt>
-				<dd>Normalized event for handling touch or  <code>mouseover</code> events</dd>
+				<dd>Normalized event for handling touch or <code>mouseover</code> events</dd>
+
+				<dt><code>vmouseout</code></dt>
+				<dd>Normalized event for handling touch or <code>mouseout</code> events</dd>
 
 				<dt><code>vmousedown</code></dt>
-				<dd>Normalized event for handling touchstart or  <code>mousedown</code> events</dd>
+				<dd>Normalized event for handling touchstart or <code>mousedown</code> events</dd>
 
 				<dt><code>vmousemove</code></dt>
-				<dd>Normalized event for handling touchmove or  <code>mousemove</code> events</dd>
+				<dd>Normalized event for handling touchmove or <code>mousemove</code> events</dd>
 
 				<dt><code>vmouseup</code></dt>
-				<dd>Normalized event for handling touchend or  <code>mouseup</code> events</dd>
+				<dd>Normalized event for handling touchend or <code>mouseup</code> events</dd>
 
 				<dt><code>vclick</code></dt>
 				<dd>Normalized event for handling touchend or mouse <code>click</code> events. On touch devices, this event is dispatched *AFTER* vmouseup. </dd>
@@ -299,7 +302,7 @@ <h2>Page load events</h2>
             	</li>
             	<li><code>errorThrown</code> (null, string, object)
             	  <ul>
-            	    <li>According to the jQuery Core <a href="http://api.jquery.com/jQuery.ajax/">documentation</a>, this property may be an exception object if one occured, or if an HTTP error occured this will be set to the textual portion of the HTTP status. This is what gets passed as the 3rd argument to the framework's $.ajax() error callback.</li>
+            	    <li>According to the jQuery Core <a href="http://api.jquery.com/jQuery.ajax/">documentation</a>, this property may be an exception object if one occurred, or if an HTTP error occurred this will be set to the textual portion of the HTTP status. This is what gets passed as the 3rd argument to the framework's $.ajax() error callback.</li>
           	    </ul>
             	</li>
            	  </ul>
@@ -421,7 +424,7 @@ <h2>Page initialization events</h2>
 
 		<p>Internally, jQuery Mobile auto-initializes plugins based on the markup conventions found in a given "page". For example, an <code>input</code> element with a <code>type</code> of <code>range</code> will automatically generate a custom slider control.</p>
 
-		<p>This auto-initialization is controlled by the "page" plugin, which dispatches events before and after it executes, allowing you to manipulate a page either pre-or-post initialization, or even provide your own intialization behavior and prevent the auto-initializations from occuring. Note that these events will only fire once per "page", as opposed to the show/hide events, which fire every time a page is shown and hidden.</p>
+		<p>This auto-initialization is controlled by the "page" plugin, which dispatches events before and after it executes, allowing you to manipulate a page either pre-or-post initialization, or even provide your own initialization behavior and prevent the auto-initializations from occurring. Note that these events will only fire once per "page", as opposed to the show/hide events, which fire every time a page is shown and hidden.</p>
 
 		<dl>
 			<dt><code>pagebeforecreate</code></dt>

docs/api/methods.html

@@ -184,7 +184,7 @@ <h1>Methods</h1>
 			</dd>
 
 			<dt><code>$.mobile.loading</code> (<em>method</em>)</dt>
-			<dd>Show or hide the page loading message, which is configurable via <code>$.mobile.loader</code> prototype options as described in the <a href="../docs/pages/loader.html">widget docs</a> or can be controlled via a params object.</dd>
+			<dd>Show or hide the page loading message, which is configurable via <code>$.mobile.loader</code> prototype options as described in the <a href="../pages/loader.html">widget docs</a> or can be controlled via a params object.</dd>
 			<dd>
 				<dl>
 					<dt><code>&#183;</code> Object Param Arguments</dt>

docs/lists/docs-lists.html

@@ -106,14 +106,14 @@ <h2>Search filter</h2>
 
 			<a href="lists-search.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Search filter example</a>
 
-      <p>If you want to change the way in which list items are filtered, ie fuzzy search or matching from the beginning of the string, you can configure the callback used internally by defining <code>$.mobile.listview.prototype.options.filterCallback</code> during <code>mobileinit</code> or after the widget has been created with <code>$("#mylist").listview('option', 'filterCallback', yourFilterFunction)</code>. Any function defined for the callback will be provided two arguments. First, the text of the current list item and second, the value being searched for. A truthy value will result in a hidden list item. The default callback which filters entries without the <code>searchValue</code> as a substring is described below:
+      <p>If you want to change the way in which list items are filtered, ie fuzzy search or matching from the beginning of the string, you can configure the callback used internally by defining <code>$.mobile.listview.prototype.options.filterCallback</code> during <code>mobileinit</code> or after the widget has been created with <code>$("#mylist").listview('option', 'filterCallback', yourFilterFunction)</code>. Any function defined for the callback will be provided three arguments. First, the text of the current list item, second the value being searched for, and third the list item being filtered. A truthy value will result in a hidden list item. The default callback which filters entries without the <code>searchValue</code> as a substring is described below:
       </p>
 
-<pre><code>function( text, searchValue ){
-  return text.toLowerCase().indexOf( searchValue ) === -1;
+<pre><code>function( text, searchValue, item ){
+  return text.toString().toLowerCase().indexOf( searchValue ) === -1;
 };</code></pre>
 
-			<p>To filter list items by values other than the text, add a <code>data-filtertext</code> attribute to the list item.  The value of this attribute will be passed as the first argument to the <code>filterCallback</code> function instead of the text.</p>
+			<p>To filter list items by values other than the text, add a <code>data-filtertext</code> attribute to the list item.  The value of this attribute will be passed as the first argument to the <code>filterCallback</code> function instead of the text. Alternately you can use an attribute of our choosing as defined on the list item itself.</p>
 
 			<a href="lists-search-filtertext.html" data-role="button" data-icon="arrow-r" data-iconpos="right">Hidden data filter example</a>
 

docs/pages/loader.html

@@ -107,7 +107,8 @@ <h3>More in this section</h3>
 						<li><a href="page-links.html">Linking pages</a></li>
 						<li><a href="page-transitions.html">Page transitions</a></li>
 						<li data-theme="a"><a href="loader.html">Page loading widget</a></li>
-            <li><a href="page-dialogs.html">Dialogs</a></li>
+            					<li><a href="page-dialogs.html">Dialogs</a></li>
+            					<li><a href="popup/index.html">Popups</a></li>
 						<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
 						<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
 						<li><a href="page-dynamic.html">Dynamically injecting pages</a></li>

docs/pages/page-scripting.html

@@ -113,9 +113,10 @@ <h2>Binding to mouse and touch events</h2>
 
 
 			<h2>Passing parameters between pages</h2>
-			<p>jQuery Mobile does not support query parameter passing to internal/embedded pages. For example, if the framework sees a link to <code>"#somePage?someId=1"</code> it interprets that as "#somePage" and navigates to the internal page div with an <code>id</code> of "somePage" and applies a data-url of "#somePage?someId=1" to that page container. Subsequent calls to other params such as <code>"#somePage?someId=2"<code> will find the same div because jQuery Mobile refers to the data-url on the div which is only set once and will remain at <code>"#somePage?someId=1"</code>.</p>
+			<p>jQuery Mobile does not support query parameter passing to internal/embedded pages. For example, if the framework sees a link to <code>"#somePage?someId=1"</code> it interprets that as <code>"#somePage"</code> and navigates to the internal page div with an <code>id</code> of <code>"somePage"</code> and applies a <code>data-url</code> of <code>"#somePage?someId=1"</code> to that page container. 
+			Subsequent calls to other params such as <code>"#somePage?someId=2"</code> will find the same div because jQuery Mobile refers to the <code>data-url</code> on the <code>div</code> which is only set once and will remain at <code>"#somePage?someId=1"</code>.</p>
 
-			<p>There are two plugins that you can add to your project if query parameters are needed between pages. There is a lightweight <a href="https://github.com/jblas/jquery-mobile-plugins/tree/master/page-params" rel="external">page params plugin</a> and a more fully featured <a href="https://github.com/azicchetti/jquerymobile-router" rel="external">jQuery Mobile router plugin</a> for use with backbone.js or spine.js.</p>
+			<p>There are two plugins that can be added to your project if query parameters are needed between pages. There is a lightweight <a href="https://github.com/jblas/jquery-mobile-plugins/tree/master/page-params" rel="external">page params plugin</a> and a more fully featured <a href="https://github.com/azicchetti/jquerymobile-router" rel="external">jQuery Mobile router plugin</a> for use with backbone.js or spine.js.</p>
 
 
 

docs/pages/popup/index.html

@@ -238,6 +238,7 @@ <h3>More in this section</h3>
 								<li><a href="../page-titles.html">Page titles</a></li>
 								<li><a href="../page-links.html">Linking pages</a></li>
 								<li><a href="../page-transitions.html" data-ajax="false">Page transitions</a></li>
+								<li><a href="../loader.html">Page loading widget</a></li>
 								<li><a href="../page-dialogs.html">Dialogs</a></li>
 								<li data-theme="a"><a href="index.html">Popups</a></li>
 								<li><a href="../page-cache.html">Prefetching &amp; caching pages</a></li>

docs/toolbars/docs-navbar.html

@@ -27,12 +27,25 @@ <h1>Navbar</h1>
 	<h2>Simple navbar</h2>
 
 	<p>jQuery Mobile has a very basic navbar widget that is useful for providing up to 5 buttons with optional icons in a bar, typically within a header or footer. There is also a <a href="footer-persist-a.html">persistent navbar</a> variation that works more like a tab bar that stays fixed as you navigate across pages.</p>
-	<p>A navbar is coded as an unordered list of links wrapped in a container element that has the <code> data-role="navbar"</code> attribute. To set one of the links to the active (selected) state, add <code>class="ui-btn-active"</code> to the anchor. In this example, we have a two-button navbar with the "One" item set to active:</p>
+	<p>A navbar is coded as an unordered list of links wrapped in a container element that has the <code> data-role="navbar"</code> attribute. This is an example of a two-button navbar:</p>
 
 <pre><code>
 <strong>&lt;div data-role=&quot;navbar&quot;&gt;</strong>
 	&lt;ul&gt;
-		&lt;li&gt;&lt;a href=&quot;a.html&quot; class=&quot;ui-btn-active&quot;&gt;One&lt;/a&gt;&lt;/li&gt;
+		&lt;li&gt;&lt;a href=&quot;a.html&quot;&gt;One&lt;/a&gt;&lt;/li&gt;
+		&lt;li&gt;&lt;a href=&quot;b.html&quot;&gt;Two&lt;/a&gt;&lt;/li&gt;
+	&lt;/ul&gt;
+<strong>&lt;/div&gt;&lt;!-- /navbar --&gt;</strong>
+</code></pre>
+
+	<p>When a link in the navbar is clicked it gets the active (selected) state. The <code>ui-btn-active</code> class is first removed from all anchors in the navbar before it is added to the activated link. If this is a link to another page, the class will be removed again after the transition has completed.</p>
+	
+	<p>To set an item to the active state upon initialization of the navbar, add <code>class="ui-btn-active"</code> to the corresponding anchor in your markup. Additionaly add a class of <code>ui-state-persist</code> to make the framework restore the active state each time the page is shown while it exists in the DOM. The example below shows a navbar with item "One" set to active:</p>
+
+<pre><code>
+<strong>&lt;div data-role=&quot;navbar&quot;&gt;</strong>
+	&lt;ul&gt;
+		&lt;li&gt;&lt;a href=&quot;a.html&quot; class=&quot;ui-btn-active ui-state-persist&quot;&gt;One&lt;/a&gt;&lt;/li&gt;
 		&lt;li&gt;&lt;a href=&quot;b.html&quot;&gt;Two&lt;/a&gt;&lt;/li&gt;
 	&lt;/ul&gt;
 <strong>&lt;/div&gt;&lt;!-- /navbar --&gt;</strong>