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

Commit 292b1f8

Browse files
author
Scott Jehl
committed
added a workaround to prevent conflicts with fixedtoolbars - the css workaround is in the fixedtoolbar css
1 parent e72d2c1 commit 292b1f8

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

css/structure/jquery.mobile.fixedToolbar.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@
4949
.ui-footer-fixed .ui-btn {
5050
z-index: 10;
5151
}
52+
/* workarounds for other widgets */
5253
.ui-android-2x-fixed .ui-li-has-thumb {
5354
-webkit-transform: translate3d(0,0,0);
55+
}
56+
.ui-panel-content-wrap .ui-header-fixed {
57+
-webkit-transform: translateY(-100%);
58+
}
59+
.ui-panel-content-wrap-closed .ui-header-fixed {
60+
-webkit-transform: none;
5461
}

docs/panels/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h3>Default panel options</h3>
3434

3535

3636

37-
<div data-role="header" data-theme="f">
37+
<div data-role="header" data-theme="f" data-position="fixed">
3838
<h1>Panels</h1>
3939
<a href="../../" data-icon="home" data-iconpos="notext" data-direction="reverse">Home</a>
4040
<a href="../nav.html" data-icon="search" data-iconpos="notext" data-rel="dialog" data-transition="fade">Search</a>

js/widgets/panel.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ $.widget( "mobile.panel", $.mobile.widget, {
2020
openComplete: "ui-panel-open-complete",
2121
contentWrap: "ui-panel-content-wrap",
2222
contentWrapOpen: "ui-panel-content-wrap-open",
23+
contentWrapClosed: "ui-panel-content-wrap-closed",
2324
panelUnfixed: "ui-panel-unfixed",
2425
contentWrapOpenComplete: "ui-panel-content-wrap-open-complete",
2526
pageBlock: "ui-panel-page-block",
@@ -57,6 +58,7 @@ $.widget( "mobile.panel", $.mobile.widget, {
5758
self._page = $el.closest( ":jqmData(role='page')" );
5859
self._wrapper = _getWrapper();
5960
self._addPanelClasses();
61+
self._wrapper.addClass( this.options.classes.contentWrapClosed );
6062

6163
// if animating, add the class to do so
6264
if ( $.support.cssTransitions && self.options.animate ) {
@@ -217,6 +219,7 @@ $.widget( "mobile.panel", $.mobile.widget, {
217219
self.element.removeClass( o.classes.panelClosed );
218220
self.element.addClass( o.classes.panelOpen );
219221
self._contentWrapOpenClasses = self._getPosDisplayClasses( o.classes.contentWrap );
222+
self._wrapper.removeClass( o.classes.contentWrapClosed );
220223
self._wrapper.addClass( self._contentWrapOpenClasses + " " + o.classes.contentWrapOpen );
221224
self._modalOpenClasses = self._getPosDisplayClasses( o.classes.modal ) + " " + o.classes.modalOpen;
222225
self._modal.addClass( self._modalOpenClasses );
@@ -232,6 +235,7 @@ $.widget( "mobile.panel", $.mobile.widget, {
232235
self.element.add( self._wrapper ).unbind( self._transitionEndEvents , complete );
233236
self.element.addClass( o.classes.panelClosed );
234237
self._wrapper.removeClass( self._contentWrapOpenClasses );
238+
self._wrapper.addClass( o.classes.contentWrapClosed );
235239
self._page.removeClass( self.options.classes.pageBlock );
236240
self._fixPanel();
237241
self._unbindFixListener();

0 commit comments

Comments
 (0)