8000 Merge remote branch 'upstream/master' into beta1 · ghostCoder/jquery-mobile@3d32919 · GitHub
Skip to content

Commit 3d32919

Browse files
asyraf9asyraf9
committed
Merge remote branch 'upstream/master' into beta1
2 parents 1a0159a + 705ed4f commit 3d32919

File tree

73 files changed

+1291
-739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1291
-739
lines changed

‎Makefile‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,26 @@ JSFILES = js/jquery.ui.widget.js \
4646
js/jquery.mobile.core.js \
4747
js/jquery.mobile.navigation.js \
4848
js/jquery.mobile.transition.js \
49-
js/jquery.mobile.fixHeaderFooter.js \
49+
js/jquery.mobile.degradeInputs.js \
50+
js/jquery.mobile.dialog.js \
51+
js/jquery.mobile.page.sections.js \
52+
js/jquery.mobile.collapsible.js \
53+
js/jquery.mobile.fieldContain.js \
54+
js/jquery.mobile.grid.js \
55+
js/jquery.mobile.navbar.js \
56+
js/jquery.mobile.listview.js \
57+
js/jquery.mobile.listview.filter.js \
58+
js/jquery.mobile.nojs.js \
5059
js/jquery.mobile.forms.checkboxradio.js \
60+
js/jquery.mobile.forms.button.js \
61+
js/jquery.mobile.forms.slider.js \
5162
js/jquery.mobile.forms.textinput.js \
5263
js/jquery.mobile.forms.select.js \
5364
js/jquery.mobile.buttonMarkup.js \
54-
js/jquery.mobile.forms.button.js \
55-
js/jquery.mobile.forms.slider.js \
56-
js/jquery.mobile.collapsible.js \
5765
js/jquery.mobile.controlGroup.js \
58-
js/jquery.mobile.fieldContain.js \
59-
js/jquery.mobile.listview.js \
60-
js/jquery.mobile.listview.filter.js \
61-
js/jquery.mobile.dialog.js \
62-
js/jquery.mobile.navbar.js \
63-
js/jquery.mobile.grid.js \
66+
js/jquery.mobile.links.js \
67+
js/jquery.mobile.fixHeaderFooter.js \
68+
js/jquery.mobile.media.classes.js \
6469
js/jquery.mobile.init.js
6570

6671
# The files to include when compiling the CSS files

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ Running the jQuery Mobile demos & docs locally
4040

4141
To preview locally, you'll need to clone a local copy of this repository and point your Apache & PHP webserver at its root directory (a webserver is required, as PHP and .htaccess are used for combining development files).
4242

43-
If you don't currently have a webserver running locally, there are a few options. If you're on a Mac, you can try dropping jQuery Mobile into your sites folder and turning on Web Sharing via System Prefs. From there, you'll find a URL where you can browse folders in your sites directory from a browser.
43+
If you don't currently have a webserver running locally, there are a few options.
44+
45+
If you have python installed (most Linux distributions) and Mac OSX, you use the built-in simple web server. Open a terminal/shell and change to the jQuery Mobile folder then type 'python -m SimpleHTTPServer', and voila you can then browse via http://localhost:8000.
46+
47+
If you're on a Mac, you can try dropping jQuery Mobile into your sites folder and turning on Web Sharing via System Prefs. From there, you'll find a URL where you can browse folders in your sites directory from a browser.
4448

4549
Another quick way to get up and running is to download and install MAMP for Mac OSX. Once installed, just open MAMP, click preferences, go to the Apache tab, and select your local jQuery Mobile folder as the root. Then you can open a browser to http://localhost:8888 to preview the code.
4650

‎build.xml‎

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,38 @@
1919
jquery.mobile.forms.textinput.css,
2020
jquery.mobile.listview.css,
2121
jquery.mobile.forms.slider.css"/>
22-
<property name="js-sources" value="jquery.ui.widget.js,
23-
jquery.mobile.widget.js,
24-
jquery.mobile.media.js,
25-
jquery.mobile.support.js,
26-
jquery.mobile.vmouse.js,
27-
jquery.mobile.event.js,
28-
jquery.mobile.hashchange.js,
29-
jquery.mobile.page.js,
30-
jquery.mobile.core.js,
31-
jquery.mobile.navigation.js,
32-
jquery.mobile.transition.js,
33-
jquery.mobile.fixHeaderFooter.js,
34-
jquery.mobile.forms.checkboxradio.js,
35-
jquery.mobile.forms.textinput.js,
36-
jquery.mobile.forms.select.js,
37-
jquery.mobile.buttonMarkup.js,
38-
jquery.mobile.forms.button.js,
39-
jquery.mobile.forms.slider.js,
40-
jquery.mobile.collapsible.js,
41-
jquery.mobile.controlGroup.js,
42-
jquery.mobile.fieldContain.js,
43-
jquery.mobile.listview.js,
44-
jquery.mobile.listview.filter.js,
45-
jquery.mobile.dialog.js,
46-
jquery.mobile.navbar.js,
47-
jquery.mobile.grid.js,
48-
jquery.mobile.init.js"/>
22+
<property name="js-sources" value="js/jquery.ui.widget.js,
23+
js/jquery.mobile.widget.js,
24+
js/jquery.mobile.media.js,
25+
js/jquery.mobile.support.js,
26+
js/jquery.mobile.vmouse.js,
27+
js/jquery.mobile.event.js,
28+
js/jquery.mobile.hashchange.js,
29+
js/jquery.mobile.page.js,
30+
js/jquery.mobile.core.js,
31+
js/jquery.mobile.navigation.js,
32+
js/jquery.mobile.transition.js,
33+
js/jquery.mobile.degradeInputs.js,
34+
js/jquery.mobile.dialog.js,
35+
js/jquery.mobile.page.sections.js,
36+
js/jquery.mobile.collapsible.js,
37+
js/jquery.mobile.fieldContain.js,
38+
js/jquery.mobile.grid.js,
39+
js/jquery.mobile.navbar.js,
40+
js/jquery.mobile.listview.js,
41+
js/jquery.mobile.listview.filter.js,
42+
js/jquery.mobile.nojs.js,
43+
js/jquery.mobile.forms.checkboxradio.js,
44+
js/jquery.mobile.forms.button.js,
45+
js/jquery.mobile.forms.slider.js,
46+
js/jquery.mobile.forms.textinput.js,
47+
js/jquery.mobile.forms.select.js,
48+
js/jquery.mobile.buttonMarkup.js,
49+
js/jquery.mobile.controlGroup.js,
50+
js/jquery.mobile.links.js,
51+
js/jquery.mobile.fixHeaderFooter.js,
52+
js/jquery.mobile.media.classes.js,
53+
js/jquery.mobile.init.js"/>
4954

5055
<target name="merge">
5156
<antcall target="merge_css" />

‎docs/_assets/css/jqm-docs.css‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@ p.intro strong {
8282
background: #74b042;
8383
color: #fff;
8484
font-weight: bold;
85-
text-shadow: 0 -1px 1px #234403;
86-
background-image: -moz-linear-gradient(top,
87-
#74b042,
88-
#56A00E);
89-
background-image: -webkit-gradient(linear,left top,left bottom,
90-
color-stop(0, #74b042),
91-
color-stop(1, #56A00E));
92-
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#74b042', EndColorStr='#56A00E')";
85+
text-shadow: 0 -1px 1px #234403;
86+
background-image: -webkit-gradient(linear, left top, left bottom, from(#74b042), to(#56A00E)); /* Saf4+, Chrome */
87+
background-image: -webkit-linear-gradient(top, #74b042, #56A00E); /* Chrome 10+, Saf5.1+ */
88+
background-image: -moz-linear-gradient(top, #74b042, #56A00E); /* FF3.6 */
89+
background-image: -ms-linear-gradient(top, #74b042, #56A00E); /* IE10 */
90+
background-image: -o-linear-gradient(top, 62BB #74b042, #56A00E); /* Opera 11.10+ */
91+
background-image: linear-gradient(top, #74b042, #56A00E);
9392
}
9493
.ui-bar-f,
9594
.ui-bar-f .ui-link-inherit {

‎docs/api/globalconfig.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@ <h2>Configurable options</h2>
8282
</p>
8383
</dd>
8484

85+
<dt>autoInitializePage (<em>boolean</em>, default: true):</dt>
86+
<dd>When the DOM is ready, the framework should automatically call <code>$.mobile.initializePage</code>. If false, page will not initialize, and will be visually hidden until until <code>$.mobile.initializePage</code> is manually called.</dd>
87+
8588
<dt>subPageUrlKey (<em>string</em>, default: "ui-page"):</dt>
8689
<dd>The url parameter used for referencing widget-generated sub-pages (such as those generated by nested listviews). Translates to to <em>example.html<strong>&ui-page=</strong>subpageIdentifier</em>. The hash segment before &ui-page= is used by the framework for making an Ajax request to the URL where the sub-page exists.</dd>
8790

88-
<dt>nonHistorySelectors (<em>string</em>, default: "dialog"):</dt>
89-
<dd>Anchor links with a data-rel attribute value, or pages with a data-role value, that match these selectors will not be trackable in history (they won't update the location.hash and won't be bookmarkable).</dd>
90-
91-
9291
<dt>activePageClass (<em>string</em>, default: "ui-page-active"):</dt>
9392
<dd>The class assigned to page currently in view, and during transitions</dd>
9493

‎docs/buttons/buttons-inline.html‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ <h1>Inline buttons</h1>
3333

3434
<a href="index.html" data-role="button" data-inline="true">Button</a>
3535

36-
<p>If you have multiple buttons that should sit side-by-side on the same line, wrap the buttons in a container that has a <code> data-inline="true"</code> attribute. This will style the buttons to be the width of their content and float the buttons so they sit on the same line. </p>
36+
<p>If you have multiple buttons that should sit side-by-side on the same line, add the <code> data-inline="true"</code> attribute to each button. This will style the buttons to be the width of their content and float the buttons so they sit on the same line. </p>
3737

3838
<pre><code>
39-
&lt;div data-inline=&quot;true&quot;&gt;
40-
&lt;a href=&quot;index.html&quot; data-role=&quot;button&quot;&gt;Cancel&lt;/a&gt;
41-
&lt;a href=&quot;index.html&quot; data-role=&quot;button&quot; data-theme=&quot;b&quot;&gt;Save&lt;/a&gt;
42-
&lt;/div&gt;
39+
&lt;a href=&quot;index.html&quot; data-role=&quot;button&quot; data-inline=&quot;true&quot;&gt;Cancel&lt;/a&gt;
40+
&lt;a href=&quot;index.html&quot; data-role=&quot;button&quot; data-inline=&quot;true&quot; data-theme=&quot;b&quot;&gt;Save&lt;/a&gt;
4341
</code></pre>
4442

45-
<p>This creates an inline button set:</p>
43+
<p>The result is this:</p>
4644

4745
<a href="index.html" data-role="button" data-inline="true">Cancel</a>
4846
<a href="index.html" data-role="button" data-theme="b" data-inline="true">Save</a>

‎docs/content/content-grids.html‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h2>Three-column grids</h2>
8080
&lt;div class=&quot;ui-block-a&quot;&gt;Block A&lt;/div&gt;
8181
&lt;div class=&quot;ui-block-b&quot;&gt;Block B&lt;/div&gt;
8282
&lt;div class=&quot;ui-block-c&quot;&gt;Block C&lt;/div&gt;
83-
&lt;/div&gt;&lt;!-- /grid-a --&gt;
83+
&lt;/div&gt;&lt;!-- /grid-b --&gt;
8484
</code></pre>
8585

8686
<p>This will produce a 33/33/33% grid for our content.</p>

‎docs/pages/docs-dialogs.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ <h3>More in this section</h3>
8181
<li data-role="list-divider">Pages &amp; Dialogs</li>
8282
<li><a href="docs-pages.html">Anatomy of a page</a></li>
8383
<li><a href="docs-transitions.html">Page transitions</a></li>
84+
<li><a href="page-template.html" data-ajax="false">Single page template</a></li>
85+
<li><a href="multipage-template.html" data-ajax="false">Multi-page template</a></li>
8486
<li data-theme="a"><a href="docs-dialogs.html">Dialogs</a></li>
8587
<li><a href="docs-navmodel.html">Navigation: Ajax, hashes &amp; history</a></li>
8688
<li><a href="link-formats.html">Link format examples</a></li>

‎docs/pages/docs-links.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ <h3>More in this section</h3>
8585

8686
<li data-role="list-divider">Pages &amp; Dialogs</li>
8787
<li data-theme="a"><a href="docs-pages.html">Anatomy of a page</a></li>
88+
<li><a href="page-template.html" data-ajax="false">Single page template</a></li>
89+
<li><a href="multipage-template.html" data-ajax="false">Multi-page template</a></li>
8890
<li><a href="docs-transitions.html">Page transitions</a></li>
8991
<li><a href="docs-dialogs.html">Dialogs</a></li>
9092
<li><a href="docs-navmodel.html">Navigation: Ajax, hashes &amp; history</a></li>

‎docs/pages/docs-navmodel.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ <h3>More in this section</h3>
107107

108108
<li data-role="list-divider">Pages &amp; Dialogs</li>
109109
<li><a href="docs-pages.html">Anatomy of a page</a></li>
110+
<li><a href="page-template.html" data-ajax="false">Single page template</a></li>
111+
<li><a href="multipage-template.html" data-ajax="false">Multi-page template</a></li>
110112
<li><a href="docs-transitions.html">Page transitions</a></li>
111113
<li><a href="docs-dialogs.html">Dialogs</a></li>
112114
<li data-theme="a"><a href="docs-navmodel.html">Navigation: Ajax, hashes &amp; history</a></li>

0 commit comments

Comments
 (0)