jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug in dialog store

Browse Source
This commit is contained in:
Stefan Zermatten
2020-10-16 10:35:51 +02:00
parent 7aa3e5a217
commit e3bf6557ec
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/imports/ui/dialogStack/dialogStackStore.js
View File

@@ -20,10 +20,10 @@ const dialogStackStore = {
}); });
updateHistory(); updateHistory();
}, },
replaceDialog(stat, {component, data, elementId, callback}){ replaceDialog(state, {component, data, elementId, callback}){
const _id = Random.id(); const _id = Random.id();
if (!state.dialogs.length){ if (!state.dialogs.length){
throw new Meteor.Error("can't replace dialog if no dialogs are open"); throw new Meteor.Error('can\'t replace dialog if no dialogs are open');
} }
state.dialogs.$set(0, { state.dialogs.$set(0, {
_id, _id,
@@ -52,10 +52,10 @@ const dialogStackStore = {
actions: { actions: {
popDialogStack(context, result){ popDialogStack(context, result){
if (history && history.state && history.state.openDialogs){ if (history && history.state && history.state.openDialogs){
context.commit("setCurrentResult", result); context.commit('setCurrentResult', result);
history.back(); history.back();
} else { } else {
context.commit("popDialogStackMutation", result); context.commit('popDialogStackMutation', result);
} }
} }
} }
@@ -74,7 +74,7 @@ const updateHistory = function(){
if (!history.state || !_.isFinite(history.state.openDialogs)){ if (!history.state || !_.isFinite(history.state.openDialogs)){
let newState = _.clone(history.state) || {}; let newState = _.clone(history.state) || {};
newState.openDialogs = 0; newState.openDialogs = 0;
history.replaceState(newState, ""); history.replaceState(newState, '');
} }
const numDialogs = dialogStackStore.state.dialogs.length; const numDialogs = dialogStackStore.state.dialogs.length;
@@ -93,14 +93,14 @@ const updateHistory = function(){
// but should replace with correct count // but should replace with correct count
let newState = _.clone(history.state) || {}; let newState = _.clone(history.state) || {};
newState.openDialogs = dialogStackStore.state.dialogs.length; newState.openDialogs = dialogStackStore.state.dialogs.length;
history.replaceState(newState, ""); history.replaceState(newState, '');
} }
} else if (numDialogs > 0 && stateDialogs === 0){ } else if (numDialogs > 0 && stateDialogs === 0){
// On the zero state, push a dialog count // On the zero state, push a dialog count
history.pushState({openDialogs: numDialogs}, ""); history.pushState({openDialogs: numDialogs}, '');
} else { } else {
console.warn( console.warn(
"History could not be updated correctly, unexpected case", 'History could not be updated correctly, unexpected case',
{stateDialogs, numDialogs}, {stateDialogs, numDialogs},
) )
} }