merge dev

This commit is contained in:
_Bastler
2021-06-24 08:56:29 +02:00
parent f82b106dce
commit 418dd4a6c5
4 changed files with 226 additions and 218 deletions
+1
View File
@@ -107,6 +107,7 @@ class IframeListener {
} else if (payload.type === 'openPopup' && isOpenPopupEvent(payload.data)) {
this._openPopupStream.next(payload.data);
} else if (payload.type === 'closePopup' && isClosePopupEvent(payload.data)) {
console.log(payload);
this._closePopupStream.next(payload.data);
}
else if (payload.type === 'openTab' && isOpenTabEvent(payload.data)) {
+3 -2
View File
@@ -36,7 +36,7 @@ class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventureUiComma
})];
openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[]): Popup {
openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[], input: boolean = false): Popup {
popupId++;
const popup = new Popup(popupId);
const btnMap = new Map<number, () => void>();
@@ -63,7 +63,8 @@ class WorkAdventureUiCommands extends IframeApiContribution<WorkAdventureUiComma
label: button.label,
className: button.className
};
})
}),
input : input
}
});
File diff suppressed because it is too large Load Diff