Compare commits

..

2 Commits
1.2.2 ... 1.2.4

Author SHA1 Message Date
Stefan Zermatten
d92bb0f4d4 Replace tap event with click event for mini-FABs
fixes #68, probably
2017-05-16 10:36:40 +02:00
Stefan Zermatten
abcfe57add Fixed results not being used when popping dialogs
Fixes #66
2017-05-11 11:08:00 +02:00
2 changed files with 8 additions and 4 deletions

View File

@@ -17,11 +17,14 @@ pushDialogStack = function({template, data, element, returnElement, callback}){
updateHistory(); updateHistory();
}; };
var currentResult;
popDialogStack = function(result){ popDialogStack = function(result){
if (history && history.state && history.state.openDialogs){ if (history && history.state && history.state.openDialogs){
currentResult = result;
history.back(); history.back();
} else { } else {
popDialogStackAction(); popDialogStackAction(result);
} }
} }
@@ -29,7 +32,8 @@ window.onpopstate = function(event){
let state = event.state; let state = event.state;
let numDialogs = dialogs._array.length; let numDialogs = dialogs._array.length;
if (_.isFinite(state.openDialogs) && numDialogs > state.openDialogs){ if (_.isFinite(state.openDialogs) && numDialogs > state.openDialogs){
popDialogStackAction(); popDialogStackAction(currentResult);
currentResult = undefined;
} }
} }

View File

@@ -25,10 +25,10 @@ Template.fabMenu.helpers({
}); });
Template.fabMenu.events({ Template.fabMenu.events({
"tap .expand-menu": function(event, instance) { "click .expand-menu": function(event, instance) {
instance.active.set(!instance.active.get()); instance.active.set(!instance.active.get());
}, },
"tap .mini-holder paper-fab": function(event, instance) { "click .mini-holder paper-fab": function(event, instance) {
instance.active.set(false); instance.active.set(false);
}, },
}); });