macro: open document without macros enabled
problem: when user selected disable macro in the opening dialog document used to close and return to integrator but now cancel button in csv import dialog is hidden, so no need to distinguish there and we can continue to load without macros In addition we still close the file if user clicks "X" button on title bar Signed-off-by: Pranam Lashkari <lpranam@collabora.com> Change-Id: Ie0c7d77954e099cb3c8a72c400c688b3ae1343c7pull/8932/head
parent
1895938524
commit
ae27e8291c
|
@ -282,8 +282,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
|
|||
// returns docnotloaded error. Instead of this we can return to the integration
|
||||
if (!builder.map._docLoaded &&
|
||||
!window._firstDialogHandled &&
|
||||
((object.id === 'cancel' || eventType === 'close') ||
|
||||
(objectType === 'responsebutton' && (data == 0 || data == 7)))) {
|
||||
(eventType === 'close' ||
|
||||
(objectType === 'responsebutton' && data == 7))) {
|
||||
window.onClose();
|
||||
}
|
||||
switch (typeof data) {
|
||||
|
|
Loading…
Reference in New Issue