Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-03-16 22:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
gseguin 2011-08-03 11:16:20 -07:00
commit cce89cb91d
6 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/_assets/images/version.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
docs/_assets/js/jqm-docs.js
View file

@ -29,7 +29,7 @@ $('div').live('pagecreate',function(event){
//collapse page navs after use
$(function(){
$('body').delegate('.content-secondary .ui-collapsible-content', 'vclick', function(){
$('body').delegate('.content-secondary .ui-collapsible-content', 'click', function(){
$(this).trigger("collapse")
});
});

4
docs/forms/texts/methods.html
View file

@ -41,14 +41,14 @@
<dt><code>enable</code> enable a disabled text input.</dt>
<dd>
<pre><code>
$('select').selectmenu('enable');
$('select').textinput('enable');
</code></pre>
</dd>
<dt><code>disable</code> disable a text input.</dt>
<dd>
<pre><code>
$('select').selectmenu('disable');
$('select').textinput('disable');
</code></pre>
</dd>

6
docs/pages/multipage-template.html
View file

@ -5,9 +5,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Page Title</title>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css" />
<script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"></script>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css" />
<script src="http://code.jquery.com/jquery-1.6.2.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js"></script>
</head>

6
docs/pages/page-template.html
View file

@ -5,9 +5,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Page Title</title>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css" />
<script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"></script>
<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css" />
<script src="http://code.jquery.com/jquery-1.6.2.min.js"></script>
<script src="http://code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js"></script>
</head>
<body>

50
js/jquery.mobile.support.js
View file

@ -4,21 +4,21 @@
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
*/
(function( $, undefined ) {
(function( $, undefined ) {
var fakeBody = $( "<body>" ).prependTo( "html" ),
var fakeBody = $( "<body>" ).prependTo( "html" ),
fbCSS = fakeBody[ 0 ].style,
vendors = [ "webkit", "moz", "o" ],
webos = "palmGetResource" in window, //only used to rule out scrollTop
bb = window.blackberry; //only used to rule out box shadow, as it's filled opaque on BB
// thx Modernizr
function propExists( prop ) {
function propExists( prop ) {
var uc_prop = prop.charAt( 0 ).toUpperCase() + prop.substr( 1 ),
props = ( prop + " " + vendors.join( uc_prop + " " ) + uc_prop ).split( " " );
props = ( prop + " " + vendors.join( uc_prop + " " ) + uc_prop ).split( " " );
for ( var v in props ){
if ( fbCSS[ v ] !== undefined ) {
if ( fbCSS[ v ] !== undefined ) {
return true;
}
}
@ -33,12 +33,12 @@ function baseTagTest() {
link, rebase;
if ( !base.length ) {
base = fauxEle = $( "<base>", { "href": fauxBase} ).appendTo( "head" );
base = fauxEle = $( "<base>", { "href": fauxBase }).appendTo( "head" );
} else {
href = base.attr( "href" );
}
link = $( "<a href='testurl'></a>" ).prependTo( fakeBody );
link = $( "<a href='testurl'></a>" ).prependTo( fakeBody );
rebase = link[ 0 ].href;
base[ 0 ].href = href ? href : location.pathname;
@ -82,40 +82,38 @@ fakeBody.remove();
// $.mobile.ajaxBlacklist is used to override ajaxEnabled on platforms that have known conflicts with hash history updates (BB5, Symbian)
// or that generally work better browsing in regular http for full page refreshes (Opera Mini)
// Note: This detection below is used as a last resort.
// Note: This detection below is used as a last resort.
// We recommend only using these detection methods when all other more reliable/forward-looking approaches are not possible
var nokiaLTE7_3 = (function(){
var ua = window.navigator.userAgent;
//The following is an attempt to match Nokia browsers that are running Symbian/s60, with webkit, version 7.3 or older
return ua.indexOf( "Nokia" ) > -1
&& ( ua.indexOf( "Symbian/3" ) > -1 || ua.indexOf( "Series60/5" ) > -1 )
&& ua.indexOf( "AppleWebKit" ) > -1
&& ua.match( /(BrowserNG|NokiaBrowser)\/7\.[0-3]/ );
return ua.indexOf( "Nokia" ) > -1 &&
( ua.indexOf( "Symbian/3" ) > -1 || ua.indexOf( "Series60/5" ) > -1 ) &&
ua.indexOf( "AppleWebKit" ) > -1 &&
ua.match( /(BrowserNG|NokiaBrowser)\/7\.[0-3]/ );
})();
$.mobile.ajaxBlacklist =
// BlackBerry browsers, pre-webkit
window.blackberry && !window.WebKitPoint
// Opera Mini
|| window.operamini && Object.prototype.toString.call( window.operamini ) === "[object OperaMini]"
// Symbian webkits pre 7.3
|| nokiaLTE7_3;
// BlackBerry browsers, pre-webkit
window.blackberry && !window.WebKitPoint ||
// Opera Mini
window.operamini && Object.prototype.toString.call( window.operamini ) === "[object OperaMini]" ||
// Symbian webkits pre 7.3
nokiaLTE7_3;
// Lastly, this workaround is the only way we've found so far to get pre 7.3 Symbian webkit devices
// to render the stylesheets when they're referenced before this script, as we'd recommend doing.
// This simply reappends the CSS in place, which for some reason makes it apply
if( nokiaLTE7_3 ){
$(function(){
$( "head link[rel=stylesheet]" ).each(function(){
$( this ).attr( "rel", "alternate stylesheet" ).attr( "rel", "stylesheet" );
});
});
if ( nokiaLTE7_3 ) {
$(function() {
$( "head link[rel=stylesheet]" ).attr( "rel", "alternate stylesheet" ).attr( "rel", "stylesheet" );
});
}
// For ruling out shadows via css
if ( !$.support.boxShadow ){
if ( !$.support.boxShadow ) {
$( "html" ).addClass( "ui-mobile-nosupport-boxshadow" );
}