Skip to content

Commit 68f245d

Browse files
committed
Panel: updates from @zachleat PR jquery-archive#5422 Add css back in for overflow-x, fixes issue with firefox open, removes unneeded class. Update docs to reflect changes
1 parent da342b1 commit 68f245d

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

css/structure/jquery.mobile.panel.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@
195195
transform: translateX(-17em);
196196
left: 0;
197197
}
198+
/* while open, page x overflow is disabled */
199+
.ui-page-active.ui-panel-page-block {
200+
overflow-x:hidden;
201+
}
198202

199203
/* wrap push on wide viewports once open */
200204
@media (min-width:55em){

docs/panels/options.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ <h3>Classes Option</h3>
107107
<dt><code>classes.pagePanel</code> default: "ui-page-panel"</dt>
108108
<dd>Class added to the page container when a panel widget is present.</dd>
109109

110-
<dt><code>classes.pageChildAnimations</code> default: "ui-page-panel-animate"</dt>
111-
<dd>Class added to the page container when panel animations are on.</dd>
112-
113110
<dt><code>classes.cssTransform3d</code> default: "ui-panel-3dtransforms"</dt>
114111
<dd>Class added to the page container when the 3D transform feature test is true.</dd>
115112
</dl>

js/widgets/panel.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ $.widget( "mobile.panel", $.mobile.widget, {
2525
contentWrapOpenComplete: "ui-panel-content-wrap-open-complete",
2626
pageBlock: "ui-panel-page-block",
2727
pagePanel: "ui-page-panel",
28-
pageChildAnimations: "ui-page-panel-animate",
2928
cssTransform3d: "ui-panel-3dtransforms"
3029
},
3130
animate: true,
@@ -66,7 +65,6 @@ $.widget( "mobile.panel", $.mobile.widget, {
6665
// if animating, add the class to do so
6766
if ( $.support.cssTransform3d && self.options.animate ) {
6867
this.element.add( self._wrapper ).addClass( "ui-panel-animate" );
69-
self._page.addClass( this.options.classes.pageChildAnimations );
7068
}
7169

7270
self._bindCloseEvents();
@@ -213,6 +211,7 @@ $.widget( "mobile.panel", $.mobile.widget, {
213211
self.element.add( self._wrapper ).unbind( self._transitionEndEvents, complete );
214212
self.element.addClass( o.classes.openComplete );
215213
self._wrapper.addClass( o.classes.contentWrapOpenComplete );
214+
self._page.addClass( o.classes.pageBlock );
216215
self._positionPanel();
217216
self._bindFixListener();
218217
self._trigger( "open" );
@@ -228,7 +227,6 @@ $.widget( "mobile.panel", $.mobile.widget, {
228227
} else{
229228
setTimeout( complete , 0 );
230229
}
231-
self._page.addClass( o.classes.pageBlock );
232230
self.element.removeClass( o.classes.panelClosed );
233231
self.element.addClass( o.classes.panelOpen );
234232
self._contentWrapOpenClasses = self._getPosDisplayClasses( o.classes.contentWrap );
@@ -290,8 +288,7 @@ $.widget( "mobile.panel", $.mobile.widget, {
290288
// create
291289
if( !hasOtherSiblingPanels ) {
292290
this._wrapper.children().unwrap();
293-
this._page.removeClass( classes.pageChildAnimations )
294-
.find( "a" ).unbind( "panelopen panelclose" );
291+
this._page.find( "a" ).unbind( "panelopen panelclose" );
295292
} else if( this._open ) {
296293
this._wrapper.removeClass( [ classes.contentWrapOpen, classes.contentWrapOpenComplete ].join( " " ) );
297294
}

0 commit comments

Comments
 (0)