Merge pull request #701 from ONLYOFFICE/fix/bugfix

[SSE mobile] Fix Bug 48664
2021-02-10 21:03:56 +03:00 · 2021-02-10 21:03:56 +03:00 · 5160969db3
parent 3ed71bde43 7bb7d883dd
commit 5160969db3
10 changed files with 31 additions and 6 deletions
--- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
@ -84,6 +84,7 @@ define([

                this.api.asc_registerCallback('asc_onShowPopMenu',      _.bind(this.onApiShowPopMenu, this));
                this.api.asc_registerCallback('asc_onHidePopMenu',      _.bind(this.onApiHidePopMenu, this));
+                this.api.asc_registerCallback('asc_onHyperlinkClick',   _.bind(this.onApiHyperlinkClick, this));
                Common.NotificationCenter.on('api:disconnect',          _.bind(this.onCoAuthoringDisconnect, this));
                this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect,this));
            },
@ -296,6 +297,19 @@ define([
                this.view.hideMenu();
            },

+            onApiHyperlinkClick: function(url) {
+                if (!url) {
+                    var me = this;
+                    _.defer(function () {
+                        uiApp.modal({
+                            title: me.notcriticalErrorTitle,
+                            text : me.errorInvalidLink,
+                            buttons: [{text: 'OK'}]
+                        });
+                    });
+                }
+            },
+
            // Internal

            _initMenu: function (cellinfo) {
@ -518,7 +532,8 @@ define([
            textCopyCutPasteActions: 'Copy, Cut and Paste Actions',
            errorCopyCutPaste: 'Copy, cut and paste actions using the context menu will be performed within the current file only.',
            textDoNotShowAgain: 'Don\'t show again',
-            notcriticalErrorTitle: 'Warning'
+            notcriticalErrorTitle: 'Warning',
+            errorInvalidLink: 'The link reference does not exist. Please correct the link or delete it.'
        }
    })(), SSE.Controllers.DocumentHolder || {}))
 });
--- a/apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
@ -502,11 +502,13 @@ define([

        onLinkWorksheetRange: function(nameSheet, prevSheet) {
            var tab = this.sheets.findWhere({name: nameSheet});
-            var sdkIndex = tab.get('index');
-            if (sdkIndex !== prevSheet) {
-                var index = this.sheets.indexOf(tab);
-                this.statusbar.setActiveTab(index);
-                Common.NotificationCenter.trigger('sheet:active', sdkIndex);
+            if (tab) {
+                var sdkIndex = tab.get('index');
+                if (sdkIndex !== prevSheet) {
+                    var index = this.sheets.indexOf(tab);
+                    this.statusbar.setActiveTab(index);
+                    Common.NotificationCenter.trigger('sheet:active', sdkIndex);
+                }
            }
        },

--- a/apps/spreadsheeteditor/mobile/locale/de.json
+++ b/apps/spreadsheeteditor/mobile/locale/de.json
@ -70,6 +70,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Funktionen \"Kopieren\", \"Ausschneiden\" und \"Einfügen\"",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Nicht wieder anzeigen",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "Nur die Daten aus der oberen linken Zelle bleiben nach der Vereinigung.<br>Möchten Sie wirklich fortsetzen?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "Der Linkverweis existiert nicht. Bitte korrigieren Sie das Link oder löschen Sie es. ",
  "SSE.Controllers.EditCell.textAuto": "Automatisch",
  "SSE.Controllers.EditCell.textFonts": "Schriftarten",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@ -70,6 +70,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Do not show again",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell. <br>Are you sure you want to continue?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
  "SSE.Controllers.EditCell.textAuto": "Auto",
  "SSE.Controllers.EditCell.textFonts": "Fonts",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/es.json
+++ b/apps/spreadsheeteditor/mobile/locale/es.json
@ -70,6 +70,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Acciones de Copiar, Cortar y Pegar",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "No mostrar otra vez",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "En la celda unida permanecerán sólo los datos de la celda de la esquina superior izquierda.<br>Está seguro de que quiere continuar?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "El enlace no existe. Por favor, corrija o elimine el enlace.",
  "SSE.Controllers.EditCell.textAuto": "Auto",
  "SSE.Controllers.EditCell.textFonts": "Fuentes",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/fr.json
+++ b/apps/spreadsheeteditor/mobile/locale/fr.json
@ -70,6 +70,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Actions copier, couper et coller",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Ne plus afficher",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "Seulement les données de la cellule supérieure gauche seront conservées dans la cellule fusionnée.<br>Êtes-vous sûr de vouloir continuer ?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "Le lien de référence n'existe pas. Veuillez corriger la référence ou la supprimer.",
  "SSE.Controllers.EditCell.textAuto": "Auto",
  "SSE.Controllers.EditCell.textFonts": "Polices",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/it.json
+++ b/apps/spreadsheeteditor/mobile/locale/it.json
@ -68,6 +68,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Azioni copia/taglia/incolla",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Non visualizzare più",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "Solo i dati dalla cella sinistra superiore rimangono nella cella unita.<br>Sei sicuro di voler continuare?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "Il collegamento a cui si fa riferimento non esiste. Correggere il collegamento o rimuoverlo.",
  "SSE.Controllers.EditCell.textAuto": "Auto",
  "SSE.Controllers.EditCell.textFonts": "Caratteri",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/ja.json
+++ b/apps/spreadsheeteditor/mobile/locale/ja.json
@ -70,6 +70,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "コピー,切り取り,貼り付けの操作",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "次回から表示しない",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "マージされたセルに左上のセルからのデータのみが残ります。<br>続行してもよろしいです？",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "リンク参照が存在しません。 リンクを修正するか、ご削除ください。",
  "SSE.Controllers.EditCell.textAuto": "自動",
  "SSE.Controllers.EditCell.textFonts": "フォント",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/ko.json
+++ b/apps/spreadsheeteditor/mobile/locale/ko.json
@ -33,6 +33,7 @@
  "SSE.Controllers.DocumentHolder.menuWrap": "줄 바꾸기",
  "SSE.Controllers.DocumentHolder.sheetCancel": "취소",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "왼쪽 위 셀의 데이터 만 병합 된 셀에 남아 있습니다. <br> 계속 하시겠습니까?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "링크 참조가 존재하지 않습니다. 링크를 수정하거나 삭제하십시오.",
  "SSE.Controllers.EditCell.textAuto": "Auto",
  "SSE.Controllers.EditCell.textFonts": "글꼴",
  "SSE.Controllers.EditCell.textPt": "pt",
--- a/apps/spreadsheeteditor/mobile/locale/ru.json
+++ b/apps/spreadsheeteditor/mobile/locale/ru.json
@ -70,6 +70,7 @@
  "SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Операции копирования, вырезания и вставки",
  "SSE.Controllers.DocumentHolder.textDoNotShowAgain": "Больше не показывать",
  "SSE.Controllers.DocumentHolder.warnMergeLostData": "В объединенной ячейке останутся только данные из левой верхней ячейки.<br>Вы действительно хотите продолжить?",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "Ссылка указывает на несуществующую ячейку. Исправьте или удалите ссылку.",
  "SSE.Controllers.EditCell.textAuto": "Авто",
  "SSE.Controllers.EditCell.textFonts": "Шрифты",
  "SSE.Controllers.EditCell.textPt": "пт",