Merge remote-tracking branch 'upstream/master' into navigation

Author: gseguin

docs/content/content-grids.html

@@ -80,7 +80,7 @@ <h2>Three-column grids</h2>
 	&lt;div class=&quot;ui-block-a&quot;&gt;Block A&lt;/div&gt;
 	&lt;div class=&quot;ui-block-b&quot;&gt;Block B&lt;/div&gt;
 	&lt;div class=&quot;ui-block-c&quot;&gt;Block C&lt;/div&gt;
-&lt;/div&gt;&lt;!-- /grid-a --&gt;
+&lt;/div&gt;&lt;!-- /grid-b --&gt;
 </code></pre>
 
 		<p>This will produce a 33/33/33% grid for our content.</p>

docs/pages/docs-pages.html

@@ -192,7 +192,7 @@ <h2>Redirects and linking to directories</h2>
 
 		<p>However, you can work around this issue by returning your page div with a <code>data-url</code> attribute already specified. When you do this, jQuery Mobile will use that attribute's value for updating the URL, instead of the url used to request that page. This also allows you to return urls that change as the result of a redirect, for example, you might post a form to "/login.html" but return a page from the url "/account" after a successful submission. This tool allows you to take control of the jQuery Mobile history stack in these situations. Here's an example:</p>
 
-		<p>The following link points to "docs-links-urltest/index.html": <a href="docs-links-urltest/index.html">Test Link</a> which is a directory with an index page. The return page will update the hash as "docs/pages/docs-links-urltest/" with a trailing slash. This is done via the data-url attribute in that page's source. Keep in mind that the value will replace the entire hash, and it is up to you to replace it with a URL that actually resolves to the correct page when requested via refresh or deep link.</p>
+		<p>The following link points to "docs-links-urltest/index.html": <a href="docs-links-urltest/index.html">Test Link</a> which is a directory with an index page. The return page will update the hash as "/docs/pages/docs-links-urltest/" with a trailing slash. This is done via the data-url attribute in that page's source. Keep in mind that the value will replace the entire hash, and it is up to you to replace it with a URL that actually resolves to the correct page when requested via refresh or deep link.</p>
 
 
 		<p>Learn more about the technical details of the navigation model and <a href="docs-navmodel.html">Ajax, hashes and history</a> in jQuery mobile.</p>

js/jquery.mobile.init.js

@@ -73,6 +73,11 @@
 		initializePage: function(){
 			//find present pages
 			var $pages = $( ":jqmData(role='page')" );
+			
+			//if no pages are found, create one with body's inner html
+			if( !$pages.length ){
+				$pages = $( "body" ).wrapInner( "<div data-" + $.mobile.ns + "role='page'></div>" ).children( 0 );
+			}
 
 			//add dialogs, set data-url attrs
 			$pages.add( ":jqmData(role='dialog')" ).each(function(){

js/jquery.mobile.navigation.js

@@ -648,6 +648,9 @@
 							&& RegExp.$1 ) {
 						url = fileUrl = path.getFilePath( RegExp.$1 );
 					}
+					else{
+						
+					}
 
 					if ( base ) {
 						base.set( fileUrl );
@@ -656,6 +659,11 @@
 					//workaround to allow scripts to execute when included in page divs
 					all.get( 0 ).innerHTML = html;
 					page = all.find( ":jqmData(role='page'), :jqmData(role='dialog')" ).first();
+					
+					//if page elem couldn't be found, create one and insert the body element's contents
+					if( !page.length ){
+						page = $( "<div data-" + $.mobile.ns + "role='page'>" + html.split( /<\/?body[^>]*>/gmi )[1] + "</div>" );
+					}
 
 					if ( newPageTitle && !page.jqmData( "title" ) ) {
 						page.jqmData( "title", newPageTitle );

tests/unit/init/init_core.js

@@ -211,6 +211,19 @@
 				start();
 			}, 500);
 		});
+
+		
+		asyncTest( "page element is generated when not present in ajax'd markup", function(){
+			expect( 1 );
+			$.mobile.changePage( "nopage.html" );
+			
+			$( ":jqmData(url$='nopage.html')" ).live( "pagecreate", function(){
+					ok(true, "page was created from dynamically loaded HTML that contained no page div" );
+					start();
+			} );
+		});
+		
+		
 
 	});
 })(jQuery);

tests/unit/init/init_core_nopage.js

@@ -0,0 +1,12 @@
+/*
+ * mobile init tests
+ */
+(function($){
+
+		
+		test( "page element is generated when not present in initial markup", function(){
+			ok( $( ".ui-page" ).length, 1 );
+		});
+
+
+})(jQuery);

tests/unit/init/nopage.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8" />
+	<title>jQuery Mobile Init Test Suite</title>
+	<!-- meta viewport left out on purpose for test append -->
+	<script src="../../../js/jquery.js"></script>
+	<script src="../jquery.setNameSpace.js"></script>
+	<script src="../../../js/"></script>
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.testHelper.js"></script>
+	<script src="init_core_nopage.js"></script>
+	<link rel="stylesheet"  href="../../../themes/default" />
+	<link rel="stylesheet" href="../../../external/qunit.css"/>
+	<style>
+	[data-nstest-role="page"], [data-nstest-role="dialog"] {
+	position: static !important;
+	}
+	</style>
+</head>
+
+<h1 id="qunit-header">jQuery Mobile Init Test Suite</h1>
+<h2 id="qunit-banner"></h2>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests">
+</ol>
+
+</body>
+</html>