Skip to content

Commit b1fa291

Browse files
committed
Merge branch 'master' into grunt
2 parents dbdd2b6 + 668b5c5 commit b1fa291

Some content is hidden

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

47 files changed

+569
-288
lines changed

css/structure/jquery.mobile.button.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
/*btn icon positioning*/
4444
.ui-btn-icon-notext .ui-icon { display: block; z-index: 0;}
45-
.ui-btn-icon-left .ui-btn-inner .ui-icon, .ui-btn-icon-right .ui-btn-inner .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
45+
.ui-btn-icon-left > .ui-btn-inner > .ui-icon, .ui-btn-icon-right > .ui-btn-inner > .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
4646
.ui-btn-icon-top .ui-btn-inner .ui-icon, .ui-btn-icon-bottom .ui-btn-inner .ui-icon { position: absolute; left: 50%; margin-left: -9px; }
4747
.ui-btn-icon-left .ui-icon { left: 10px; }
4848
.ui-btn-icon-right .ui-icon { right: 10px; }

css/structure/jquery.mobile.forms.checkboxradio.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@
2121
.ui-checkbox .ui-mini.ui-btn-icon-right .ui-icon, .ui-radio .ui-mini.ui-btn-icon-right .ui-icon { right: 9px; }
2222

2323
/* input, label positioning */
24-
.ui-checkbox input,.ui-radio input { position:absolute; left:20px; top:50%; width: 10px; height: 10px; margin:-5px 0 0 0; outline: 0 !important; z-index: 1; }
24+
.ui-checkbox input,.ui-radio input { position:absolute; left:20px; top:50%; width: 10px; height: 10px; margin:-5px 0 0 0; outline: 0 !important; z-index: 1; }
25+
.ui-checkbox label,.ui-radio label { -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; }

css/structure/jquery.mobile.forms.select.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@-moz-document url-prefix() {.ui-select .ui-btn select { opacity: 0.0001; }}
1010
.ui-select .ui-btn select.ui-select-nativeonly { opacity: 1; text-indent: 0; }
1111

12-
.ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }
12+
.ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 45px; }
1313
.ui-select .ui-btn-icon-right .ui-icon { right: 15px; }
1414
.ui-select .ui-mini.ui-btn-icon-right .ui-icon { right: 7px; }
1515

@@ -21,6 +21,7 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margi
2121
.ui-select .ui-btn-text, .ui-selectmenu .ui-btn-text { display: block; min-height: 1em; overflow: hidden !important;
2222
/* This !important is required for iPad Safari specifically. See https://github.com/jquery/jquery-mobile/issues/2647 */ }
2323
.ui-select .ui-btn-text { text-overflow: ellipsis; }
24+
.ui-select .ui-btn-text span { display: inline-block; }
2425

2526
.ui-selectmenu { position: absolute; padding: 0; z-index: 1100 !important; width: 80%; max-width: 350px; padding: 6px; }
2627
.ui-selectmenu .ui-listview { margin: 0; }
@@ -32,10 +33,10 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margi
3233
.ui-li.ui-selectmenu-placeholder { display: none; }
3334
.ui-selectmenu .ui-header .ui-title { margin: 0.6em 46px 0.8em; }
3435

35-
@media all and (min-width: 450px){
36+
@media all and (min-width: 450px){
3637
.ui-field-contain label.ui-select { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
3738
.ui-field-contain .ui-select { width: 60%; display: inline-block; }
38-
}
39+
}
3940

4041
/* when no placeholder is defined in a multiple select, the header height doesn't even extend past the close button. this shim's content in there */
41-
.ui-selectmenu .ui-header h1:after { content: '.'; visibility: hidden; }
42+
.ui-selectmenu .ui-header h1:after { content: '.'; visibility: hidden; }

css/structure/jquery.mobile.listview.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
2323
.ui-li-thumb, .ui-listview .ui-li-icon { position: absolute; left: 1px; top: 0; max-height: 80px; max-width: 80px; }
2424
.ui-listview .ui-li-icon { max-height: 40px; max-width: 40px; left: 10px; top: .9em; }
2525
.ui-li-thumb, .ui-listview .ui-li-icon, .ui-li-content { float: left; margin-right: 10px; }
26-
2726
.ui-li-aside { float: right; width: 50%; text-align: right; margin: .3em 0; }
2827
@media all and (min-width: 480px){
2928
.ui-li-aside { width: 45%; }
@@ -37,6 +36,7 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
3736
.ui-li-link-alt .ui-btn { overflow: hidden; position: absolute; right: 8px; top: 50%; margin: -11px 0 0 0; border-bottom-width: 1px; z-index: -1;}
3837
.ui-li-link-alt .ui-btn-inner { padding: 0; height: 100%; position: absolute; width: 100%; top: 0; left: 0;}
3938
.ui-li-link-alt .ui-btn .ui-icon { right: 50%; margin-right: -9px; }
39+
.ui-li-link-alt .ui-btn-icon-notext .ui-btn-inner .ui-icon { position: absolute; top: 50%; margin-top: -9px; }
4040

4141
.ui-listview * .ui-btn-inner > .ui-btn > .ui-btn-inner { border-top: 0px; }
4242

@@ -48,4 +48,4 @@ ol.ui-listview .ui-li-jsnumbering:before { content: "" !important; } /* to avoid
4848
/* Odd iPad positioning issue. */
4949
@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
5050
.ui-li .ui-btn-text { overflow: visible; }
51-
}
51+
}

docs/api/data-attributes.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,10 @@ <h2><a href="../toolbars/docs-footers.html">Footer</a></h2>
292292
<h2><a href="../toolbars/docs-headers.html">Header</a></h2>
293293
<p>Container with <code>data-role="header"</code></p>
294294
<table>
295+
<tr>
296+
<th>data-id</th>
297+
<td>string (unique id, useful in persistent headers)</td>
298+
</tr>
295299
<tr>
296300
<th>data-position</th>
297301
<td>fixed</td>
@@ -340,6 +344,10 @@ <h2><a href="../pages/page-links.html">Link</a></h2>
340344
<h2><a href="../lists/docs-lists.html">Listview</a></h2>
341345
<p>OL or UL with <code>data-role="listview"</code></p>
342346
<table>
347+
<tr>
348+
<th>data-autodividers</th>
349+
<td>true | <strong>false</strong></td>
350+
</tr>
343351
<tr>
344352
<th>data-count-theme</th>
345353
<td>swatch letter (a-z)</td>
@@ -450,6 +458,10 @@ <h2><a href="../pages/page-anatomy.html">Page</a></h2>
450458
<th>data-title</th>
451459
<td>string (title used when page is shown)</td>
452460
</tr>
461+
<tr>
462+
<th>data-url</th>
463+
<td>url (value for updating the URL, instead of the url used to request the page)</td>
464+
</tr>
453465
</table>
454466

455467
<h2><a href="../forms/radiobuttons/">Radio button</a></h2>

docs/api/events.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ <h4 style="margin:.5em 0">Important: <code>$(document).bind('pagecreate')</code>
4242
<h2>Touch events</h2>
4343
<dl>
4444
<dt><code>tap</code></dt>
45-
<dd>Triggers after a quick, complete touch event.</dd>
45+
<dd><p>Triggers after a quick, complete touch event.</p>
46+
<ul>
47+
<li><code>tapholdThreshold</code> (default: 750ms) – This value dictates how long the user must hold their tap before the taphold event is fired on the target element.</li>
48+
</ul>
49+
</dd>
4650

4751
<dt><code>taphold</code></dt>
4852
<dd>Triggers after a held complete touch event (close to one second).</dd>
@@ -100,7 +104,7 @@ <h4 style="margin:.5em 0">Canceling an elements default click behavior</h4>
100104
<h2>Orientation change event</h2>
101105
<dl>
102106
<dt><code>orientationchange</code></dt>
103-
<dd>Triggers when a device orientation changes (by turning it vertically or horizontally). When bound to this event, your callback function can leverage a second argument, which contains an <code>orientation</code> property equal to either "portrait" or "landscape". These values are also added as classes to the HTML element, allowing you to leverage them in your CSS selectors. Note that we currently bind to the resize event when <code>orientationchange</code> is not natively supported, or when <code>$.mobile.orientationChangeEnabled</code> is set to false.</dd>
107+
<dd>Triggers when a device orientation changes (by turning it vertically or horizontally). When bound to this event, your callback function can leverage a second argument, which contains an <code>orientation</code> property equal to either "portrait" or "landscape". Note that we currently bind to the resize event when <code>orientationchange</code> is not natively supported, or when <code>$.mobile.orientationChangeEnabled</code> is set to false.</dd>
104108
<div class="ui-body ui-body-e">
105109
<h4>orientationchange timing</h4>
106110

docs/api/globalconfig.html

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,22 @@ <h2>Configurable options</h2>
113113
<dd>jQuery Mobile will automatically bind the clicks on anchor tags in your document. Setting this options to false will prevent all anchor click handling <em>including</em> the addition of active button state and alternate link bluring. This should only be used when attempting to delegate the click management to another library or custom code.</dd>
114114

115115
<dt><code>loadingMessage</code> <em>string</em>, default: "loading"</dt>
116-
<dd>Set the text that appears when a page is loading. If set to false, the message will not appear at all.</dd>
116+
<dd>
117+
Set the text that appears when a page is loading. If set to false, the message will not appear at all.
118+
<p class="ui-bar-e">Deprecated in 1.2 - use <code>$.mobile.loader.prototype.options.text</code> instead. See the <a href="../../docs/pages/loader.html">loader docs</a> for more.</p>
119+
</dd>
117120

118121
<dt><code>loadingMessageTextVisible</code> <em>boolean</em>, default: false</dt>
119-
<dd>Whether the text should be visible when a loading message is shown. The text is always visible for loading errors.</dd>
122+
<dd>
123+
Whether the text should be visible when a loading message is shown. The text is always visible for loading errors.
124+
<p class="ui-bar-e">Deprecated in 1.2 - use <code>$.mobile.loader.prototype.options.textVisible</code> instead. See the <a href="../../docs/pages/loader.html">loader docs</a> for more.</p>
125+
</dd>
120126

121127
<dt><code>loadingMessageTheme</code> <em>string</em>, default: "a"</dt>
122-
<dd>The theme that the loading message box uses when text is visible.</dd>
128+
<dd>
129+
The theme that the loading message box uses when text is visible.
130+
<p class="ui-bar-e">Deprecated in 1.2 - use <code>$.mobile.loader.prototype.options.theme</code> instead. See the <a href="../../docs/pages/loader.html">loader docs</a> for more.</p>
131+
</dd>
123132

124133
<dt><code>minScrollBack</code> <em>string</em>, default: 250</dt>
125134
<dd>Minimum scroll distance that will be remembered when returning to a page.</dd>

docs/api/methods.html

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ <h1>Methods</h1>
8585
<strong>//transition to the "about us" page with a slideup transition</strong>
8686
$.mobile.changePage( "about/us.html", { transition: "slideup"} );
8787

88-
<strong>//transition to the "search results" page, using data from a form with an ID of "search"" </strong>
88+
<strong>//transition to the "search results" page, using data from a form with an ID of "search"</strong>
8989
$.mobile.changePage( "searchresults.php", {
9090
type: "post",
9191
data: $("form#search").serialize()
@@ -183,8 +183,35 @@ <h1>Methods</h1>
183183
</dl>
184184
</dd>
185185

186+
<dt><code>$.mobile.loading</code> (<em>method</em>)</dt>
187+
<dd>Show or hide the page loading message, which is configurable via <code>$.mobile.loader</code> prototype options as described in the <a href="../docs/pages/loader.html">widget docs</a> or can be controlled via a params object.</dd>
188+
<dd>
189+
<dl>
190+
<dt><code>&#183;</code> Object Param Arguments</dt>
191+
<dd><code>theme</code> (<em>string</em>, default: "a") The theme swatch for the message.</dd>
192+
<dd><code>text</code> (<em>string</em>, default: "loading") The text of the message.</dd>
193+
<dd><code>textonly</code> (<em>boolean</em>, default: false) If true, the "spinner" image will be hidden when the message is shown.</dd>
194+
<dd><code>textVisible</code> (<em>boolean</em>, default: false) If true, the text value will be used under the spinner.</dd>
195+
<dd><code>html</code> (<em>boolean</em>, default: "") If this is set to a non empty string value it will be used to replace the entirety of the loader's inner html</dd>
196+
</dl>
197+
</dd>
198+
<dd>Examples:
199+
<pre>
200+
<code>
201+
<strong>//cue the page loader</strong>
202+
$.mobile.loading( 'show' );
203+
204+
<strong>//use theme swatch "b", a custom message, and no spinner</strong>
205+
$.mobile.loading( 'show', { theme: "b", text: "foo", textonly: true });
206+
</code>
207+
</pre>
208+
209+
</dd>
210+
186211
<dt><code>$.mobile.showPageLoadingMsg</code> (<em>method</em>)</dt>
187-
<dd>Show the page loading message, which is configurable via $.mobile.loadingMessage.</dd>
212+
<dd>
213+
<p class="ui-bar-e">Deprecated in 1.2 - use <code>$.mobile.loading( 'show' )</code> instead, see examples above</p>
214+
Show the page loading message, which is configurable via $.mobile.loadingMessage.</dd>
188215
<dd>
189216
<dl>
190217
<dt><code>&#183;</code> Arguments</dt>
@@ -209,9 +236,13 @@ <h1>Methods</h1>
209236

210237

211238

239+
212240
<dt><code>$.mobile.hidePageLoadingMsg</code> (<em>method</em>)</dt>
213-
<dd>Hide the page loading message, which is configurable via $.mobile.loadingMessage.</dd>
241+
<dd>
242+
<p class="ui-bar-e">Deprecated in 1.2 - use <code>$.mobile.loading( 'hide' )</code> instead, see examples above</p>
243+
Hide the page loading message, which is configurable via $.mobile.loadingMessage.
214244

245+
</dd>
215246
<dd>Example:
216247
<pre>
217248
<code>

docs/buttons/buttons-types.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ <h2>Form buttons</h2>
7171
$('[type='submit']').button();
7272
</code>
7373

74-
<p>To preserve events bound to the original <code>button</code> or <code>input</code>, the framework hides the original element by making it transparent and positioning it over the new button markup. When a user clicks on the the custom-styled button, they're actually clicking on the original element. To prevent a form button from being converted into an enhanced button, add the <code>data-role="none"</code> attribute and hte native control will be rendered.</p>
74+
<p>To preserve events bound to the original <code>button</code> or <code>input</code>, the framework hides the original element by making it transparent and positioning it over the new button markup. When a user clicks on the the custom-styled button, they're actually clicking on the original element. To prevent a form button from being converted into an enhanced button, add the <code>data-role="none"</code> attribute and the native control will be rendered.</p>
7575

7676
<p><strong>Button</strong> based button:</p>
7777
<button>Button element</button>

docs/content/content-collapsible.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ <h3>I have custom icons</h3>
9393
</div>
9494

9595
<h2>Icon positioning</h2>
96-
<p>Collapsible headings’ default icon positioing can be overridden by using the <code>data-iconpos</code> attribute. In the below case, <code>data-iconpos="right"</code>.</p>
96+
<p>Collapsible headings’ default icon positioning can be overridden by using the <code>data-iconpos</code> attribute. In the below case, <code>data-iconpos="right"</code>.</p>
9797

9898
<div data-role="collapsible" data-iconpos="right">
9999
<h3>I'm a header</h3>

0 commit comments

Comments
 (0)