Commit 6c88b1d1 authored by Sven Franck's avatar Sven Franck

bugfix: re-applied unmergerd JQM fix to fix global panels not resetting fromPage

parent fb6a96a7
/* HACK */
/* listview data-enhanced true */
/* checkboxradio tabindex */
/* panel back https://github.com/frequent/jquery-mobile/commit/edfb7387c9924da065f3addb5ffcd5bb0fb851ae */
/*!
* jQuery Mobile 1.4.0pre
* Git HEAD hash: e27a97c01c44f70da83d3544cb9c064609357e69 <> Date: Fri Nov 1 2013 15:22:56 UTC
......@@ -12536,6 +12541,7 @@ $.widget( "mobile.panel", {
_closeLink: el.find( ":jqmData(rel='close')" ),
_parentPage: ( parentPage.length > 0 ) ? parentPage : false,
_page: this._getPage,
_openedPage: null,
_panelInner: this._getPanelInner(),
_wrapper: this._getWrapper,
_fixedToolbars: this._getFixedToolbars
......@@ -12582,7 +12588,7 @@ $.widget( "mobile.panel", {
},
_getPage: function() {
var page = this._parentPage ? this._parentPage : $( "." + $.mobile.activePageClass );
var page = this._openedPage || (this._parentPage ? this._parentPage : $( "." + $.mobile.activePageClass ));
return page;
},
......@@ -12822,6 +12828,8 @@ $.widget( "mobile.panel", {
self._bindFixListener();
self._trigger( "open" );
self._openedPage = self._page();
};
self._trigger( "beforeopen" );
......@@ -12888,6 +12896,8 @@ $.widget( "mobile.panel", {
self._page().jqmRemoveData( "panel" );
self._trigger( "close" );
self._openedPage = null;
};
self._trigger( "beforeclose" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment