Merge branch 'master' into data-driven-with-fallback

This commit is contained in:
Kin Blas 2011-09-08 13:38:06 -07:00
commit 92699e0011
11 changed files with 21 additions and 10 deletions

View file

@ -34,7 +34,8 @@
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>
</ul>

View file

@ -199,7 +199,8 @@
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -100,7 +100,8 @@ $.mobile.page.prototype.options.domCache = true;
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</a></li>
<li data-theme="a"><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li></li>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -87,7 +87,8 @@
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li data-theme="a"><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery Mobile Docs - Dynamic Pages</title>
<title>jQuery Mobile Docs - Dynamically Injecting Pages</title>
<link rel="stylesheet" href="../../themes/default/" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script src="../../js/jquery.js"></script>
@ -16,7 +16,7 @@
<div data-role="page" class="type-interior">
<div data-role="header" data-theme="f">
<h1>Dynamic Pages</h1>
<h1>Dynamically Injecting Pages</h1>
<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
</div><!-- /header -->
@ -276,7 +276,8 @@ function showCategory( urlObj, options )
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</a></li>
<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
<li data-theme="a"><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li></li>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li data-theme="a"><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -115,7 +115,8 @@
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -123,7 +123,8 @@
<li><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</a></li>
<li><a href="page-cache.html">Prefetching &amp; caching pages</a></li>
<li data-theme="a"><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li></li>
<li data-theme="a"><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -107,6 +107,7 @@ $.mobile.silentScroll(300);
<li><a href="page-dialogs.html">Dialogs</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>
<li data-theme="a"><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -59,6 +59,7 @@
<li><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -68,7 +68,8 @@
<li data-theme="a"><a href="page-transitions.html" data-ajax="false">Page transitions</a></li>
<li><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-navmodel.html">Ajax, hashes &amp; history</a></li>
<li><a href="page-dynamic.html">Dynamically Injecting Pages</a></li>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li><a href="pages-themes.html">Theming pages</a></li>

View file

@ -205,6 +205,7 @@
<li><a href="page-dialogs.html">Dialogs</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>
<li><a href="page-scripting.html">Scripting pages</a></li>
<li data-theme="a"><a href="pages-themes.html">Theming pages</a></li>