Commit 9b0b3bce authored by Sven Franck's avatar Sven Franck

updated to latest JQM (1.4.0pre)

parent 6a5b9c7f
/*! /*!
* jQuery Mobile 1.4.0pre * jQuery Mobile 1.4.0pre
* Git HEAD hash: f07ed1c95b486eedb4a8a170b0d2ee1d8f331050 <> Date: Thu Oct 24 2013 11:59:48 UTC * Git HEAD hash: e27a97c01c44f70da83d3544cb9c064609357e69 <> Date: Fri Nov 1 2013 15:22:56 UTC
* http://jquerymobile.com * http://jquerymobile.com
* *
* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors * Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors
......
/*! /*!
* jQuery Mobile 1.4.0pre * jQuery Mobile 1.4.0pre
* Git HEAD hash: f07ed1c95b486eedb4a8a170b0d2ee1d8f331050 <> Date: Thu Oct 24 2013 11:59:48 UTC * Git HEAD hash: e27a97c01c44f70da83d3544cb9c064609357e69 <> Date: Fri Nov 1 2013 15:22:56 UTC
* http://jquerymobile.com * http://jquerymobile.com
* *
* Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors * Copyright 2010, 2013 jQuery Foundation, Inc. and other contributors
...@@ -9250,7 +9250,7 @@ $.widget( "mobile.flipswitch", $.extend({ ...@@ -9250,7 +9250,7 @@ $.widget( "mobile.flipswitch", $.extend({
clearButton: function() { clearButton: function() {
return $( "<a href='#' tabindex='-1' class='ui-input-clear ui-btn ui-icon-delete ui-btn-icon-notext ui-corner-all" + return $( "<a href='#' class='ui-input-clear ui-btn ui-icon-delete ui-btn-icon-notext ui-corner-all" +
"' title='" + this.options.clearBtnText + "'>" + this.options.clearBtnText + "</a>" ); "' title='" + this.options.clearBtnText + "'>" + this.options.clearBtnText + "</a>" );
}, },
...@@ -12510,7 +12510,6 @@ $.widget( "mobile.panel", { ...@@ -12510,7 +12510,6 @@ $.widget( "mobile.panel", {
_panelID: el.attr( "id" ), _panelID: el.attr( "id" ),
_closeLink: el.find( ":jqmData(rel='close')" ), _closeLink: el.find( ":jqmData(rel='close')" ),
_parentPage: ( parentPage.length > 0 ) ? parentPage : false, _parentPage: ( parentPage.length > 0 ) ? parentPage : false,
_openedPage: null,
_page: this._getPage, _page: this._getPage,
_panelInner: this._getPanelInner(), _panelInner: this._getPanelInner(),
_wrapper: this._getWrapper, _wrapper: this._getWrapper,
...@@ -12558,7 +12557,7 @@ $.widget( "mobile.panel", { ...@@ -12558,7 +12557,7 @@ $.widget( "mobile.panel", {
}, },
_getPage: function() { _getPage: function() {
var page = this._openedPage || (this._parentPage ? this._parentPage : $( "." + $.mobile.activePageClass )); var page = this._parentPage ? this._parentPage : $( "." + $.mobile.activePageClass );
return page; return page;
}, },
...@@ -12798,8 +12797,6 @@ $.widget( "mobile.panel", { ...@@ -12798,8 +12797,6 @@ $.widget( "mobile.panel", {
self._bindFixListener(); self._bindFixListener();
self._trigger( "open" ); self._trigger( "open" );
self._openedPage = self._page();
}; };
self._trigger( "beforeopen" ); self._trigger( "beforeopen" );
...@@ -12817,7 +12814,6 @@ $.widget( "mobile.panel", { ...@@ -12817,7 +12814,6 @@ $.widget( "mobile.panel", {
}, },
close: function( immediate ) { close: function( immediate ) {
if ( this._open ) { if ( this._open ) {
var self = this, var self = this,
o = this.options, o = this.options,
...@@ -12863,11 +12859,10 @@ $.widget( "mobile.panel", { ...@@ -12863,11 +12859,10 @@ $.widget( "mobile.panel", {
self._fixPanel(); self._fixPanel();
self._unbindFixListener(); self._unbindFixListener();
$.mobile.resetActivePageHeight(); $.mobile.resetActivePageHeight();
self._page().jqmRemoveData( "panel" ); self._page().jqmRemoveData( "panel" );
self._trigger( "close" ); self._trigger( "close" );
self._openedPage = null;
}; };
self._trigger( "beforeclose" ); 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