Commit f6cc9419 authored by Sven Franck's avatar Sven Franck

fixed popup close triggering 2x back transitions

parent 5c1e4b25
...@@ -5158,10 +5158,6 @@ ...@@ -5158,10 +5158,6 @@
obj.portal_type = pass.type; obj.portal_type = pass.type;
// make sure to overwrite existing files, so try to fetch... // make sure to overwrite existing files, so try to fetch...
// TODO: is there no easier way to check whether to put/post // TODO: is there no easier way to check whether to put/post
console.log(obj)
console.log(flux)
console.log(pass)
promises[i] = store.post(obj) promises[i] = store.post(obj)
.then(function(answer) { .then(function(answer) {
return answer; return answer;
...@@ -5518,6 +5514,10 @@ ...@@ -5518,6 +5514,10 @@
parsed_url = $.mobile.path.parseUrl(clean_url); parsed_url = $.mobile.path.parseUrl(clean_url);
// overwrite :-) // overwrite :-)
// NOTE: remove initialDist, otherwise closing popups will trigger
// double backward transition.
delete $.mobile.navigate.history.initialDst;
// NOTE: Correctly set index as first page in JQM history
$.mobile.navigate.history.stack[0].hash = ""; $.mobile.navigate.history.stack[0].hash = "";
$.mobile.navigate.history.stack[0].url = clean_url; $.mobile.navigate.history.stack[0].url = clean_url;
$.mobile.path.documentUrl = parsed_url; $.mobile.path.documentUrl = parsed_url;
...@@ -5557,15 +5557,11 @@ ...@@ -5557,15 +5557,11 @@
*/ */
//TODO: merge with pagebindings, so all jQuery is at one place! //TODO: merge with pagebindings, so all jQuery is at one place!
app.setGlobalBindings = function () { app.setGlobalBindings = function () {
console.log("SETTING BINDING")
$(document) $(document)
.enhanceWithin() .enhanceWithin()
// generate dynamic pages // generate dynamic pages
.on("pagebeforechange", function (e, data) { .on("pagebeforechange", function (e, data) {
console.log("PBC")
console.log(e)
console.log(data)
app.parsePage(e, data); app.parsePage(e, data);
}) })
......
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