Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-03-24 09:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:jquery/jquery-mobile

Browse source
This commit is contained in:
Todd Parker 2010-11-11 13:53:23 -05:00
commit 34fefc02fc
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/_assets/css/jqm-docs.css
View file

@ -3,4 +3,5 @@
.ui-mobile #jqm-homeheader h1 { margin: 0 0 10px; }
.ui-mobile #jqm-homeheader p { margin: 0; }
.ui-mobile #jqm-version { text-indent: -99999px; background: url(../images/version.png) top right no-repeat; width: 119px; height: 122px; overflow: hidden; position: absolute; top: 0; right: 0; }
.ui-mobile .jqm-themeswitcher { clear: both; margin: 20px 0 -15px; }
.ui-mobile .jqm-themeswitcher { clear: both; margin: 20px 0 -15px; }
dt { font-weight: bold; margin-top: 2em; }

4
docs/api/global-settings.html
View file

@ -4,6 +4,7 @@
<meta charset="utf-8" />
<title>jQuery Mobile Docs - Configurable Default Settings</title>
<link rel="stylesheet" href="../../themes/default" />
<link rel="stylesheet" href="../_assets/css/jqm-docs.css"/>
<script type="text/javascript" src="../../js/"></script>
</head>
<body>
@ -52,9 +53,6 @@
<dt>metaViewportContent (<em>string</em>, default: "width=device-width, minimum-scale=1, maximum-scale=1"):</dt>
<dd>Configure the auto-generated meta viewport tag's content attribute. If false, no meta tag will be appended to the DOM.</dd>
<dt>headExtras (<em>markup string or jQuery object</em>, default: null):</dt>
<dd> Additional markup to prepend to head element.</dd>
<dt>gradeA (<em>function that returns a boolean</em>, default: a function returning the value of $.support.mediaquery):</dt>
<dd>Any support conditions that must be met in order to proceed.</dd>

6
js/jquery.mobile.js
View file

@ -46,9 +46,6 @@
//configure meta viewport tag's content attr:
metaViewportContent: "width=device-width, minimum-scale=1, maximum-scale=1",
//additional markup to prepend to head
headExtras: null,
//support conditions that must be met in order to proceed
gradeA: function(){
return $.support.mediaquery;
@ -123,9 +120,6 @@
//add mobile, initial load "rendering" classes to docEl
$html.addClass('ui-mobile ui-mobile-rendering');
//prepend head markup additions
if( $.mobile.headExtras ){ $head.prepend( $.mobile.headExtras ); }
// TODO: don't expose (temporary during code reorg)
$.mobile.urlStack = urlStack;