diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index b5540a3c2..1dcf5eada 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -385,8 +385,6 @@ if (!_config.editorConfig.customization) _config.editorConfig.customization = {}; _config.editorConfig.customization.about = false; _config.editorConfig.customization.compactHeader = false; - - if ( window.AscDesktopEditor ) window.AscDesktopEditor.execCommand('webapps:events', 'loading'); } } })(); diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 7a19180bb..78a7b0a22 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -644,7 +644,7 @@ define([ } else { $(this.el).find('ul').html(_.template([ '<% _.each(items, function(item) { %>', - '
  • <%= scope.getDisplayValue(item) %>
  • ', + '
  • <%= scope.getDisplayValue(item) %>
  • ', '<% }); %>' ].join(''))({ items: this.store.toJSON(), diff --git a/apps/common/main/lib/component/Tab.js b/apps/common/main/lib/component/Tab.js index 5fa0194b6..e5615f93d 100644 --- a/apps/common/main/lib/component/Tab.js +++ b/apps/common/main/lib/component/Tab.js @@ -52,8 +52,8 @@ define([ this.label = 'Tab'; this.cls = ''; this.index = -1; - this.template = _.template(['
  • ', - '<%- label %>', + this.template = _.template(['
  • ', + '<%- label %>', '
  • '].join('')); this.initialize.call(this, opts); diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 079b40c0e..48b897b8c 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -236,7 +236,8 @@ define([ var win_width = (this.initConfig.width=='auto') ? parseInt(this.$window.find('.body').css('width')) : this.initConfig.width; - var top = Math.floor((parseInt(main_height) - parseInt(win_height)) / 2); + var top = Common.Utils.InternalSettings.get('window-inactive-area-top') + + Math.floor((parseInt(main_height) - parseInt(win_height)) / 2); var left = Math.floor((parseInt(main_width) - parseInt(win_width)) / 2); this.$window.css('left',left); @@ -286,7 +287,7 @@ define([ } this.dragging.maxx = main_width - this.getWidth(); - this.dragging.maxy = main_height - this.getHeight(); + this.dragging.maxy = main_height - this.getHeight() + Common.Utils.InternalSettings.get('window-inactive-area-top'); $(document).on('mousemove', this.binding.drag); $(document).on('mouseup', this.binding.dragStop); @@ -311,10 +312,11 @@ define([ if (this.dragging.enabled) { var zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1, left = event.pageX*zoom - this.dragging.initx, - top = event.pageY*zoom - this.dragging.inity; + top = event.pageY*zoom - this.dragging.inity, + topedge = Common.Utils.InternalSettings.get('window-inactive-area-top'); left < 0 ? (left = 0) : left > this.dragging.maxx && (left = this.dragging.maxx); - top < 0 ? (top = 0) : top > this.dragging.maxy && (top = this.dragging.maxy); + top < topedge ? (top = topedge) : top > this.dragging.maxy && (top = this.dragging.maxy); this.$window.css({left: left, top: top}); } diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 62a7b9b7b..d5dafa7ea 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -41,10 +41,16 @@ define([ ], function () { 'use strict'; + var native = window.AscDesktopEditor; + !!native && native.execCommand('webapps:features', JSON.stringify({ + version: '{{PRODUCT_VERSION}}', + eventloading: true, + titlebuttons: true + })); + var Desktop = function () { var config = {version:'{{PRODUCT_VERSION}}'}; - var app = window.AscDesktopEditor, - webapp = window.DE || window.PE || window.SSE; + var webapp = window.DE || window.PE || window.SSE; var titlebuttons; var btnsave_icons = { 'btn-save': 'save', @@ -52,7 +58,7 @@ define([ 'btn-synch': 'synch' }; - if ( !!app ) { + if ( !!native ) { window.on_native_message = function (cmd, param) { if (/^style:change/.test(cmd)) { var obj = JSON.parse(param); @@ -81,6 +87,13 @@ define([ Common.NotificationCenter.trigger('app:config', {canUndock:true}); } } + + if (_.isNumber(obj.skiptoparea)) { + if ( $('.asc-window.modal').length && $('.asc-window.modal').position().top < obj.skiptoparea ) + $('.asc-window.modal').css('top', obj.skiptoparea); + + Common.Utils.InternalSettings.set('window-inactive-area-top', obj.skiptoparea); + } } else if (/window:status/.test(cmd)) { var obj = JSON.parse(param); @@ -104,7 +117,7 @@ define([ } } - app.execCommand('editor:config', JSON.stringify(opts)); + native.execCommand('editor:config', JSON.stringify(opts)); } else if ( !config.callback_editorconfig ) { config.callback_editorconfig = function() { @@ -128,14 +141,19 @@ define([ } }; + window.on_native_message('editor:config', 'request'); if ( !!window.native_message_cmd ) { for ( var c in window.native_message_cmd ) { window.on_native_message(c, window.native_message_cmd[c]); } } - // app.execCommand('window:features', {version: config.version, action: 'request'}); - app.execCommand('webapps:features', {version: config.version, eventloading:true, titlebuttons:true}); + native.execCommand('webapps:features', JSON.stringify({version: config.version, eventloading:true, titlebuttons:true})); + + // hide mask for modal window + var style = document.createElement('style'); + style.appendChild(document.createTextNode('.modals-mask{opacity:0 !important;}')); + document.getElementsByTagName('head')[0].appendChild(style); } var _serializeHeaderButton = function(action, config) { @@ -143,31 +161,30 @@ define([ action: action, icon: config.icon || undefined, hint: config.btn.options.hint, - disabled: config.disabled + disabled: config.btn.isDisabled() }; }; var _onTitleButtonDisabled = function (action, e, status) { - titlebuttons[action].disabled = status; var _buttons = {}; _buttons[action] = status; - app.execCommand('title:button', JSON.stringify({disabled: _buttons})); + native.execCommand('title:button', JSON.stringify({disabled: _buttons})); }; var _onSaveIconChanged = function (e, opts) { - app.execCommand('title:button', JSON.stringify({'icon:changed': {'save': btnsave_icons[opts.next]}})); + native.execCommand('title:button', JSON.stringify({'icon:changed': {'save': btnsave_icons[opts.next]}})); }; var _onModalDialog = function (status) { if ( status == 'open' ) { - app.execCommand('title:button', JSON.stringify({disabled: {'all':true}})); + native.execCommand('title:button', JSON.stringify({disabled: {'all':true}})); } else { var _buttons = {}; for (var i in titlebuttons) { - _buttons[i] = titlebuttons[i].disabled; + _buttons[i] = titlebuttons[i].btn.isDisabled(); } - app.execCommand('title:button', JSON.stringify({'disabled': _buttons})); + native.execCommand('title:button', JSON.stringify({'disabled': _buttons})); } }; @@ -178,13 +195,13 @@ define([ if ( config.isDesktopApp ) { Common.NotificationCenter.on('app:ready', function (opts) { _.extend(config, opts); - !!app && app.execCommand('doc:onready', ''); + !!native && native.execCommand('doc:onready', ''); $('.toolbar').addClass('editor-native-color'); }); Common.NotificationCenter.on('action:undocking', function (opts) { - app.execCommand('editor:event', JSON.stringify({action:'undocking', state: opts == 'dock' ? 'dock' : 'undock'})); + native.execCommand('editor:event', JSON.stringify({action:'undocking', state: opts == 'dock' ? 'dock' : 'undock'})); }); Common.NotificationCenter.on('app:face', function (mode) { @@ -195,20 +212,20 @@ define([ var header = webapp.getController('Viewport').getView('Common.Views.Header'); titlebuttons = {}; if ( !!header.btnSave ) { - titlebuttons['save'] = {btn: header.btnSave, disabled:false}; + titlebuttons['save'] = {btn: header.btnSave}; var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class')); !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]); } if ( !!header.btnPrint ) - titlebuttons['print'] = {btn: header.btnPrint, disabled:false}; + titlebuttons['print'] = {btn: header.btnPrint}; if ( !!header.btnUndo ) - titlebuttons['undo'] = {btn: header.btnUndo, disabled:false}; + titlebuttons['undo'] = {btn: header.btnUndo}; if ( !!header.btnRedo ) - titlebuttons['redo'] = {btn: header.btnRedo, disabled:false}; + titlebuttons['redo'] = {btn: header.btnRedo}; for (var i in titlebuttons) { titlebuttons[i].btn.options.signals = ['disabled']; @@ -233,19 +250,19 @@ define([ } }, process: function (opts) { - if ( config.isDesktopApp && !!app ) { + if ( config.isDesktopApp && !!native ) { if ( opts == 'goback' ) { - app.execCommand('go:folder', + native.execCommand('go:folder', config.isOffline ? 'offline' : config.customization.goback.url); return true; } else if ( opts == 'preloader:hide' ) { - app.execCommand('editor:onready', ''); + native.execCommand('editor:onready', ''); return true; } else if ( opts == 'create:new' ) { if (config.createUrl == 'desktop://create.new') { - app.LocalFileCreate(!!window.SSE ? 2 : !!window.PE ? 1 : 0); + native.LocalFileCreate(!!window.SSE ? 2 : !!window.PE ? 1 : 0); return true; } } @@ -254,8 +271,8 @@ define([ return false; }, requestClose: function () { - if ( config.isDesktopApp && !!app ) { - app.execCommand('editor:event', JSON.stringify({action:'close', url: config.customization.goback.url})); + if ( config.isDesktopApp && !!native ) { + native.execCommand('editor:event', JSON.stringify({action:'close', url: config.customization.goback.url})); } } }; diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index ba490dd3e..5009f3668 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -214,8 +214,9 @@ Common.Utils = _.extend(new(function() { documentSettingsType: documentSettingsType, importTextType: importTextType, zoom: function() {return me.zoom;}, + topOffset: 0, innerWidth: function() {return me.innerWidth;}, - innerHeight: function() {return me.innerHeight;} + innerHeight: function() {return me.innerHeight - Common.Utils.InternalSettings.get('window-inactive-area-top');} } })(), Common.Utils || {}); @@ -896,6 +897,7 @@ Common.Utils.InternalSettings.set('toolbar-height-tabs', 32); Common.Utils.InternalSettings.set('toolbar-height-tabs-top-title', 28); Common.Utils.InternalSettings.set('toolbar-height-controls', 67); Common.Utils.InternalSettings.set('document-title-height', 28); +Common.Utils.InternalSettings.set('window-inactive-area-top', 0); Common.Utils.InternalSettings.set('toolbar-height-compact', Common.Utils.InternalSettings.get('toolbar-height-tabs')); Common.Utils.InternalSettings.set('toolbar-height-normal', Common.Utils.InternalSettings.get('toolbar-height-tabs') + Common.Utils.InternalSettings.get('toolbar-height-controls')); diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js index 280f002a5..b672b9f2c 100644 --- a/apps/common/main/lib/view/ExternalDiagramEditor.js +++ b/apps/common/main/lib/view/ExternalDiagramEditor.js @@ -144,7 +144,7 @@ define([ var left = (Common.Utils.innerWidth() - parseInt(this.initConfig.width)) / 2; this.$window.css('left',left); - this.$window.css('top',top); + this.$window.css('top', Common.Utils.InternalSettings.get('window-inactive-area-top') + top); } }, @@ -160,4 +160,4 @@ define([ textClose: 'Close', textTitle: 'Chart Editor' }, Common.Views.ExternalDiagramEditor || {})); -}); \ No newline at end of file +}); diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 467717eb6..4f2c7e00d 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -59,7 +59,7 @@ define([ width = 414; height = 277; } else { - width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 370 : 262); + width = (options.type !== Common.Utils.importTextType.DRM) ? 340 : (options.warning ? 420 : 262); height = (options.type == Common.Utils.importTextType.CSV || options.type == Common.Utils.importTextType.Paste || options.type == Common.Utils.importTextType.Columns) ? 190 : (options.warning ? 187 : 147); } @@ -87,7 +87,7 @@ define([ '
    ', '
    ' + t.txtProtected+ '
    ', '', - '
    ', + '
    ', '', '<% } else { %>', '
    ', diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index dc4eda888..c7e8a6d22 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -180,13 +180,13 @@ @2ximage: replace(@imagepath, '\.png$', '@2x.png'); @media only screen { - @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), - (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), - (min-resolution: 144dpi) and (max-resolution: 191dpi) - { - background-image: ~"url(@{1d5ximage})"; - background-size: @w @h; - } + // @media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), + // (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), + // (min-resolution: 144dpi) and (max-resolution: 191dpi) + // { + // background-image: ~"url(@{1d5ximage})"; + // background-size: @w @h; + // } @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx), @@ -279,4 +279,4 @@ background-size: @img-flags-width auto; } } -} \ No newline at end of file +} diff --git a/apps/documenteditor/embed/locale/bg.json b/apps/documenteditor/embed/locale/bg.json index 63690dfe8..72651eb8d 100644 --- a/apps/documenteditor/embed/locale/bg.json +++ b/apps/documenteditor/embed/locale/bg.json @@ -12,6 +12,8 @@ "DE.ApplicationController.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права.
    Моля, свържете се с администратора на сървъра за документи.", "DE.ApplicationController.errorDefaultMessage": "Код на грешка: %1", "DE.ApplicationController.errorFilePassProtect": "Файлът е защитен с парола и не може да бъде отворен.", + "DE.ApplicationController.errorFileSizeExceed": "Размерът на файла надвишава ограничението, зададено за вашия сървър.
    Моля, свържете се с вашия администратор на Document Server за подробности.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Интернет връзката е възстановена и версията на файла е променена.
    Преди да продължите да работите, трябва да изтеглите файла или да копирате съдържанието му, за да сте сигурни, че нищо не е загубено, и след това да презаредите тази страница.", "DE.ApplicationController.errorUserDrop": "Файлът не може да бъде достъпен в момента.", "DE.ApplicationController.notcriticalErrorTitle": "Внимание", "DE.ApplicationController.scriptLoadError": "Връзката е твърде бавна, някои от компонентите не могат да бъдат заредени. Моля, презаредете страницата.", diff --git a/apps/documenteditor/embed/locale/cs.json b/apps/documenteditor/embed/locale/cs.json index 53aee7c51..1818869e2 100644 --- a/apps/documenteditor/embed/locale/cs.json +++ b/apps/documenteditor/embed/locale/cs.json @@ -1,24 +1,28 @@ { "common.view.modals.txtCopy": "Zkopírovat do schránky", "common.view.modals.txtHeight": "Výška", + "common.view.modals.txtShare": "Odkaz pro sdílení", "common.view.modals.txtWidth": "Šířka", - "DE.ApplicationController.convertationErrorText": "Konverze selhala.", - "DE.ApplicationController.convertationTimeoutText": "Vypršel čas konverze.", + "DE.ApplicationController.convertationErrorText": "Převod se nezdařil.", + "DE.ApplicationController.convertationTimeoutText": "Překročen časový limit pro provedení převodu.", "DE.ApplicationController.criticalErrorTitle": "Chyba", - "DE.ApplicationController.downloadErrorText": "Stahování selhalo.", - "DE.ApplicationController.downloadTextText": "Stahování dokumentu...", - "DE.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.
    Prosím, kontaktujte administrátora vašeho Dokumentového serveru.", + "DE.ApplicationController.downloadErrorText": "Stahování se nezdařilo.", + "DE.ApplicationController.downloadTextText": "Stahování dokumentu…", + "DE.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.
    Obraťte se na správce vámi využívaného dokumentového serveru.", "DE.ApplicationController.errorDefaultMessage": "Kód chyby: %1", - "DE.ApplicationController.errorFilePassProtect": "Dokument je chráněn heslem a nelze otevřít.", - "DE.ApplicationController.errorUserDrop": "Tento soubor není nyní přístupný.", + "DE.ApplicationController.errorFilePassProtect": "Soubor je chráněn heslem a bez něj ho nelze otevřít.", + "DE.ApplicationController.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.
    Ohledně podrobností se obraťte na správce dokumentového serveru.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.
    Než budete moci pokračovat v práci, bude třeba si soubor stáhnout nebo si zkopírovat jeho obsah, abyste si zajistili, že se nic neztratí a až poté tuto stránku znovu načtěte.", + "DE.ApplicationController.errorUserDrop": "Tento soubor nyní není přístupný.", "DE.ApplicationController.notcriticalErrorTitle": "Varování", + "DE.ApplicationController.scriptLoadError": "Připojení je příliš pomalé, některé součásti se nepodařilo načíst. Načtěte stránku znovu.", "DE.ApplicationController.textLoadingDocument": "Načítání dokumentu", "DE.ApplicationController.textOf": "z", "DE.ApplicationController.txtClose": "Zavřít", "DE.ApplicationController.unknownErrorText": "Neznámá chyba.", - "DE.ApplicationController.unsupportedBrowserErrorText": "Váš prohlížeč není podporován.", - "DE.ApplicationController.waitText": "Prosím, čekejte...", + "DE.ApplicationController.unsupportedBrowserErrorText": "Vámi používaný webový prohlížeč není podporován.", + "DE.ApplicationController.waitText": "Čekejte prosím…", "DE.ApplicationView.txtDownload": "Stáhnout", - "DE.ApplicationView.txtFullScreen": "Celá obrazovka", + "DE.ApplicationView.txtFullScreen": "Na celou obrazovku", "DE.ApplicationView.txtShare": "Sdílet" } \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/de.json b/apps/documenteditor/embed/locale/de.json index 9e9088315..74eeac328 100644 --- a/apps/documenteditor/embed/locale/de.json +++ b/apps/documenteditor/embed/locale/de.json @@ -5,13 +5,15 @@ "common.view.modals.txtShare": "Link teilen", "common.view.modals.txtWidth": "Breite", "DE.ApplicationController.convertationErrorText": "Konvertierung ist fehlgeschlagen.", - "DE.ApplicationController.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.", + "DE.ApplicationController.convertationTimeoutText": "Zeitüberschreitung bei der Konvertierung.", "DE.ApplicationController.criticalErrorTitle": "Fehler", "DE.ApplicationController.downloadErrorText": "Herunterladen ist fehlgeschlagen.", "DE.ApplicationController.downloadTextText": "Dokument wird heruntergeladen...", - "DE.ApplicationController.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.
    Wenden Sie sich an Ihren Serveradministrator.", + "DE.ApplicationController.errorAccessDeny": "Sie versuchen, eine Aktion durchzuführen, für die Sie keine Rechte haben.
    Bitte wenden Sie sich an Ihren Document Serveradministrator.", "DE.ApplicationController.errorDefaultMessage": "Fehlercode: %1", "DE.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", + "DE.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.
    Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Die Internetverbindung wurde wiederhergestellt und die Dateiversion wurde geändert.
    Bevor Sie weiterarbeiten können, müssen Sie die Datei herunterladen oder den Inhalt kopieren, um sicherzustellen, dass nichts verloren geht, und diese Seite anschließend neu laden.", "DE.ApplicationController.errorUserDrop": "Kein Zugriff auf diese Datei ist möglich.", "DE.ApplicationController.notcriticalErrorTitle": "Warnung", "DE.ApplicationController.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index a36be77b1..a885f9fcc 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -13,6 +13,7 @@ "DE.ApplicationController.errorDefaultMessage": "Error code: %1", "DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.", "DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
    Please contact your Document Server administrator for details.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", "DE.ApplicationController.notcriticalErrorTitle": "Warning", "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", @@ -22,7 +23,6 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", - "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtEmbed": "Embed", "DE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/documenteditor/embed/locale/es.json b/apps/documenteditor/embed/locale/es.json index ea08f6722..fb39a1fe1 100644 --- a/apps/documenteditor/embed/locale/es.json +++ b/apps/documenteditor/embed/locale/es.json @@ -12,6 +12,8 @@ "DE.ApplicationController.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.
    Por favor, contacte con su Administrador del Servidor de Documentos.", "DE.ApplicationController.errorDefaultMessage": "Código de error: %1", "DE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.", + "DE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede la limitación establecida para su servidor. Póngase en contacto con el administrador del Servidor de documentos para obtener más información.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.", "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo ahora mismo.", "DE.ApplicationController.notcriticalErrorTitle": "Aviso", "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", diff --git a/apps/documenteditor/embed/locale/fr.json b/apps/documenteditor/embed/locale/fr.json index f06efef7c..52a08f5af 100644 --- a/apps/documenteditor/embed/locale/fr.json +++ b/apps/documenteditor/embed/locale/fr.json @@ -13,6 +13,7 @@ "DE.ApplicationController.errorDefaultMessage": "Code d'erreur: %1", "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.", "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.
    Veuillez contacter votre administrateur de Document Server pour obtenir plus d'information. ", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.
    Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.", "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.", "DE.ApplicationController.notcriticalErrorTitle": "Avertissement", "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", diff --git a/apps/documenteditor/embed/locale/hu.json b/apps/documenteditor/embed/locale/hu.json index ee0f1b332..ee18969a7 100644 --- a/apps/documenteditor/embed/locale/hu.json +++ b/apps/documenteditor/embed/locale/hu.json @@ -1,6 +1,6 @@ { "common.view.modals.txtCopy": "Másolás a vágólapra", - "common.view.modals.txtEmbed": "Beágyaz", + "common.view.modals.txtEmbed": "Beágyazás", "common.view.modals.txtHeight": "Magasság", "common.view.modals.txtShare": "Hivatkozás megosztása", "common.view.modals.txtWidth": "Szélesség", @@ -12,17 +12,19 @@ "DE.ApplicationController.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.
    Vegye fel a kapcsolatot a Document Server adminisztrátorával.", "DE.ApplicationController.errorDefaultMessage": "Hibakód: %1", "DE.ApplicationController.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.", - "DE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető", + "DE.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.
    Kérjük, forduljon a Document Server rendszergazdájához a részletekért.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.
    Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.", + "DE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető.", "DE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés", "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.", "DE.ApplicationController.textLoadingDocument": "Dokumentum betöltése", "DE.ApplicationController.textOf": "of", - "DE.ApplicationController.txtClose": "Bezár", + "DE.ApplicationController.txtClose": "Bezárás", "DE.ApplicationController.unknownErrorText": "Ismeretlen hiba.", "DE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.", - "DE.ApplicationController.waitText": "Kérjük várjon...", + "DE.ApplicationController.waitText": "Kérjük, várjon...", "DE.ApplicationView.txtDownload": "Letöltés", - "DE.ApplicationView.txtEmbed": "Beágyaz", + "DE.ApplicationView.txtEmbed": "Beágyazás", "DE.ApplicationView.txtFullScreen": "Teljes képernyő", "DE.ApplicationView.txtShare": "Megosztás" } \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/it.json b/apps/documenteditor/embed/locale/it.json index f35b88f9b..74e268ffc 100644 --- a/apps/documenteditor/embed/locale/it.json +++ b/apps/documenteditor/embed/locale/it.json @@ -13,6 +13,7 @@ "DE.ApplicationController.errorDefaultMessage": "Codice errore: %1", "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.
    Per i dettagli, contatta l'amministratore del Document server.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connessione Internet è stata ripristinata e la versione del file è stata modificata.
    Prima di poter continuare a lavorare, è necessario scaricare il file o copiarne il contenuto per assicurarsi che non vada perso nulla, successivamente ricaricare questa pagina.", "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.", "DE.ApplicationController.notcriticalErrorTitle": "Avviso", "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.", diff --git a/apps/documenteditor/embed/locale/pt.json b/apps/documenteditor/embed/locale/pt.json index 42280f39c..d8c5ee35e 100644 --- a/apps/documenteditor/embed/locale/pt.json +++ b/apps/documenteditor/embed/locale/pt.json @@ -1,22 +1,30 @@ { "common.view.modals.txtCopy": "Copiar para a área de transferência", + "common.view.modals.txtEmbed": "Incorporar", "common.view.modals.txtHeight": "Altura", + "common.view.modals.txtShare": "Compartilhar link", "common.view.modals.txtWidth": "Largura", + "DE.ApplicationController.convertationErrorText": "Conversão falhou.", "DE.ApplicationController.convertationTimeoutText": "Tempo limite de conversão excedido.", "DE.ApplicationController.criticalErrorTitle": "Erro", - "DE.ApplicationController.downloadErrorText": "Falha ao baixar", - "DE.ApplicationController.downloadTextText": "Baixando documento...", + "DE.ApplicationController.downloadErrorText": "Transferência falhou.", + "DE.ApplicationController.downloadTextText": "Transferindo documento...", "DE.ApplicationController.errorAccessDeny": "Você está tentando executar uma ação para a qual não tem direitos.
    Entre em contato com o administrador do Document Server.", "DE.ApplicationController.errorDefaultMessage": "Código do erro: %1", "DE.ApplicationController.errorFilePassProtect": "O documento é protegido por senha e não pode ser aberto.", + "DE.ApplicationController.errorFileSizeExceed": "O tamanho do arquivo excede o limite de seu servidor.
    Por favor, contate seu administrador de Servidor de Documentos para detalhes.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "A conexão à internet foi restabelecida, e a versão do arquivo foi alterada.
    Antes de continuar seu trabalho, transfira o arquivo ou copie seu conteúdo para assegurar que nada seja perdido, e então, recarregue esta página.", "DE.ApplicationController.errorUserDrop": "O arquivo não pode ser acessado agora.", "DE.ApplicationController.notcriticalErrorTitle": "Aviso", + "DE.ApplicationController.scriptLoadError": "A conexão está muito lenta, e alguns dos componentes não puderam ser carregados. Por favor, recarregue a página.", "DE.ApplicationController.textLoadingDocument": "Carregando documento", "DE.ApplicationController.textOf": "de", "DE.ApplicationController.txtClose": "Fechar", "DE.ApplicationController.unknownErrorText": "Erro desconhecido.", "DE.ApplicationController.unsupportedBrowserErrorText": "Seu navegador não é suportado.", "DE.ApplicationController.waitText": "Aguarde...", - "DE.ApplicationView.txtDownload": "Baixar", + "DE.ApplicationView.txtDownload": "Transferir", + "DE.ApplicationView.txtEmbed": "Incorporar", + "DE.ApplicationView.txtFullScreen": "Tela cheia", "DE.ApplicationView.txtShare": "Compartilhar" } \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/ru.json b/apps/documenteditor/embed/locale/ru.json index 6fc73f817..62a3df44e 100644 --- a/apps/documenteditor/embed/locale/ru.json +++ b/apps/documenteditor/embed/locale/ru.json @@ -13,6 +13,7 @@ "DE.ApplicationController.errorDefaultMessage": "Код ошибки: %1", "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.
    Обратитесь к администратору Сервера документов для получения дополнительной информации.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
    Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.", "DE.ApplicationController.notcriticalErrorTitle": "Внимание", "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", diff --git a/apps/documenteditor/embed/locale/sv.json b/apps/documenteditor/embed/locale/sv.json new file mode 100644 index 000000000..8ddb71dc2 --- /dev/null +++ b/apps/documenteditor/embed/locale/sv.json @@ -0,0 +1,30 @@ +{ + "common.view.modals.txtCopy": "Kopiera till klippbord", + "common.view.modals.txtEmbed": "Inbädda", + "common.view.modals.txtHeight": "Höjd", + "common.view.modals.txtShare": "Delningslänk", + "common.view.modals.txtWidth": "Bredd", + "DE.ApplicationController.convertationErrorText": "Fel vid konvertering", + "DE.ApplicationController.convertationTimeoutText": "Konverteringstiden har överskridits.", + "DE.ApplicationController.criticalErrorTitle": "Fel", + "DE.ApplicationController.downloadErrorText": "Nedladdning misslyckades", + "DE.ApplicationController.downloadTextText": "Laddar ner dokumentet...", + "DE.ApplicationController.errorAccessDeny": "Du försöker utföra en åtgärd som du inte har rättighet till.
    Vänligen kontakta din systemadministratör.", + "DE.ApplicationController.errorDefaultMessage": "Felkod: %1", + "DE.ApplicationController.errorFilePassProtect": "Dokumentet är lösenordsskyddat och kunde inte öppnas. ", + "DE.ApplicationController.errorFileSizeExceed": "Filstorleken överskrider gränsen för din server.
    Var snäll och kontakta administratören för dokumentservern för mer information.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetanslutningen har återställts och filversionen har ändrats.
    Innan du fortsätter arbeta, ladda ner filen eller kopiera innehållet för att försäkra dig om att inte förlora något, ladda sedan om denna sida.", + "DE.ApplicationController.errorUserDrop": "Filen kan inte nås för tillfället. ", + "DE.ApplicationController.notcriticalErrorTitle": "Varning", + "DE.ApplicationController.scriptLoadError": "Anslutningen är för långsam, vissa av komponenterna kunde inte laddas. Vänligen ladda om sidan.", + "DE.ApplicationController.textLoadingDocument": "Laddar dokument", + "DE.ApplicationController.textOf": "av", + "DE.ApplicationController.txtClose": "Stäng", + "DE.ApplicationController.unknownErrorText": "Okänt fel.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Din webbläsare stöds ej.", + "DE.ApplicationController.waitText": "Var snäll och vänta...", + "DE.ApplicationView.txtDownload": "Ladda ner", + "DE.ApplicationView.txtEmbed": "Inbädda", + "DE.ApplicationView.txtFullScreen": "Fullskärm", + "DE.ApplicationView.txtShare": "Dela" +} \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/zh.json b/apps/documenteditor/embed/locale/zh.json index c2ac84814..5ecc104d7 100644 --- a/apps/documenteditor/embed/locale/zh.json +++ b/apps/documenteditor/embed/locale/zh.json @@ -12,6 +12,8 @@ "DE.ApplicationController.errorAccessDeny": "您正在尝试执行您没有权限的操作。
    请联系您的文档服务器管理员.", "DE.ApplicationController.errorDefaultMessage": "错误代码:%1", "DE.ApplicationController.errorFilePassProtect": "该文档受密码保护,无法被打开。", + "DE.ApplicationController.errorFileSizeExceed": "文件大小超出了为服务器设置的限制.
    有关详细信息,请与文档服务器管理员联系。", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "网连接已还原文件版本已更改。.
    在继续工作之前,需要下载文件或复制其内容以确保没有丢失任何内容,然后重新加载此页。", "DE.ApplicationController.errorUserDrop": "该文件现在无法访问。", "DE.ApplicationController.notcriticalErrorTitle": "警告", "DE.ApplicationController.scriptLoadError": "连接速度过慢,部分组件无法被加载。请重新加载页面。", diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index fe58a2d84..98bf4528f 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -422,6 +422,8 @@ define([ /** coauthoring begin **/ userTipHide(); /** coauthoring end **/ + me.mode && me.mode.isDesktopApp && me.api && me.api.asc_onShowPopupWindow(); + }, 'modal:show': function(e){ me.hideTips(); diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js index b8e9742e7..931c71f50 100644 --- a/apps/documenteditor/main/app/view/LeftMenu.js +++ b/apps/documenteditor/main/app/view/LeftMenu.js @@ -385,7 +385,7 @@ define([ if ( !this.$el.is(':visible') ) return; if (!this.developerHint) { - this.developerHint = $('
    ' + ((mode == Asc.c_oLicenseMode.Trial) ? this.txtTrial : this.txtDeveloper) + '
    ').appendTo(this.$el); + this.developerHint = $('
    ' + ((mode == Asc.c_oLicenseMode.Trial) ? this.txtTrial.toLocaleUpperCase() : this.txtDeveloper.toLocaleUpperCase()) + '
    ').appendTo(this.$el); this.devHeight = this.developerHint.outerHeight(); $(window).on('resize', _.bind(this.onWindowResize, this)); } diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 239dae000..824f46de6 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -202,6 +202,7 @@ window.parentOrigin = params["parentOrigin"]; if ( window.AscDesktopEditor ) { + window.desktop = window.AscDesktopEditor; window.on_native_message = function (cmd, param) { !window.native_message_cmd && (window.native_message_cmd = []); window.native_message_cmd[cmd] = param; @@ -216,6 +217,13 @@