Skip to content

Commit 57af436

Browse files
author
scottjehl
committed
Merge branch 'fixedtoolbar'
Conflicts: Makefile css/structure/index.php css/structure/jquery.mobile.core.css css/structure/jquery.mobile.forms.slider.css css/structure/jquery.mobile.transitions.fade.css css/themes/default/jquery.mobile.css css/themes/default/jquery.mobile.theme.css docs/pages/page-transitions.html js/jquery.mobile.core.js js/jquery.mobile.define.js js/jquery.mobile.docs.js js/jquery.mobile.fixHeaderFooter.js js/jquery.mobile.fixHeaderFooter.native.js js/jquery.mobile.forms.button.js js/jquery.mobile.forms.select.custom.js js/jquery.mobile.init.js js/jquery.mobile.js js/jquery.mobile.navigation.js js/jquery.mobile.support.js js/jquery.mobile.transition.flip.js js/jquery.mobile.transition.flow.js js/jquery.mobile.transition.js js/jquery.mobile.transition.pop.js js/jquery.mobile.transition.slide.js js/jquery.mobile.transition.slidedown.js js/jquery.mobile.transition.slideup.js js/jquery.mobile.transition.turn.js tests/jquery.testHelper.js tests/unit/listview/listview_core.js tests/unit/support/index.html
2 parents 956075c + c4df922 commit 57af436

23 files changed

+672
-651
lines changed

‎css/structure/jquery.mobile.core.css

Lines changed: 9 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* some unsets - more probably needed */
2-
.ui-mobile, .ui-mobile body { height: 99.9%; }
2+
.ui-mobile, .ui-mobile body { height: 100%; }
33
.ui-mobile fieldset, .ui-page { padding: 0; margin: 0; }
44
.ui-mobile a img, .ui-mobile fieldset { border-width: 0; }
55

@@ -24,41 +24,6 @@ div.ui-mobile-viewport { overflow-x: hidden; }
2424
.ui-mobile, .ui-mobile .ui-page { min-height: 300px; }
2525
}
2626

27-
/* native overflow scrolling */
28-
.ui-page.ui-mobile-touch-overflow,
29-
.ui-mobile-touch-overflow.ui-native-fixed .ui-content {
30-
overflow: auto;
31-
height: 100%;
32-
left: 0;
33-
right: 0;
34-
-webkit-overflow-scrolling: touch;
35-
-moz-overflow-scrolling: touch;
36-
-o-overflow-scrolling: touch;
37-
-ms-overflow-scrolling: touch;
38-
overflow-scrolling: touch;
39-
}
40-
.ui-page.ui-mobile-touch-overflow,
41-
.ui-page.ui-mobile-touch-overflow * {
42-
/* some level of transform keeps elements from blinking out of visibility on iOS */
43-
-webkit-transform: rotateY(0);
44-
}
45-
.ui-mobile-touch-overflow.ui-native-fixed .ui-content .ui-listview {
46-
margin-top: 0;
47-
}
48-
.ui-mobile-touch-overflow.ui-native-fixed .ui-content .ui-listview-inset {
49-
margin-top: 1em;
50-
}
51-
.ui-mobile-touch-overflow.ui-native-fixed .ui-content .ui-listview-filter {
52-
margin-top: .2em;
53-
margin-bottom: 0;
54-
}
55-
.ui-mobile-touch-overflow.ui-native-fixed .ui-content .ui-listview-filter-inset {
56-
margin-bottom: -.9em;
57-
}
58-
.ui-mobile-touch-overflow.ui-native-fixed .ui-header .ui-btn {
59-
z-index: 10;
60-
}
61-
6227
/* loading screen */
6328
.ui-loading .ui-loader { display: block; }
6429
.ui-loader { background-color: #000; opacity: .18; display: none; z-index: 9999999; position: fixed; width: 46px; height: 46px; top: 50%; box-shadow: 0 1px 1px -1px #fff; margin-left: -18px; margin-top: -18px; left: 50%; padding: 1px; border:0; -webkit-border-radius: 36px; -moz-border-radius: 36px; border-radius: 36px; }
@@ -73,60 +38,25 @@ div.ui-mobile-viewport { overflow-x: hidden; }
7338
.ui-bar { font-size: 16px; margin: 0; }
7439
.ui-bar h1, .ui-bar h2, .ui-bar h3, .ui-bar h4, .ui-bar h5, .ui-bar h6 { margin: 0; padding: 0; font-size: 16px; display: inline-block; }
7540

76-
.ui-header, .ui-footer { display: block; }
77-
.ui-page .ui-header, .ui-page .ui-footer { position: relative; }
41+
.ui-header, .ui-footer { position: relative; overflow: hidden; width: 100%; border-left-width: 0; border-right-width: 0; }
7842
.ui-header .ui-btn-left { position: absolute; left: 10px; top: .4em; }
7943
.ui-header .ui-btn-right { position: absolute; right: 10px; top: .4em; }
8044
.ui-header .ui-title, .ui-footer .ui-title { min-height: 1.1em; text-align: center; font-size: 16px; display: block; margin: .6em 30% .8em; padding: 0; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; outline: 0 !important; }
8145
.ui-footer .ui-title { margin: .6em 15px .8em; }
46+
.ui-header-fixed .ui-btn {
47+
z-index: 10;
48+
}
8249

8350
/*content area*/
8451
.ui-content { border-width: 0; overflow: visible; overflow-x: hidden; padding: 15px; }
85-
.ui-page-fullscreen .ui-content { padding:0; }
86-
87-
/* native fixed headers and footers */
88-
.ui-mobile-touch-overflow.ui-page.ui-native-fixed,
89-
.ui-mobile-touch-overflow.ui-page.ui-native-fullscreen {
90-
overflow: visible;
91-
}
92-
.ui-mobile-touch-overflow.ui-native-fixed .ui-header,
93-
.ui-mobile-touch-overflow.ui-native-fixed .ui-footer {
94-
position: fixed;
95-
left: 0;
96-
right: 0;
97-
top: 0;
98-
z-index: 200;
99-
}
100-
.ui-mobile-touch-overflow.ui-page.ui-native-fixed .ui-footer {
101-
top: auto;
102-
bottom: 0;
103-
}
104-
.ui-mobile-touch-overflow.ui-native-fixed .ui-content {
105-
padding-top: 2.5em;
106-
padding-bottom: 3em;
107-
top: 0;
108-
bottom: 0;
109-
height: auto;
110-
position: absolute;
111-
}
112-
.ui-mobile-touch-overflow.ui-native-fullscreen .ui-content {
113-
padding-top: 0;
114-
padding-bottom: 0;
115-
}
116-
.ui-mobile-touch-overflow.ui-native-fullscreen .ui-header,
117-
.ui-mobile-touch-overflow.ui-native-fullscreen .ui-footer {
118-
opacity: .9;
119-
}
120-
.ui-native-bars-hidden {
121-
display: none;
122-
}
12352

12453
/* icons sizing */
12554
.ui-icon { width: 18px; height: 18px; }
12655

127-
/* fullscreen class on ui-content div */
128-
.ui-fullscreen { }
129-
.ui-fullscreen img { max-width: 100%; }
56+
/* fluid images */
57+
.ui-mobile img {
58+
max-width: 100%;
59+
}
13060

13161
/* non-js content hiding */
13262
.ui-nojs { position: absolute; left: -9999px; }

‎css/structure/jquery.mobile.fixedToolbar.css

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/* fixed page header & footer configuration */
2+
.ui-header-fixed,
3+
.ui-footer-fixed {
4+
left: 0;
5+
right: 0;
6+
position: fixed;
7+
z-index: 1000;
8+
-webkit-transform: translateZ(0); /* Force header/footer rendering to go through the same rendering pipeline as native page scrolling. */
9+
}
10+
.ui-header-fixed {
11+
top: 0;
12+
}
13+
.ui-footer-fixed {
14+
bottom: 0;
15+
}
16+
.ui-header-fullscreen,
17+
.ui-footer-fullscreen {
18+
opacity: .9;
19+
}
20+
.ui-page-header-fixed {
21+
padding-top: 2.5em;
22+
}
23+
.ui-page-footer-fixed {
24+
padding-bottom: 3em;
25+
}
26+
.ui-page-header-fullscreen .ui-content,
27+
.ui-page-footer-fullscreen .ui-content {
28+
padding: 0;
29+
}
30+
.ui-fixed-hidden {
31+
position: absolute;
32+
}
33+
.ui-page-header-fullscreen .ui-fixed-hidden,
34+
.ui-page-footer-fullscreen .ui-fixed-hidden {
35+
left: -99999em;
36+
}
37+
.ui-footer-duplicate {
38+
display: none;
39+
}

‎css/structure/jquery.mobile.forms.slider.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ select.ui-slider-switch { display: none; }
55
div.ui-slider { position: relative; display: inline-block; overflow: visible; height: 15px; padding: 0; margin: 0 2% 0 20px; top: 4px; width: 65%; }
66
div.ui-slider-switch { width: 99.8%; }
77
.ui-field-contain div.ui-slider-switch { width: 50%; }
8-
a.ui-slider-handle { position: absolute; z-index: 10; top: 50%; width: 28px; height: 28px; margin-top: -15px; margin-left: -15px; outline: 0; }
8+
a.ui-slider-handle { position: absolute; z-index: 1; top: 50%; width: 28px; height: 28px; margin-top: -15px; margin-left: -15px; outline: 0; }
99
a.ui-slider-handle .ui-btn-inner { padding-left: 0; padding-right: 0; }
1010
@media all and (min-width: 480px){
1111
.ui-field-contain label.ui-slider { vertical-align: top; display: inline-block; width: 20%; margin: 0 2% 0 0; }
@@ -21,7 +21,7 @@ div.ui-slider-switch div.ui-slider-labelbg-b { width: 60%; height: 100%; right:
2121
.ui-slider-switch-a div.ui-slider-labelbg-a, .ui-slider-switch-b div.ui-slider-labelbg-b { z-index: -1; }
2222
.ui-slider-switch-a div.ui-slider-labelbg-b, .ui-slider-switch-b div.ui-slider-labelbg-a { z-index: 0; }
2323

24-
div.ui-slider-switch a.ui-slider-handle { z-index: 20; width: 100%; height: 30px; margin-top: -17px; margin-left: -100%; }
24+
div.ui-slider-switch a.ui-slider-handle { z-index: 1; width: 100%; height: 30px; margin-top: -17px; margin-left: -100%; }
2525
span.ui-slider-label { width: 100%; position: absolute; height: 32px; font-size: 16px; text-align: center; line-height: 1.8; background: none; border-color: transparent; }
2626
span.ui-slider-label-a { left: -100%; margin-right: -1px }
2727
span.ui-slider-label-b { right: -100%; margin-left: -1px }

‎css/structure/jquery.mobile.headerfooter.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@import url( "../../structure/jquery.mobile.transitions.turn.css" );
1111
@import url( "../../structure/jquery.mobile.transitions.flow.css" );
1212
@import url( "../../structure/jquery.mobile.grids.css" );
13-
@import url( "../../structure/jquery.mobile.headerfooter.css" );
13+
@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
1414
@import url( "../../structure/jquery.mobile.navbar.css" );
1515
@import url( "../../structure/jquery.mobile.button.css" );
1616
@import url( "../../structure/jquery.mobile.collapsible.css" );

‎docs/toolbars/bars-fullscreen.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
</head>
1313
<body>
1414

15-
<div data-role="page" data-fullscreen="true" class="type-interior">
15+
<div data-role="page" class="type-interior">
1616

17-
<div data-role="header" data-position="fixed" data-theme="f">
17+
<div data-role="header" data-position="fixed" data-theme="f" data-fullscreen="true">
1818
<h1>Fullscreen fixed header</h1>
1919
<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse" class="ui-btn-right jqm-home">Home</a>
2020
</div>
@@ -56,7 +56,7 @@ <h3>More in this section</h3>
5656

5757
</div><!-- /content -->
5858

59-
<div data-role="footer" class="footer-docs" data-theme="a" data-position="fixed">
59+
<div data-role="footer" class="footer-docs" data-theme="a" data-position="fixed" data-fullscreen="true">
6060
<h1>Fullscreen Fixed Footer</h1>
6161
</div>
6262

‎js/index.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
'jquery.mobile.buttonMarkup.js',
4646
'jquery.mobile.controlGroup.js',
4747
'jquery.mobile.links.js',
48-
'jquery.mobile.fixHeaderFooter.js',
49-
'jquery.mobile.fixHeaderFooter.native.js',
48+
'jquery.mobile.fixedToolbar.js',
5049
'jquery.mobile.init.js'
5150
);
5251

‎js/jquery.mobile.buttonMarkup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ $.fn.buttonMarkup = function( options ) {
8383
el.removeClass( "ui-link" ).addClass( buttonClass );
8484

8585
buttonInner.className = innerClass;
86+
buttonInner.setAttribute("aria-hidden", "true");
8687

8788
buttonText.className = textClass;
8889
buttonInner.appendChild( buttonText );

‎js/jquery.mobile.core.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ define( [ "jquery", "jquery.mobile.widget" ], function( $ ) {
4545

4646
// Minimum scroll distance that will be remembered when returning to a page
4747
minScrollBack: 10,
48+
49+
// DEPRECATED: the following property is no longer in use, but defined until 2.0 to prevent conflicts
50+
touchOverflowEnabled: false,
4851

4952
// Set default dialog transition - 'none' for no transitions
5053
defaultDialogTransition: "pop",

‎js/jquery.mobile.degradeInputs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $.mobile.page.prototype.options.degradeInputs = {
2626
//auto self-init widgets
2727
$( document ).bind( "pagecreate create", function( e ){
2828

29-
var page = $.mobile.closestPageData( $(e.target) );
29+
var page = $(e.target).closest(':jqmData(role="page")').data("page"), options;
3030

3131
if( !page ) {
3232
return;

0 commit comments

Comments
 (0)