Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Mobile] Bug 35768.

Browse source
This commit is contained in:
Julia Radzhabova 2017-09-08 13:41:04 +03:00
parent a1095fb888
commit f552caed5f
3 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -456,6 +456,9 @@ define([
if (this._isDocReady) if (this._isDocReady)
return; return;
if (this._state.openDlg)
uiApp.closeModal(this._state.openDlg);
var me = this, var me = this,
value; value;
@ -980,8 +983,10 @@ define([
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(advOptions) {
if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var type = advOptions.asc_getOptionId(),
me = this, modal; me = this;
if (type == Asc.c_oAscAdvancedOptionsID.TXT) { if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
var picker, var picker,
pages = [], pages = [],
@ -996,7 +1001,7 @@ define([
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
modal = uiApp.modal({ me._state.openDlg = uiApp.modal({
title: me.advTxtOptions, title: me.advTxtOptions,
text: '', text: '',
afterText: afterText:
@ -1020,6 +1025,7 @@ define([
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} }
} }
me._state.openDlg = null;
} }
} }
] ]
@ -1037,8 +1043,8 @@ define([
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(me._state.openDlg).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(me._state.openDlg).outerHeight() / 2) + 'px'
}); });
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) { } else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
@ -1046,7 +1052,7 @@ define([
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
modal = uiApp.modal({ me._state.openDlg = uiApp.modal({
title: me.advDRMOptions, title: me.advDRMOptions,
text: me.advDRMEnterPassword, text: me.advDRMEnterPassword,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>', afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
@ -1055,20 +1061,21 @@ define([
text: 'OK', text: 'OK',
bold: true, bold: true,
onClick: function () { onClick: function () {
var password = $(modal).find('.modal-text-input[name="modal-password"]').val(); var password = $(me._state.openDlg).find('.modal-text-input[name="modal-password"]').val();
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
if (!me._isDocReady) { if (!me._isDocReady) {
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} }
me._state.openDlg = null;
} }
} }
] ]
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(me._state.openDlg).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(me._state.openDlg).outerHeight() / 2) + 'px'
}); });
} }
}, },

16
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -443,6 +443,9 @@ define([
if (this._isDocReady) if (this._isDocReady)
return; return;
if (this._state.openDlg)
uiApp.closeModal(this._state.openDlg);
var me = this, var me = this,
value; value;
@ -993,15 +996,17 @@ define([
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(advOptions) {
if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var type = advOptions.asc_getOptionId(),
me = this, modal; me = this;
if (type == Asc.c_oAscAdvancedOptionsID.DRM) { if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
$(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask); $(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask);
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
modal = uiApp.modal({ me._state.openDlg = uiApp.modal({
title: me.advDRMOptions, title: me.advDRMOptions,
text: me.advDRMEnterPassword, text: me.advDRMEnterPassword,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>', afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
@ -1010,20 +1015,21 @@ define([
text: 'OK', text: 'OK',
bold: true, bold: true,
onClick: function () { onClick: function () {
var password = $(modal).find('.modal-text-input[name="modal-password"]').val(); var password = $(me._state.openDlg).find('.modal-text-input[name="modal-password"]').val();
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
if (!me._isDocReady) { if (!me._isDocReady) {
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} }
me._state.openDlg = null;
} }
} }
] ]
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(me._state.openDlg).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(me._state.openDlg).outerHeight() / 2) + 'px'
}); });
} }
}, },

23
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -455,6 +455,9 @@ define([
if (this._isDocReady) if (this._isDocReady)
return; return;
if (this._state.openDlg)
uiApp.closeModal(this._state.openDlg);
var me = this, var me = this,
value; value;
@ -1099,8 +1102,10 @@ define([
}, },
onAdvancedOptions: function(advOptions) { onAdvancedOptions: function(advOptions) {
if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(), var type = advOptions.asc_getOptionId(),
me = this, modal; me = this;
if (type == Asc.c_oAscAdvancedOptionsID.CSV) { if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
var picker, var picker,
pages = [], pages = [],
@ -1115,7 +1120,7 @@ define([
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
modal = uiApp.modal({ me._state.openDlg = uiApp.modal({
title: me.advCSVOptions, title: me.advCSVOptions,
text: '', text: '',
afterText: afterText:
@ -1141,6 +1146,7 @@ define([
me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
} }
} }
me._state.openDlg = null;
} }
} }
] ]
@ -1169,15 +1175,15 @@ define([
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(me._state.openDlg).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(me._state.openDlg).outerHeight() / 2) + 'px'
}); });
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) { } else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
$(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask); $(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask);
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
modal = uiApp.modal({ me._state.openDlg = uiApp.modal({
title: me.advDRMOptions, title: me.advDRMOptions,
text: me.advDRMEnterPassword, text: me.advDRMEnterPassword,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>', afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
@ -1186,20 +1192,21 @@ define([
text: 'OK', text: 'OK',
bold: true, bold: true,
onClick: function () { onClick: function () {
var password = $(modal).find('.modal-text-input[name="modal-password"]').val(); var password = $(me._state.openDlg).find('.modal-text-input[name="modal-password"]').val();
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password)); me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
if (!me._isDocReady) { if (!me._isDocReady) {
me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
} }
me._state.openDlg = null;
} }
} }
] ]
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(me._state.openDlg).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(me._state.openDlg).outerHeight() / 2) + 'px'
}); });
} }
}, },