Added separate return element ids to dialogs
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
:key="dialog._id"
|
:key="dialog._id"
|
||||||
class="dialog"
|
class="dialog"
|
||||||
:data-element-id="dialog.elementId"
|
:data-element-id="dialog.elementId"
|
||||||
|
:data-return-element-id="dialog.returnElementId"
|
||||||
:data-index="index"
|
:data-index="index"
|
||||||
:style="getDialogStyle(index)"
|
:style="getDialogStyle(index)"
|
||||||
:elevation="6"
|
:elevation="6"
|
||||||
@@ -94,8 +95,13 @@
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
leave(target, done){
|
leave(target, done){
|
||||||
let elementId = target.attributes['data-element-id'].value;
|
let elementId;
|
||||||
let source = document.getElementById(elementId);
|
if (target.attributes['data-return-element-id']) {
|
||||||
|
elementId = target.attributes['data-return-element-id'].value;
|
||||||
|
} else {
|
||||||
|
elementId = target.attributes['data-element-id'].value;
|
||||||
|
}
|
||||||
|
let source = document.getElementById(elementId);
|
||||||
let index = target.attributes['data-index'].value;
|
let index = target.attributes['data-index'].value;
|
||||||
if (index != 0){
|
if (index != 0){
|
||||||
// If we aren't the only dialog, we'll need compensate for offset
|
// If we aren't the only dialog, we'll need compensate for offset
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const dialogStackStore = {
|
|||||||
currentResult: null,
|
currentResult: null,
|
||||||
},
|
},
|
||||||
mutations: {
|
mutations: {
|
||||||
pushDialogStack(state, {component, data, elementId, returnElement, callback}){
|
pushDialogStack(state, {component, data, elementId, returnElementId, callback}){
|
||||||
// Generate a new _id so that Vue knows how to shuffle the array
|
// Generate a new _id so that Vue knows how to shuffle the array
|
||||||
const _id = Random.id();
|
const _id = Random.id();
|
||||||
state.dialogs.push({
|
state.dialogs.push({
|
||||||
@@ -15,7 +15,7 @@ const dialogStackStore = {
|
|||||||
component,
|
component,
|
||||||
data,
|
data,
|
||||||
elementId,
|
elementId,
|
||||||
returnElement,
|
returnElementId,
|
||||||
callback,
|
callback,
|
||||||
});
|
});
|
||||||
updateHistory();
|
updateHistory();
|
||||||
|
|||||||
Reference in New Issue
Block a user