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

Merge pull request #1342 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-11-23 14:51:37 +03:00 committed by GitHub
parent 983c2a94a1 067181a056
commit 929978fd50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -492,8 +492,13 @@ DE.ApplicationController = new(function(){
if (config.customization && config.customization.goback) {
if (config.customization.goback.requestClose && config.canRequestClose)
Common.Gateway.requestClose();
else if (config.customization.goback.url)
window.parent.location.href = config.customization.goback.url;
else if (config.customization.goback.url) {
if (config.customization.goback.blank!==false) {
window.open(config.customization.goback.url, "_blank");
} else {
window.parent.location.href = config.customization.goback.url;
}
}
}
});

24
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -54,9 +54,16 @@ define([
this.view = this.createView('ApplicationView').render();
window["flat_desine"] = true;
var translationTable = {
'Your text here': this.txtArt,
"Choose an item": this.txtChoose,
"Enter a date": this.txtEnterDate,
"Click to load image": this.txtClickToLoad
}
this.api = new Asc.asc_docs_api({
'id-view' : 'editor_sdk',
'embedded' : true
'embedded' : true,
'translate': translationTable
});
Common.UI.Themes.init(this.api);
@ -1085,8 +1092,13 @@ define([
if (this.appOptions.customization && this.appOptions.customization.goback) {
if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose)
Common.Gateway.requestClose();
else if (this.appOptions.customization.goback.url)
window.parent.location.href = this.appOptions.customization.goback.url;
else if (this.appOptions.customization.goback.url) {
if (this.appOptions.customization.goback.blank!==false) {
window.open(this.appOptions.customization.goback.url, "_blank");
} else {
window.parent.location.href = this.appOptions.customization.goback.url;
}
}
}
break;
case 'download-docx':
@ -1519,7 +1531,11 @@ define([
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored and page is reloaded.',
uploadImageSizeMessage: 'Maximum image size limit exceeded.',
uploadImageExtMessage: 'Unknown image format.'
uploadImageExtMessage: 'Unknown image format.',
txtArt: 'Your text here',
txtChoose: 'Choose an item',
txtEnterDate: 'Enter a date',
txtClickToLoad: 'Click to load image'
}, DE.Controllers.ApplicationController));

4
apps/documenteditor/forms/locale/en.json
View file

@ -108,6 +108,10 @@
"DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
"DE.Controllers.ApplicationController.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.ApplicationController.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"DE.Controllers.ApplicationController.txtChoose": "Choose an item",
"DE.Controllers.ApplicationController.txtClickToLoad": "Click to load image",
"DE.Controllers.ApplicationController.txtArt": "Your text here",
"DE.Controllers.ApplicationController.txtEnterDate": "Enter a date",
"DE.Views.ApplicationView.textClear": "Clear All Fields",
"DE.Views.ApplicationView.textCopy": "Copy",
"DE.Views.ApplicationView.textCut": "Cut",

4
apps/documenteditor/forms/locale/ru.json
View file

@ -108,6 +108,10 @@
"DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Вы достигли лимита на количество пользователей редакторов %1. Свяжитесь с администратором, чтобы узнать больше.",
"DE.Controllers.ApplicationController.warnNoLicense": "Вы достигли лимита на одновременные подключения к редакторам %1. Этот документ будет открыт на просмотр.<br>Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
"DE.Controllers.ApplicationController.warnNoLicenseUsers": "Вы достигли лимита на количество пользователей редакторов %1. Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия обновления.",
"DE.Controllers.ApplicationController.txtChoose": "Выберите элемент",
"DE.Controllers.ApplicationController.txtClickToLoad": "Нажмите для загрузки изображения",
"DE.Controllers.ApplicationController.txtArt": "Введите ваш текст",
"DE.Controllers.ApplicationController.txtEnterDate": "Введите дату",
"DE.Views.ApplicationView.textClear": "Очистить все поля",
"DE.Views.ApplicationView.textCopy": "Копировать",
"DE.Views.ApplicationView.textCut": "Вырезать",

9
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -330,8 +330,13 @@ PE.ApplicationController = new(function(){
if (config.customization && config.customization.goback) {
if (config.customization.goback.requestClose && config.canRequestClose)
Common.Gateway.requestClose();
else if (config.customization.goback.url)
window.parent.location.href = config.customization.goback.url;
else if (config.customization.goback.url) {
if (config.customization.goback.blank!==false) {
window.open(config.customization.goback.url, "_blank");
} else {
window.parent.location.href = config.customization.goback.url;
}
}
}
});

9
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -265,8 +265,13 @@ SSE.ApplicationController = new(function(){
if (config.customization && config.customization.goback) {
if (config.customization.goback.requestClose && config.canRequestClose)
Common.Gateway.requestClose();
else if (config.customization.goback.url)
window.parent.location.href = config.customization.goback.url;
else if (config.customization.goback.url) {
if (config.customization.goback.blank!==false) {
window.open(config.customization.goback.url, "_blank");
} else {
window.parent.location.href = config.customization.goback.url;
}
}
}
});