Merge pull request #1342 from ONLYOFFICE/fix/bugfix

Fix/bugfix

apps/documenteditor/embed/js/ApplicationController.js

@@ -492,9 +492,14 @@ 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)
+                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;
                     }
+                }
+            }
         });
 
         var downloadAs =  function(format){

apps/documenteditor/forms/app/controller/ApplicationController.js

@@ -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,9 +1092,14 @@ 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)
+                        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':
                     this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.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));
 

apps/documenteditor/forms/locale/en.json

@@ -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",

apps/documenteditor/forms/locale/ru.json

@@ -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": "Вырезать",

apps/presentationeditor/embed/js/ApplicationController.js

@@ -330,9 +330,14 @@ 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)
+                    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;
                         }
+                    }
+                }
             });
 
         var $pagenum = $('#page-number');

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -265,9 +265,14 @@ 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)
+                    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;
                         }
+                    }
+                }
             });
 
         $('#id-btn-zoom-in').on('click', function () {