mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-05-05 05:04:46 +00:00
Merge branch 'master' of https://github.com/jquery/jquery-mobile
This commit is contained in:
commit
0e0435ed1c
6 changed files with 38 additions and 14 deletions
|
|
@ -32,18 +32,18 @@
|
|||
<p>The visual fidelity of the experience is highly dependent on CSS rendering capabilities of the device and platform so not all A grade experience will be pixel-perfect but that's the nature of the web. </p>
|
||||
<h3 style="display: block; font-size: 15px !important; font-weight: normal; background: #f0f0f0; border-left: 7px solid #74B64A; padding: 5px 0 5px 8px;"><strong> A-grade</strong> - Full enhanced experience with Ajax-based animated page transitions.</h3>
|
||||
<ul>
|
||||
<li><strong>Apple iOS 3.2-5.0 beta</strong> - Tested on the original iPad (3.2 / 4.3), iPad 2 (4.3), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), and 4 (4.3 / 5.0 beta)</li>
|
||||
<li><strong>Apple iOS 3.2-5.0</strong> - Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3), original iPhone (3.1), iPhone 3 (3.2), 3GS (4.3), and 4 (4.3 / 5.0)</li>
|
||||
<li><strong>Android 2.1-2.3</strong> - Tested on the HTC Incredible (2.2), original Droid (2.2), Nook Color (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)</li>
|
||||
<li><strong>Android Honeycomb</strong>- Tested on the Samsung Galaxy Tab 10.1</li>
|
||||
<li><strong>Windows Phone 7</strong> - Tested on the HTC 7 Surround</li>
|
||||
<li><strong>Windows Phone 7-7.5</strong> - Tested on the HTC Surround (7) HTC Trophy (7.5), and LG-E900 (7.5)</li>
|
||||
<li><strong>Blackberry 6.0</strong> - Tested on the Torch 9800 and Style 9670</li>
|
||||
<li><strong>Blackberry 7</strong> - Tested on BlackBerry® Torch 9810</li>
|
||||
<li><strong>Blackberry Playbook</strong> - Tested on PlayBook version 1.0.1 / 1.0.5</li>
|
||||
<li><strong>Palm WebOS (1.4-2.0)</strong> - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0)</li>
|
||||
<li><strong>Palm WebOS 3.0 </strong> - Tested on HP TouchPad</li>
|
||||
<li><strong>Firebox Mobile (Beta)</strong> - Tested on Android 2.2</li>
|
||||
<li><strong>Opera Mobile 11.0</strong>: Tested on the iPhone 3GS and 4 (5.0/6.0), Android 2.2 (5.0/6.0), Windows Mobile 6.5 (5.0)</li>
|
||||
<li><strong>Meego 1.2</strong> - Tested on Nokia 950</li>
|
||||
<li><strong>Opera Mobile 11.0</strong>: Tested on the iPhone 3GS and 4 (5.0/6.0), Android 2.2 (5.0/6.0)</li>
|
||||
<li><strong>Meego 1.2</strong> - Tested on Nokia 950 and N9</li>
|
||||
<li><strong>Kindle 3</strong>: Tested on the built-in WebKit browser included in the Kindle 3 device</li>
|
||||
<li><strong>Chrome <strong>Desktop </strong>11-13</strong> - Tested on OS X 10.6.7 and Windows 7</li>
|
||||
<li><strong>Firefox Desktop 3.6-4.0</strong> - Tested on OS X 10.6.7 and Windows 7</li>
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
</style>
|
||||
|
||||
<div data-role="header" data-theme="f">
|
||||
<h1>Inset Readonly Lists</h1>
|
||||
<h1>Readonly lists</h1>
|
||||
<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
|
||||
</div><!-- /header -->
|
||||
|
||||
<div data-role="content">
|
||||
<div class="content-primary">
|
||||
<p>Here is a variety of full-width lists that are read-only. If a list has the <code>data-role="listview"</code> attribute, but the contents aren't linked, it will display as read-only. These look like normal lists, but don't have a right arrow.</ap>
|
||||
<p>Here is a variety of full-width lists that are read-only. If a list has the <code>data-role="listview"</code> attribute, but the contents aren't linked, it will display as read-only. These look like normal lists, except they don't have a right arrow and the text is set to a smaller size to save space.</ap>
|
||||
|
||||
<h2>Simple list</h2>
|
||||
|
||||
|
|
|
|||
|
|
@ -46,15 +46,18 @@ $.widget( "mobile.button", $.mobile.widget, {
|
|||
// Add hidden input if it doesn’t already exist.
|
||||
if( $buttonPlaceholder === undefined ) {
|
||||
$buttonPlaceholder = $( "<input>", {
|
||||
type: "hidden",
|
||||
name: $el.attr( "name" ),
|
||||
value: $el.attr( "value" )
|
||||
})
|
||||
.insertBefore( $el );
|
||||
type: "hidden",
|
||||
name: $el.attr( "name" ),
|
||||
value: $el.attr( "value" )
|
||||
}).insertBefore( $el );
|
||||
|
||||
// Bind to doc to remove after submit handling
|
||||
$( document ).submit(function(){
|
||||
$buttonPlaceholder.remove();
|
||||
$( document ).one("submit", function(){
|
||||
$buttonPlaceholder.remove();
|
||||
|
||||
// reset the local var so that the hidden input
|
||||
// will be re-added on subsequent clicks
|
||||
$buttonPlaceholder = undefined;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1099,7 +1099,11 @@
|
|||
// Wrap this in a try/catch block since IE9 throw "Unspecified error" if document.activeElement
|
||||
// is undefined when we are in an IFrame.
|
||||
try {
|
||||
$( document.activeElement || "" ).add( "input:focus, textarea:focus, select:focus" ).blur();
|
||||
if(document.activeElement && document.activeElement.nodeName.toLowerCase() != 'body') {
|
||||
$(document.activeElement).blur();
|
||||
} else {
|
||||
$( "input:focus, textarea:focus, select:focus" ).blur();
|
||||
}
|
||||
} catch(e) {}
|
||||
|
||||
// If we're displaying the page as a dialog, we don't want the url
|
||||
|
|
|
|||
|
|
@ -33,4 +33,18 @@
|
|||
textValueButton.text( "bar" ).val( "baz" ).button( 'refresh' );
|
||||
same( textValueButton.siblings().text(), "bar" );
|
||||
});
|
||||
|
||||
// Issue 2877
|
||||
test( "verify the button placeholder is added many times", function() {
|
||||
var $form = $( "#hidden-element-addition-form" ), count = 3;
|
||||
expect( count * 2 );
|
||||
|
||||
for( var x = 0; x < count; x++ ) {
|
||||
$( "#hidden-element-addition" ).trigger( "vclick" );
|
||||
same( $form.find( "input[type='hidden']" ).length, 1, "hidden form input should be added" );
|
||||
|
||||
$form.trigger( "submit" );
|
||||
same( $form.find( "[type='hidden']" ).length, 0, "hidden form input is removed" );
|
||||
}
|
||||
});
|
||||
})( jQuery );
|
||||
|
|
@ -32,6 +32,9 @@
|
|||
<button id="enhanced">bar</button>
|
||||
<button id="text">foo</button>
|
||||
<button id="value" value="foo"></button>
|
||||
<form id="hidden-element-addition-form" method="get" action="this will fail!">
|
||||
<input type="submit" id="hidden-element-addition" name="foo">foo</input>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Reference in a new issue