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

[mobile] Fix Bug 37485

Browse source
This commit is contained in:
Julia Radzhabova 2018-05-25 11:32:48 +03:00
parent 51af2cb6ad
commit c98e8bce7f
6 changed files with 81 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -649,6 +649,7 @@ define([
me.appOptions.isOffline = me.api.asc_isOffline();
me.appOptions.isReviewOnly = (me.permissions.review === true) && (me.permissions.edit === false);
me.appOptions.canRequestEditRights = me.editorConfig.canRequestEditRights;
me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
me.appOptions.canEdit = (me.permissions.edit !== false || me.permissions.review === true) && // can edit or review
(me.editorConfig.canRequestEditRights || me.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
(!me.appOptions.isReviewOnly || me.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
@ -1092,12 +1093,7 @@ define([
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: [
{
var buttons = [{
text: 'OK',
bold: true,
onClick: function () {
@ -1109,8 +1105,21 @@ define([
}
me._state.openDlg = null;
}
}];
if (me.appOptions.canRequestClose)
buttons.push({
text: me.closeButtonText,
onClick: function () {
Common.Gateway.requestClose();
me._state.openDlg = null;
}
]
});
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: buttons
});
// Vertical align
@ -1294,7 +1303,8 @@ define([
txtHeader: "Header",
txtFooter: "Footer",
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset'
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
closeButtonText: 'Close File'
}
})(), DE.Controllers.Main || {}))
});

1
apps/documenteditor/mobile/locale/en.json
View file

@ -153,6 +153,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Main.closeButtonText": "Close File",
"DE.Controllers.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",

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

@ -603,6 +603,7 @@ define([
me.appOptions.isOffline = me.api.asc_isOffline();
me.appOptions.isReviewOnly = (me.permissions.review === true) && (me.permissions.edit === false);
me.appOptions.canRequestEditRights = me.editorConfig.canRequestEditRights;
me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
me.appOptions.canEdit = (me.permissions.edit !== false || me.permissions.review === true) && // can edit or review
(me.editorConfig.canRequestEditRights || me.editorConfig.mode !== 'view') && // if mode=="view" -> canRequestEditRights must be defined
(!me.appOptions.isReviewOnly || me.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
@ -1035,12 +1036,7 @@ define([
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: [
{
var buttons = [{
text: 'OK',
bold: true,
onClick: function () {
@ -1052,8 +1048,21 @@ define([
}
me._state.openDlg = null;
}
}];
if (me.appOptions.canRequestClose)
buttons.push({
text: me.closeButtonText,
onClick: function () {
Common.Gateway.requestClose();
me._state.openDlg = null;
}
]
});
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: buttons
});
// Vertical align
@ -1286,7 +1295,8 @@ define([
txtSlideSubtitle: 'Slide subtitle',
txtSlideTitle: 'Slide title',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset'
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
closeButtonText: 'Close File'
}
})(), PE.Controllers.Main || {}))
});

1
apps/presentationeditor/mobile/locale/en.json
View file

@ -207,6 +207,7 @@
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.closeButtonText": "Close File",
"PE.Controllers.Search.textNoTextFound": "Text not Found",
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
"PE.Controllers.Settings.txtLoading": "Loading...",

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

@ -635,6 +635,7 @@ define([
}
me.appOptions.canRequestEditRights = me.editorConfig.canRequestEditRights;
me.appOptions.canRequestClose = me.editorConfig.canRequestClose;
me.appOptions.canEdit = me.permissions.edit !== false && // can edit
(me.editorConfig.canRequestEditRights || me.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined
me.appOptions.isEdit = (me.appOptions.canLicense || me.appOptions.isEditDiagram || me.appOptions.isEditMailMerge) && me.permissions.edit !== false && me.editorConfig.mode !== 'view';
@ -1208,12 +1209,7 @@ define([
me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: [
{
var buttons = [{
text: 'OK',
bold: true,
onClick: function () {
@ -1221,12 +1217,25 @@ define([
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
if (!me._isDocReady) {
me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
}
me._state.openDlg = null;
}
}];
if (me.appOptions.canRequestClose)
buttons.push({
text: me.closeButtonText,
onClick: function () {
Common.Gateway.requestClose();
me._state.openDlg = null;
}
]
});
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: buttons
});
// Vertical align
@ -1469,7 +1478,8 @@ define([
errorOpenWarning: 'The length of one of the formulas in the file exceeded<br>the allowed number of characters and it was removed.',
errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.<br>Please check the data and try again.',
errorCopyMultiselectArea: 'This command cannot be used with multiple selections.<br>Select a single range and try again.',
errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.<br>This restriction will be eliminated in upcoming releases.'
errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.<br>This restriction will be eliminated in upcoming releases.',
closeButtonText: 'Close File'
}
})(), SSE.Controllers.Main || {}))
});

1
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -261,6 +261,7 @@
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.closeButtonText": "Close File",
"SSE.Controllers.Search.textNoTextFound": "Text not found",
"SSE.Controllers.Search.textReplaceAll": "Replace All",
"SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",