Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 9ef48ec

Browse files
johnbenderjohnbender
committed
update from master
2 parents d360ef4 + 5c793cd commit 9ef48ec

Some content is hidden

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

65 files changed

+1867
-1652
lines changed

‎Gruntfile.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module.exports = function( grunt ) {
3838
grunt.loadNpmTasks( "grunt-css" );
3939
grunt.loadNpmTasks( "grunt-git-authors" );
4040
grunt.loadNpmTasks( "grunt-qunit-junit" );
41-
grunt.loadNpmTasks( "grunt-md5-manifest" );
41+
grunt.loadNpmTasks( "grunt-hash-manifest" );
4242

4343
// load the project's default tasks
4444
grunt.loadTasks( "build/tasks");
@@ -341,9 +341,10 @@ module.exports = function( grunt ) {
341341
}
342342
},
343343

344-
"md5-manifest": {
344+
"hash-manifest": {
345345
cdn: {
346346
options: {
347+
algo: "md5",
347348
cwd: "<%= files.cdn %>"
348349
},
349350
src: [ "**/*" ],
@@ -551,7 +552,7 @@ module.exports = function( grunt ) {
551552

552553
grunt.registerTask( "demos", [ "concat:demos", "copy:demos.nested-includes", "copy:demos.processed", "copy:demos.unprocessed" ] );
553554

554-
grunt.registerTask( "cdn", [ "release:init", "clean:cdn", "copy:cdn", "md5-manifest:cdn", "compress:cdn" ] );
555+
grunt.registerTask( "cdn", [ "release:init", "clean:cdn", "copy:cdn", "hash-manifest:cdn", "compress:cdn", "clean:cdn" ] );
555556

556557
grunt.registerTask( "dist", [ "config:fetchHeadHash", "js:release", "css:release", "copy:images", "demos", "compress:dist" ] );
557558
grunt.registerTask( "dist:release", [ "release:init", "dist", "cdn" ] );

‎css/structure/jquery.mobile.table.reflow.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
/* Make the label elements a percentage width */
2727
.ui-table-reflow td .ui-table-cell-label,
2828
.ui-table-reflow th .ui-table-cell-label {
29-
display: block;
3029
padding: .4em;
3130
min-width: 30%;
3231
display: inline-block;

‎css/themes/default/jquery.mobile.theme.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,8 @@ a.ui-link-inherit {
829829

830830
.ui-icon,
831831
.ui-icon-searchfield:after {
832-
background-color: #666 /*{global-icon-color}*/;
833-
background-color: rgba(0,0,0,.4) /*{global-icon-disc}*/;
832+
background: #666 /*{global-icon-color}*/;
833+
background: rgba(0,0,0,.4) /*{global-icon-disc}*/;
834834
background-image: url(images/icons-18-white.png) /*{global-icon-set}*/;
835835
background-repeat: no-repeat;
836836
-webkit-border-radius: 9px;

‎demos/_assets/css/jqm-demos.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,10 +638,11 @@ h2.jqm-home-widget {
638638
}
639639

640640
/* Footer */
641+
.ui-page .jqm-footer{
642+
position:absolute;
643+
}
641644
.jqm-footer {
642645
overflow: hidden;
643-
position: absolute;
644-
bottom: 0;
645646
width: 100%;
646647
}
647648
.jqm-footer p {

‎demos/faq/how-configure-phonegap-cordova.php

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

4040
<h2>$.support.cors</h2>
4141

42-
<p>In jQuery core, there is a <a href="http://api.jquery.com/jQuery.support/" rel="external">$.support.cors</a> boolean that indicates whether or not jQuery thinks the browser supports the W3C "<a hre="http://www.w3.org/TR/cors/" rel="external">Cross-Origin Resource Sharing</a>" feature to support cross-domain requests.</p>
42+
<p>In jQuery core, there is a <a href="http://api.jquery.com/jQuery.support/" rel="external">$.support.cors</a> boolean that indicates whether or not jQuery thinks the browser supports the W3C "<a href="http://www.w3.org/TR/cors/" rel="external">Cross-Origin Resource Sharing</a>" feature to support cross-domain requests.</p>
4343

4444
<p>Since jQuery Mobile relies on jQuery core's $.ajax() functionality, <code>$.support.cors</code> must be set to <code>true</code> to tell <code>$.ajax</code> to load cross-domain pages. We've heard reports that webviews on some platforms, like BlackBerry, support cross-domain loading, but that jQuery core incorrectly sets <code>$.support.cors</code> value to <code>false</code> which disables cross-domain $.ajax() requests and will cause the page or assets to fail to load. </p>
4545

‎demos/widgets/checkbox/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<div data-demo-html="true">
9595
<form>
9696
<fieldset data-role="controlgroup" data-iconpos="right">
97-
<legend>Horizontal, mini sized:</legend>
97+
<legend>Icon right:</legend>
9898
<input type="checkbox" name="checkbox-h-6a" id="checkbox-h-6a">
9999
<label for="checkbox-h-6a">One</label>
100100
<input type="checkbox" name="checkbox-h-6b" id="checkbox-h-6b">

‎demos/widgets/headers/external-fixed.php

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>Headers - jQuery Mobile Demos</title>
7+
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css">
8+
<link rel="stylesheet" href="../../_assets/css/jqm-demos.css">
9+
<link rel="shortcut icon" href="../../favicon.ico">
10+
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,700">
11+
<script src="../../../js/jquery.js"></script>
12+
<script src="../../_assets/js/"></script>
13+
<script src="../../../js/"></script>
14+
<script>
15+
$(function(){
16+
$("[data-role='header'], [data-role='footer']").toolbar();
17+
});
18+
</script>
19+
</head>
20+
<body>
21+
<div data-role="header" class="jqm-header" data-position="fixed">
22+
<h1 class="jqm-logo"><a href="../../"><img src="../../_assets/img/jquery-logo.png" alt="jQuery Mobile Framework"></a></h1>
23+
<a href="#" class="jqm-navmenu-link" data-icon="bars" data-iconpos="notext">Navigation</a>
24+
<a href="#" class="jqm-search-link" data-icon="search" data-iconpos="notext">Search</a>
25+
</div><!-- /header -->
26+
<div data-role="page" class="jqm-demos" data-quicklinks="true">
27+
28+
29+
30+
<div data-role="content" class="jqm-content">
31+
32+
<h1>Fixed External Headers <a href="http://api.jquerymobile.com/header/" data-ajax="false" data-role="button" data-inline="true" data-mini="true" data-icon="arrow-r" data-iconpos="right" class="jqm-api-link">API</a></h1>
33+
34+
<p class="jqm-intro">The Header and footer on this page are outside of the page within the body. They have been set to position fixed.</p>
35+
36+
<h2>True Persistant Toolbars</h2>
37+
38+
<p>Because External toolbars are outside of the page they are not effected by transition and make truely persistant toolbars possible</p>
39+
40+
<p><a href="footer-persist-a.php" data-ajax="false">Persistant Footer</a></p>
41+
42+
43+
44+
</div><!-- /content -->
45+
46+
47+
48+
<?php include( '../../global-nav.php' ); ?>
49+
50+
</div><!-- /page -->
51+
<div data-role="footer" class="jqm-footer" data-position="fixed" style="background-color:white;">
52+
<p class="jqm-version"></p>
53+
<p>Copyright 2013 The jQuery Foundation</p>
54+
</div><!-- /footer -->
55+
</body>
56+
</html>

‎demos/widgets/headers/external.php

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>Headers - jQuery Mobile Demos</title>
7+
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css">
8+
<link rel="stylesheet" href="../../_assets/css/jqm-demos.css">
9+
<link rel="shortcut icon" href="../../favicon.ico">
10+
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,700">
11+
<script src="../../../js/jquery.js"></script>
12+
<script src="../../_assets/js/"></script>
13+
<script src="../../../js/"></script>
14+
<script>
15+
$(function(){
16+
$("[data-role='header'], [data-role='footer']").toolbar();
17+
});
18+
</script>
19+
</head>
20+
<body>
21+
<div data-role="header" class="jqm-header">
22+
<h1 class="jqm-logo"><a href="../../"><img src="../../_assets/img/jquery-logo.png" alt="jQuery Mobile Framework"></a></h1>
23+
<a href="#" class="jqm-navmenu-link" data-icon="bars" data-iconpos="notext">Navigation</a>
24+
<a href="#" class="jqm-search-link" data-icon="search" data-iconpos="notext">Search</a>
25+
</div><!-- /header -->
26+
<div data-role="page" class="jqm-demos" data-quicklinks="true">
27+
28+
29+
30+
<div data-role="content" class="jqm-content">
31+
32+
<h1>External Headers <a href="http://api.jquerymobile.com/header/" data-ajax="false" data-role="button" data-inline="true" data-mini="true" data-icon="arrow-r" data-iconpos="right" class="jqm-api-link">API</a></h1>
33+
34+
<p class="jqm-intro">
35+
The Header and footer on this page are positioned outside the page. They are before and after the page withing the body. These Toolbars will remain in the dom until manually removed. If you navigate to a page that does not have a header or footer within it these toolbars will persist. Otherwise they will hide to allow the page's internal header and footer to show.
36+
</p>
37+
38+
<h2>Header markup</h2>
39+
40+
<p>The markup for external headers is identical to normal headers you just place the header outside the page within the body of your page</p>
41+
42+
<h2>Auto Init</h2>
43+
44+
<p>Because these tolbars are not within the page they will not auto initalize. you must call the toolbar plugin yourself on document ready</p>
45+
46+
<h2>Ajax Navigation</h2>
47+
48+
<p>Because these toolbars are not within the page they will remain in the dom until manually removed. However they will automaticly hide if you navigate to a page containing a toolbar to allow the pages own toolbars to take their place. They will automaticly show again if you navigate to a page containing no toolbars.
49+
</p>
50+
51+
<p>Toolbars not within a page will not be pulled into the dom durring ajax navigation</p>
52+
53+
<h2>Fixed External Toolbars</h2>
54+
55+
<p>External toolbars can also be set to fixed positioning just like normal toolbars <a href="external-fixed.php" data-ajax="false">Fixed Position External Toolbars</a></p>
56+
57+
</div><!-- /content -->
58+
59+
60+
61+
<?php include( '../../global-nav.php' ); ?>
62+
63+
</div><!-- /page -->
64+
<div data-role="footer" class="jqm-footer">
65+
<p class="jqm-version"></p>
66+
<p>Copyright 2013 The jQuery Foundation</p>
67+
</div><!-- /footer -->
68+
</body>
69+
</html>

‎demos/widgets/headers/footer-persist-a.php

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>Navbar - jQuery Mobile Demos</title>
7+
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css">
8+
<link rel="stylesheet" href="../../_assets/css/jqm-demos.css">
9+
<link rel="shortcut icon" href="../../favicon.ico">
10+
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,700">
11+
<script src="../../../js/jquery.js"></script>
12+
<script src="../../_assets/js/"></script>
13+
<script src="../../../js/"></script>
14+
<script>
15+
$(function(){
16+
$("[data-role='navbar']").navbar();
17+
$("[data-role='header'], [data-role='footer']").toolbar();
18+
});
19+
</script>
20+
</head>
21+
<body>
22+
<div data-role="header" class="jqm-header" data-position="fixed">
23+
<h1 class="jqm-logo"><a href="../../"><img src="../../_assets/img/jquery-logo.png" alt="jQuery Mobile Framework"></a></h1>
24+
<a href="#" class="jqm-navmenu-link" data-icon="bars" data-iconpos="notext">Navigation</a>
25+
<a href="#" class="jqm-search-link" data-icon="search" data-iconpos="notext">Search</a>
26+
</div><!-- /header -->
27+
<div data-role="page" class="jqm-demos">
28+
29+
<div data-role="content" class="jqm-content">
30+
31+
<h1>Persistent navbars <a href="http://api.jquerymobile.com/navbar/" data-ajax="false" data-role="button" data-inline="true" data-mini="true" data-icon="arrow-r" data-iconpos="right" class="jqm-api-link">API</a></h1>
32+
<p>These pages are a demo of a persistent <a href="../navbar/">navbar</a> in a fixed footer toolbar. Click on any of the links in the footer, and you'll see the page content transition. Both the persistent header and footer on these pages remain in place during the animation to a new HTML page.</p>
33+
<p>With the new external toolbars no extra effort is required to now have persistant toolbars simply place them outside of the page container on each page they will be loaded on the first page and persist on subsequent pages. The toolbars still need to be placed on each page to account for refresh however they will be ignored if not within a page container.</p>
34+
35+
<p>Typically, the persistent toolbar technique will be combined with fixed positioning.</p>
36+
37+
<h2>Improving page load with persistant toolbars</h2>
38+
<p>By combining this technique with a little bit of server side logic you can reduce the file size for each page load significantly by not sending anything execpt the actual page container back when the request is from ajax. this not only reduces file size but makes the actual processing of the page quicker also. To see an example of this technique see <a href="optimized-persistant-toolbars-a.php" data-ajax="false">Optimized Persistant Toolbars</a></p>
39+
<h3>A note about transitions</h3>
40+
<p>By Removing the toolbars from the page container they are no longer part of the page transition which dramaticly improves the performance of complex 3D page transitions over the older style of persistant toolbars.</p>
41+
42+
</div><!-- /content -->
43+
44+
45+
46+
<?php include( '../../global-nav.php' ); ?>
47+
48+
</div><!-- /page -->
49+
<div data-role="footer" data-position="fixed">
50+
<div data-role="navbar">
51+
<ul>
52+
<li><a href="footer-persist-a.php" data-prefetch="true" data-transition="none">Info</a></li>
53+
<li><a href="footer-persist-b.php" data-prefetch="true" data-transition="flip">Friends</a></li>
54+
<li><a href="footer-persist-c.php" data-prefetch="true" data-transition="turn">Albums</a></li>
55+
<li><a href="footer-persist-d.php" data-prefetch="true" data-transition="slide">Emails</a></li>
56+
</ul>
57+
</div><!-- /navbar -->
58+
</div><!-- /footer -->
59+
</body>
60+
</html>

‎demos/widgets/headers/footer-persist-b.php

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
6+
<title>Navbar - jQuery Mobile Demos</title>
7+
<link rel="stylesheet" href="../../../css/themes/default/jquery.mobile.css">
8+
<link rel="stylesheet" href="../../_assets/css/jqm-demos.css">
9+
<link rel="shortcut icon" href="../../favicon.ico">
10+
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,700">
11+
<script src="../../../js/jquery.js"></script>
12+
<script src="../../_assets/js/"></script>
13+
<script src="../../../js/"></script>
14+
<script>
15+
$(function(){
16+
$("[data-role='navbar']").navbar();
17+
$("[data-role='header'], [data-role='footer']").toolbar();
18+
});
19+
</script>
20+
</head>
21+
<body>
22+
<div data-role="header" class="jqm-header" data-position="fixed">
23+
<h1 class="jqm-logo"><a href="../../"><img src="../../_assets/img/jquery-logo.png" alt="jQuery Mobile Framework"></a></h1>
24+
<a href="#" class="jqm-navmenu-link" data-icon="bars" data-iconpos="notext">Navigation</a>
25+
<a href="#" class="jqm-search-link" data-icon="search" data-iconpos="notext">Search</a>
26+
</div><!-- /header -->
27+
<div data-role="page" class="jqm-demos">
28+
29+
<div data-role="content" class="jqm-content jqm-fullwidth">
30+
31+
<ul data-role="listview" data-theme="d" data-dividertheme="e" data-filter="true" data-filter-theme="d"data-filter-placeholder="Search friends...">
32+
<li data-role="list-divider">A</li>
33+
<li><a href="#">Adam Kinkaid</a></li>
34+
<li><a href="#">Alex Wickerham</a></li>
35+
<li><a href="#">Avery Johnson</a></li>
36+
<li data-role="list-divider">B</li>
37+
<li><a href="#">Bob Cabot</a></li>
38+
<li data-role="list-divider">C</li>
39+
<li><a href="#">Caleb Booth</a></li>
40+
<li><a href="#">Christopher Adams</a></li>
41+
<li><a href="#">Culver James</a></li>
42+
<li data-role="list-divider">D</li>
43+
<li><a href="#">David Walsh</a></li>
44+
<li><a href="#">Drake Alfred</a></li>
45+
<li data-role="list-divider">E</li>
46+
<li><a href="#">Elizabeth Bacon</a></li>
47+
<li><a href="#">Emery Parker</a></li>
48+
<li><a href="#">Enid Voldon</a></li>
49+
<li data-role="list-divider">F</li>
50+
<li><a href="#">Francis Wall</a></li>
51+
<li data-role="list-divider">G</li>
52+
<li><a href="#">Graham Smith</a></li>
53+
<li><a href="#">Greta Peete</a></li>
54+
<li data-role="list-divider">H</li>
55+
<li><a href="#">Harvey Walls</a></li>
56+
<li data-role="list-divider">M</li>
57+
<li><a href="#">Mike Farnsworth</a></li>
58+
<li><a href="#">Murray Vanderbuilt</a></li>
59+
<li data-role="list-divider">N</li>
60+
<li><a href="#">Nathan Williams</a></li>
61+
<li data-role="list-divider">P</li>
62+
<li><a href="#">Paul Baker</a></li>
63+
<li><a href="#">Pete Mason</a></li>
64+
<li data-role="list-divider">R</li>
65+
<li><a href="#">Rod Tarker</a></li>
66+
<li data-role="list-divider">S</li>
67+
<li><a href="#">Sawyer Wakefield</a></li>
68+
</ul>
69+
70+
</div><!-- /content -->
71+
72+
<?php include( '../../global-nav.php' ); ?>
73+
74+
</div><!-- /page -->
75+
<div data-role="footer" data-position="fixed">
76+
<div data-role="navbar">
77+
<ul>
78+
<li><a href="footer-persist-a.php" data-prefetch="true" data-transition="none" class="ui-btn-active ui-state-persist">Info</a></li>
79+
<li><a href="footer-persist-b.php" data-prefetch="true" data-transition="flip">Friends</a></li>
80+
<li><a href="footer-persist-c.php" data-prefetch="true" data-transition="turn">Albums</a></li>
81+
<li><a href="footer-persist-d.php" data-prefetch="true" data-transition="slide">Emails</a></li>
82+
</ul>
83+
</div><!-- /navbar -->
84+
</div><!-- /footer -->
85+
</body>
86+
87+
</html>

0 commit comments

Comments
 (0)