Skip to content

Commit 116fd5f

Browse files
committed
Merge branch 'master' of https://github.com/jquery/jquery-mobile
2 parents afb7bab + d9ceb85 commit 116fd5f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docs/pages/page-navmodel.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ <h2>Auto-generated pages and sub-hash urls</h2>
8585
<p>So, for example, a page generated by the listview plugin may have a <code>data-url</code> attribute like this: <code>data-url="artists.html&amp;ui-page=listview-1"</code></p>
8686

8787
<p>When a page is requested, jQuery Mobile knows to split the URL at "&amp;ui-page" and make an HTTP request to the portion of the URL before that key. In the case of the listview example mentioned above, the URL would look like this: http://example.com/artists.html&amp;ui-page=listview-1
88-
...and jQuery Mobile would request artists.html, which would then generate its sub-pages, creating the vcode>div</code> with <code>data-url="artists.html&amp;ui-page=listview-1"</code>, which it will then display as the active page.</p>
88+
...and jQuery Mobile would request artists.html, which would then generate its sub-pages, creating the <code>div</code> with <code>data-url="artists.html&amp;ui-page=listview-1"</code>, which it will then display as the active page.</p>
8989

9090
<p><em>Note that the <code>data-url</code> attribute of the element contains the full URL path, not just the portion after &amp;ui-page=. This allows jQuery Mobile to use a single consistent mechanism that matches URLs to page <code>data-url</code> attributes.</em></p>
9191

docs/pages/pages-themes/theme-a.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ <h3>More in this section</h3>
143143
<li><a href="../page-navmodel.html">Ajax, hashes &amp; history</a></li>
144144
<li><a href="../page-dynamic.html">Dynamically Injecting Pages</a></li>
145145
<li><a href="../page-scripting.html">Scripting pages</a></li>
146-
<li data-theme="a"><a href="../pages-themes.html">Theming pages</a></li>
146+
<li data-theme="b"><a href="../pages-themes.html">Theming pages</a></li>
147147
</ul>
148148
</div>
149149
</div>

docs/pages/pages-themes/theme-e.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ <h2>Inset List</h2>
131131

132132
<h3>More in this section</h3>
133133

134-
<ul data-role="listview" data-theme="a" data-dividertheme="a">
134+
<ul data-role="listview" data-theme="e" data-dividertheme="e">
135135
<li data-role="list-divider">Pages &amp; Dialogs</li>
136136
<li><a href="../../page-anatomy.html">Anatomy of a page</a></li>
137137
<li><a href="../../page-template.html" data-ajax="false">Single page template</a></li>

0 commit comments

Comments
 (0)