Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-04-24 08:04:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Manually re-applying Scott’s changes from commit 4b74d9d.

Browse source
This commit is contained in:
Mat Marquis 2011-12-21 17:08:23 -05:00 committed by Gabriel Schulhof
parent 29aff3a73b
commit 97b6d1bc06
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
js/jquery.mobile.popup.js
View file

@ -188,6 +188,17 @@ $.widget("mobile.popup", $.mobile.widget, {
return { x : newleft, y : newtop };
},
_bindHashChange: function(){
var self = this;
$( window ).one( "hashchange.popup", function(){
self.close( true );
});
},
_unbindHashChange: function(){
$( window ).unbind( "hashchange.popup" );
},
open: function(x, y) {
if (!this._isOpen) {
@ -213,12 +224,20 @@ $.widget("mobile.popup", $.mobile.widget, {
.animationComplete(function() {
self._ui.screen.height($(document).height());
});
// listen for hashchange that will occur when we set it to null dialog hash
$( window ).one( "hashchange", function(){
self._bindHashChange();
});
// set hash to non-linkable dialog url
$.mobile.path.set( "&ui-state=dialog" );
this._isOpen = true;
}
},
close: function() {
close: function( fromHash ) {
if (this._isOpen) {
var self = this,
hideScreen = function() {
@ -241,6 +260,14 @@ $.widget("mobile.popup", $.mobile.widget, {
this._ui.screen.animate({opacity: 0.0}, "fast", hideScreen);
else
hideScreen();
// unbind listener that comes with opening popup
this._unbindHashChange();
// if the close event did not come from an internal hash listener, reset URL back
if( !fromHash ){
window.history.back();
}
}
}
});