Toolbar and navigation: Update fixed persistent optimized demo

Gabriel Schulhof · Gabriel Schulhof · commit 2d6ebd6fc104 · 2014-05-26T13:37:28.000+03:00
diff --git a/demos/navigation-ajax-external-widgets/index.php b/demos/navigation-ajax-external-widgets/index.php
@@ -11,7 +11,6 @@
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
-  <script type="text/javascript" src="demo.js"></script>
 </head>
 <body>
 <div data-role="page" class="jqm-demos" data-quicklinks="true">
@@ -25,107 +24,8 @@
 
     <div role="main" class="ui-content jqm-content">
 		<h1>Ajax Navigation And External Widgets</h1>
-		<p>When Ajax navigation is used in combination with the pushState plugin, the location bar is updated to show the URL of the file that has been loaded via Ajax. This implies that the user may copy that URL and launch your application with a starting URL that is different from the one you had intended. For example, if your application contains two documents, <code>products.html</code> and <code>services.html</code> and if the pages inside the documents contain links to one another, then both documents must be equipped to handle your application's startup. This means that you have to copy script references into the <code>&lt;head&gt;</code> section of each document, and you must also copy external shared widgets (widgets that are not inside the page, but which are seen and/or used from both pages) to the <code>&lt;body&gt;</code> section of both documents.</p>
-		<p><a href="products.html" data-ajax="false" class="ui-btn ui-corner-all ui-shadow ui-btn-inline">Open external widgets demo</a></p>
-		<p>The code snippets below illustrate this structure.</p>
-		<p>init.js:</p>
-<pre><code>
-<strong>// Wait for DOMready and instantiate common external widgets that the framework will not
-// autoinitialize because they are located outside of a jQuery Mobile page. This script
-// must be referenced from all documents containing your application's pages.</strong>
-$( function() {
-	$( &quot;#common-header&quot; ).toolbar();
-	$( &quot;#nav-menu&quot; )
-		.children()
-			.listview()
-		.end()
-		.popup();
-});
-</code></pre>
-		<p>products.html:</p>
-<pre><code>
-&lt;!doctype html&gt;
-&lt;html&gt;
-&lt;head&gt;
-	&lt;title&gt;Products&lt;/title&gt;
-
-	<strong>&lt;!-- References to the scripts and stylesheets required for application startup must appear in all
-	     documents containing your application's pages, because any one of them can become the start page --&gt;</strong>
-	&lt;meta charset=&quot;utf-8&quot;&gt;
-	&lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1&quot;&gt;
-	&lt;link rel=&quot;stylesheet&quot; href=&quot;http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.css&quot;/&gt;
-	&lt;script src=&quot;http://code.jquery.com/jquery-1.10.2.js&quot;&gt;&lt;/script&gt;
-	&lt;script src=&quot;http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.js&quot;&gt;&lt;/script&gt;
-	<strong>&lt;script src=&quot;init.js&quot;&gt;&lt;/script&gt;</strong>
-&lt;/head&gt;
-&lt;body&gt;
-
-	<strong>&lt;!-- The header and the popup must be copied verbatim into each document that can serve as
-	     the start page. They must also be themed explicitly because they do not inherit their
-	     theme swatches from the page, since they are not contained inside a page. --&gt;</strong>
-	&lt;div data-role=&quot;header&quot; id=&quot;common-header&quot; data-theme=&quot;a&quot;&gt;
-		&lt;h1&gt;Welcome to International Widgets, Inc.&lt;/h1&gt;
-		&lt;a href=&quot;#nav-menu&quot; data-rel=&quot;popup&quot; class=&quot;ui-btn ui-icon-grid ui-btn-icon-notext ui-btn-right ui-corner-all&quot;&gt;Navigate our site&lt;/a&gt;
-	&lt;/div&gt;
-
-	&lt;div data-role=&quot;popup&quot; id=&quot;nav-menu&quot; data-theme=&quot;a&quot;&gt;
-		&lt;ul data-role=&quot;listview&quot;&gt;
-			&lt;li&gt;&lt;a href=&quot;products.html&quot;&gt;Products&lt;/a&gt;&lt;/li&gt;
-			&lt;li&gt;&lt;a href=&quot;services.html&quot;&gt;Services&lt;/a&gt;&lt;/li&gt;
-		&lt;/ul&gt;
-	&lt;/div&gt;
-
-	&lt;div data-role=&quot;page&quot; id=&quot;products&quot;&gt;
-		&lt;div class=&quot;ui-content&quot;&gt;
-			&lt;h1&gt;Products&lt;/h1&gt;
-			&lt;p&gt;We offer a wide range of products designed to suit your specific needs.&lt;/p&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</code></pre>
-		<p>services.html:</p>
-<pre><code>
-&lt;!doctype html&gt;
-&lt;html&gt;
-&lt;head&gt;
-	&lt;title&gt;Services&lt;/title&gt;
-
-	<strong>&lt;!-- References to the scripts and stylesheets required for application startup must appear in all
-	     documents containing your application's pages, because any one of them can become the start page --&gt;</strong>
-	&lt;meta charset=&quot;utf-8&quot;&gt;
-	&lt;meta name=&quot;viewport&quot; content=&quot;width=device-width, initial-scale=1&quot;&gt;
-	&lt;link rel=&quot;stylesheet&quot; href=&quot;http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.css&quot;/&gt;
-	&lt;script src=&quot;http://code.jquery.com/jquery-1.10.2.js&quot;&gt;&lt;/script&gt;
-	&lt;script src=&quot;http://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.js&quot;&gt;&lt;/script&gt;
-	<strong>&lt;script src=&quot;init.js&quot;&gt;&lt;/script&gt;</strong>
-&lt;/head&gt;
-&lt;body&gt;
-
-	<strong>&lt;!-- The header and the popup must be copied verbatim into each document that can serve as
-	     the start page. They must also be themed explicitly because they do not inherit their
-	     theme swatches from the page, since they are not contained inside a page. --&gt;</strong>
-	&lt;div data-role=&quot;header&quot; id=&quot;common-header&quot; data-theme=&quot;a&quot;&gt;
-		&lt;h1&gt;Welcome to International Widgets, Inc.&lt;/h1&gt;
-		&lt;a href=&quot;#nav-menu&quot; data-rel=&quot;popup&quot; class=&quot;ui-btn ui-icon-grid ui-btn-icon-notext ui-btn-right ui-corner-all&quot;&gt;Navigate our site&lt;/a&gt;
-	&lt;/div&gt;
-
-	&lt;div data-role=&quot;popup&quot; id=&quot;nav-menu&quot; data-theme=&quot;a&quot;&gt;
-		&lt;ul data-role=&quot;listview&quot;&gt;
-			&lt;li&gt;&lt;a href=&quot;products.html&quot;&gt;Products&lt;/a&gt;&lt;/li&gt;
-			&lt;li&gt;&lt;a href=&quot;services.html&quot;&gt;Services&lt;/a&gt;&lt;/li&gt;
-		&lt;/ul&gt;
-	&lt;/div&gt;
-
-	&lt;div data-role=&quot;page&quot; id=&quot;products&quot;&gt;
-		&lt;div class=&quot;ui-content&quot;&gt;
-			&lt;h1&gt;Services&lt;/h1&gt;
-			&lt;p&gt;Allow our experts to design and deliver the solutions you need.&lt;/p&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</code></pre>
+		<p>When Ajax navigation is used in combination with the pushState plugin, the location bar is updated to show the URL of the file that has been loaded via Ajax. This implies that the user may copy that URL and launch your application with a starting URL that is different from the one you had intended. For example, if your application contains two or more documents and if the pages inside the documents contain links to one another, then both documents must be equipped to handle your application's startup. This means that you have to copy script references into the <code>&lt;head&gt;</code> section of each document, and you must also copy external shared widgets (widgets that are not inside the page, but which are seen and/or used from both pages) to the <code>&lt;body&gt;</code> section of both documents.</p>
+		<p>The <a href="../toolbar-fixed-persistent-optimized/" data-ajax="false">fixed persistent optimized toolbar demo</a> illustrates the structure necessary for maintaining shared widgets across multiple pages linked via Ajax.</p>
 	</div><!-- /content -->
 
 	<?php include( '../jqm-navmenu.php' ); ?>
diff --git a/demos/toolbar-fixed-persistent-optimized/index.php b/demos/toolbar-fixed-persistent-optimized/index.php
@@ -12,16 +12,23 @@
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
-	<script>
-		$(function(){
-			$("[data-role='navbar']").navbar();
-			$("[data-role='header'], [data-role='footer']").toolbar();
-		});
-	</script>
+	<script id="shared-widget-init" src="shared-widget-init.js"></script>
 </head>
 <body>
-    <div data-role="header" data-position="fixed" data-theme="a">
+    <div id="shared-header" data-role="header" data-position="fixed" data-theme="a">
+		<!-- Shared header markup must be added to all pages of the demo to ensure any of them can
+		     serve as the start page. The server can be instructed to omit sending this portion of
+			 the data whenever the request for the document is made via Ajax. -->
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
+		<a href="#nav-menu" data-rel="popup" class="ui-btn ui-btn-right ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-right ui-icon-navigation">Navigation</a>
+		<div data-role="popup" id="nav-menu" data-theme="a">
+			<ul id="nav-menu-links">
+				<li><a href="index.php" data-prefetch="true" data-transition="none">Info</a></li>
+				<li><a href="page-b.php" data-prefetch="true" data-transition="flip">Friends</a></li>
+				<li><a href="page-c.php" data-prefetch="true" data-transition="turn">Albums</a></li>
+				<li><a href="page-d.php" data-prefetch="true" data-transition="slide">Emails</a></li>
+			</ul>
+		</div>
         <h1>Fixed external header</h1>
     </div><!-- /header -->
 <?php } ?>
@@ -41,12 +48,19 @@
 
 			<p>All of the markup not needed when being requested via Ajax is wrapped in if statements like the one above.</p>
 
+		<h2>Shared scripts and widgets</h2>
+		<p>Any one of the pages in this demo must be able to serve as the start page for your application. Thus, when accessed via plain HTTP, the server will return the full page, including references to jQuery and jQuery Mobile, as well as custom scripts which ensure that widgets shared by all the pages in the application are initialized at startup, no matter which page the user chooses as their start page.</p>
+		<div data-demo-html="#shared-header,#shared-navbar" data-demo-js="#shared-widget-init"></div>
+
 		</div><!-- /content -->
 
 	</div><!-- /page -->
 
 <?php if (!isset($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest') { ?>
-	<div data-role="footer" data-position="fixed" data-theme="a">
+	<div id="shared-navbar" data-role="footer" data-position="fixed" data-theme="a">
+		<!-- Shared navbar markup must be added to all pages of the demo to ensure any of them can
+		     serve as the start page. The server can be instructed to omit sending this portion of
+			 the data whenever the request for the document is made via Ajax. -->
 		<div data-role="navbar">
 			<ul>
 				<li><a href="index.php" data-prefetch="true" data-transition="none">Info</a></li>
diff --git a/demos/toolbar-fixed-persistent-optimized/page-b.php b/demos/toolbar-fixed-persistent-optimized/page-b.php
@@ -12,16 +12,20 @@
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
-	<script>
-		$(function(){
-			$("[data-role='navbar']").navbar();
-			$("[data-role='header'], [data-role='footer']").toolbar();
-		});
-	</script>
+	<script src="shared-widget-init.js"></script>
 </head>
 <body>
     <div data-role="header" data-position="fixed" data-theme="a">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
+		<a href="#nav-menu" data-rel="popup" class="ui-btn ui-btn-right ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-right ui-icon-navigation">Navigation</a>
+		<div data-role="popup" id="nav-menu" data-theme="a">
+			<ul id="nav-menu-links">
+				<li><a href="index.php" data-prefetch="true" data-transition="none">Info</a></li>
+				<li><a href="page-b.php" data-prefetch="true" data-transition="flip">Friends</a></li>
+				<li><a href="page-c.php" data-prefetch="true" data-transition="turn">Albums</a></li>
+				<li><a href="page-d.php" data-prefetch="true" data-transition="slide">Emails</a></li>
+			</ul>
+		</div>
         <h1>Fixed external header</h1>
     </div><!-- /header -->
 <?php } ?>
diff --git a/demos/toolbar-fixed-persistent-optimized/page-c.php b/demos/toolbar-fixed-persistent-optimized/page-c.php
@@ -12,16 +12,20 @@
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
-	<script>
-		$(function(){
-			$("[data-role='navbar']").navbar();
-			$("[data-role='header'], [data-role='footer']").toolbar();
-		});
-	</script>
+	<script src="shared-widget-init.js"></script>
 </head>
 <body>
     <div data-role="header" data-position="fixed" data-theme="a">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
+		<a href="#nav-menu" data-rel="popup" class="ui-btn ui-btn-right ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-right ui-icon-navigation">Navigation</a>
+		<div data-role="popup" id="nav-menu" data-theme="a">
+			<ul id="nav-menu-links">
+				<li><a href="index.php" data-prefetch="true" data-transition="none">Info</a></li>
+				<li><a href="page-b.php" data-prefetch="true" data-transition="flip">Friends</a></li>
+				<li><a href="page-c.php" data-prefetch="true" data-transition="turn">Albums</a></li>
+				<li><a href="page-d.php" data-prefetch="true" data-transition="slide">Emails</a></li>
+			</ul>
+		</div>
         <h1>Fixed external header</h1>
     </div><!-- /header -->
 <?php } ?>
diff --git a/demos/toolbar-fixed-persistent-optimized/page-d.php b/demos/toolbar-fixed-persistent-optimized/page-d.php
@@ -12,16 +12,20 @@
 	<script src="../../external/jquery/jquery.js"></script>
 	<script src="../_assets/js/"></script>
 	<script src="../../js/"></script>
-	<script>
-		$(function(){
-			$("[data-role='navbar']").navbar();
-			$("[data-role='header'], [data-role='footer']").toolbar();
-		});
-	</script>
+	<script src="shared-widget-init.js"></script>
 </head>
 <body>
     <div data-role="header" data-position="fixed" data-theme="a">
 		<a href="../toolbar/" data-rel="back" class="ui-btn ui-btn-left ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-notext ui-icon-carat-l">Back</a>
+		<a href="#nav-menu" data-rel="popup" class="ui-btn ui-btn-right ui-alt-icon ui-nodisc-icon ui-corner-all ui-btn-icon-right ui-icon-navigation">Navigation</a>
+		<div data-role="popup" id="nav-menu" data-theme="a">
+			<ul id="nav-menu-links">
+				<li><a href="index.php" data-prefetch="true" data-transition="none">Info</a></li>
+				<li><a href="page-b.php" data-prefetch="true" data-transition="flip">Friends</a></li>
+				<li><a href="page-c.php" data-prefetch="true" data-transition="turn">Albums</a></li>
+				<li><a href="page-d.php" data-prefetch="true" data-transition="slide">Emails</a></li>
+			</ul>
+		</div>
         <h1>Fixed external header</h1>
     </div><!-- /header -->
 <?php } ?>
diff --git a/demos/toolbar-fixed-persistent-optimized/shared-widget-init.js b/demos/toolbar-fixed-persistent-optimized/shared-widget-init.js
@@ -0,0 +1,11 @@
+/* You can place the code for initializing widgets that are shared by the various pages of yout
+   application and which reside outside your application's jQuery Mobile pages into an external
+   script which you can then reference from all your application's pages. This way, no matter which
+   page ends up being your application's startup page, the shared widgets will always be functional
+   and correctly enhanced. */
+$( function() {
+	$( "[data-role='navbar']" ).navbar();
+	$( "[data-role='header'], [data-role='footer']" ).toolbar();
+	$( "#nav-menu" ).popup();
+	$( "#nav-menu-links" ).listview();
+});
