From 9384a922dc259ea392955a66c5d57b68cffaa0be Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Oct 2024 12:50:40 +0300 Subject: [PATCH 1/3] Fix Bug 70355 --- apps/common/main/resources/less/colors-table-gray.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/colors-table-gray.less b/apps/common/main/resources/less/colors-table-gray.less index e9d3b22bc9..98f9c1db66 100644 --- a/apps/common/main/resources/less/colors-table-gray.less +++ b/apps/common/main/resources/less/colors-table-gray.less @@ -7,10 +7,10 @@ --toolbar-header-presentation: #f7f7f7; --toolbar-header-pdf: #f7f7f7; - --text-toolbar-header-on-background-document: #38567A; - --text-toolbar-header-on-background-spreadsheet: #336B49; - --text-toolbar-header-on-background-presentation: #854535; - --text-toolbar-header-on-background-pdf: #8D4444; + --text-toolbar-header-on-background-document: #FFFFFF; + --text-toolbar-header-on-background-spreadsheet: #FFFFFF; + --text-toolbar-header-on-background-presentation: #FFFFFF; + --text-toolbar-header-on-background-pdf: #FFFFFF; --background-normal: #fff; --background-toolbar: #f7f7f7; From c9f6aae5a5062e1d4acedc3489582617b6005309 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Oct 2024 16:23:03 +0300 Subject: [PATCH 2/3] [DE mobile] Fix send forms --- apps/documenteditor/mobile/locale/ar.json | 6 ++++-- apps/documenteditor/mobile/locale/az.json | 6 ++++-- apps/documenteditor/mobile/locale/be.json | 6 ++++-- apps/documenteditor/mobile/locale/bg.json | 6 ++++-- apps/documenteditor/mobile/locale/ca.json | 6 ++++-- apps/documenteditor/mobile/locale/cs.json | 6 ++++-- apps/documenteditor/mobile/locale/da.json | 6 ++++-- apps/documenteditor/mobile/locale/de.json | 6 ++++-- apps/documenteditor/mobile/locale/el.json | 6 ++++-- apps/documenteditor/mobile/locale/en.json | 3 ++- apps/documenteditor/mobile/locale/es.json | 6 ++++-- apps/documenteditor/mobile/locale/eu.json | 6 ++++-- apps/documenteditor/mobile/locale/fi.json | 6 ++++-- apps/documenteditor/mobile/locale/fr.json | 6 ++++-- apps/documenteditor/mobile/locale/gl.json | 6 ++++-- apps/documenteditor/mobile/locale/he.json | 6 ++++-- apps/documenteditor/mobile/locale/hu.json | 6 ++++-- apps/documenteditor/mobile/locale/hy.json | 6 ++++-- apps/documenteditor/mobile/locale/id.json | 6 ++++-- apps/documenteditor/mobile/locale/it.json | 6 ++++-- apps/documenteditor/mobile/locale/ja.json | 6 ++++-- apps/documenteditor/mobile/locale/ko.json | 6 ++++-- apps/documenteditor/mobile/locale/lo.json | 6 ++++-- apps/documenteditor/mobile/locale/lv.json | 6 ++++-- apps/documenteditor/mobile/locale/ms.json | 6 ++++-- apps/documenteditor/mobile/locale/nl.json | 6 ++++-- apps/documenteditor/mobile/locale/pl.json | 6 ++++-- apps/documenteditor/mobile/locale/pt-pt.json | 6 ++++-- apps/documenteditor/mobile/locale/pt.json | 6 ++++-- apps/documenteditor/mobile/locale/ro.json | 6 ++++-- apps/documenteditor/mobile/locale/ru.json | 6 ++++-- apps/documenteditor/mobile/locale/si.json | 6 ++++-- apps/documenteditor/mobile/locale/sk.json | 6 ++++-- apps/documenteditor/mobile/locale/sl.json | 6 ++++-- .../documenteditor/mobile/locale/sr-cyrl.json | 6 ++++-- apps/documenteditor/mobile/locale/sr.json | 6 ++++-- apps/documenteditor/mobile/locale/sv.json | 6 ++++-- apps/documenteditor/mobile/locale/tr.json | 6 ++++-- apps/documenteditor/mobile/locale/uk.json | 6 ++++-- apps/documenteditor/mobile/locale/vi.json | 6 ++++-- apps/documenteditor/mobile/locale/zh-tw.json | 6 ++++-- apps/documenteditor/mobile/locale/zh.json | 6 ++++-- .../mobile/src/controller/LongActions.jsx | 21 ++++++++++++++++++- 43 files changed, 186 insertions(+), 84 deletions(-) diff --git a/apps/documenteditor/mobile/locale/ar.json b/apps/documenteditor/mobile/locale/ar.json index 2f5bdb491f..ae919e2846 100644 --- a/apps/documenteditor/mobile/locale/ar.json +++ b/apps/documenteditor/mobile/locale/ar.json @@ -506,7 +506,8 @@ "txtEditingMode": "بدء وضع التحرير...", "uploadImageTextText": "جار رفع الصورة...", "uploadImageTitleText": "رفع الصورة...", - "waitText": "الرجاء الانتظار..." + "waitText": "الرجاء الانتظار...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "خطأ", @@ -810,6 +811,7 @@ "textOk": "موافق", "textRenameFile": "إعادة تسمية الملف", "textSwitchedMobileView": "تم التبديل إلى عرض المحمول", - "textSwitchedStandardView": "تم التبديل إلى العرض القياسي" + "textSwitchedStandardView": "تم التبديل إلى العرض القياسي", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/az.json b/apps/documenteditor/mobile/locale/az.json index 0233e889ed..d8b613adb0 100644 --- a/apps/documenteditor/mobile/locale/az.json +++ b/apps/documenteditor/mobile/locale/az.json @@ -506,7 +506,8 @@ "uploadImageTextText": "Təsvir yüklənir...", "uploadImageTitleText": "Təsvir Yüklənir", "waitText": "Lütfən, gözləyin...", - "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost)." + "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Xəta", @@ -810,6 +811,7 @@ "textEnterNewFileName": "Enter a new file name", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/be.json b/apps/documenteditor/mobile/locale/be.json index 0097cbf452..69ec1f4147 100644 --- a/apps/documenteditor/mobile/locale/be.json +++ b/apps/documenteditor/mobile/locale/be.json @@ -506,7 +506,8 @@ "txtEditingMode": "Актывацыя рэжыму рэдагавання…", "uploadImageTextText": "Запампоўванне выявы…", "uploadImageTitleText": "Запампоўванне выявы", - "waitText": "Калі ласка, пачакайце..." + "waitText": "Калі ласка, пачакайце...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Памылка", @@ -810,6 +811,7 @@ "textEnterNewFileName": "Enter a new file name", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json index 9e5b229533..0a516f3401 100644 --- a/apps/documenteditor/mobile/locale/bg.json +++ b/apps/documenteditor/mobile/locale/bg.json @@ -506,7 +506,8 @@ "txtEditingMode": "Set editing mode...", "uploadImageTextText": "Uploading image...", "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." + "waitText": "Please, wait...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/ca.json b/apps/documenteditor/mobile/locale/ca.json index 188bd2e28a..54ad1c44b8 100644 --- a/apps/documenteditor/mobile/locale/ca.json +++ b/apps/documenteditor/mobile/locale/ca.json @@ -506,7 +506,8 @@ "txtEditingMode": "Establir el mode d'edició ...", "uploadImageTextText": "S'està carregant la imatge...", "uploadImageTitleText": "S'està carregant la imatge", - "waitText": "Espera..." + "waitText": "Espera...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", @@ -810,6 +811,7 @@ "textOk": "D'acord", "textRenameFile": "Canvia el nom del fitxer", "textSwitchedMobileView": "S'ha canviat a visualització mòbil", - "textSwitchedStandardView": "S'ha canviat a visualització estàndard" + "textSwitchedStandardView": "S'ha canviat a visualització estàndard", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/cs.json b/apps/documenteditor/mobile/locale/cs.json index fbd75149c4..3000c7e684 100644 --- a/apps/documenteditor/mobile/locale/cs.json +++ b/apps/documenteditor/mobile/locale/cs.json @@ -506,7 +506,8 @@ "txtEditingMode": "Nastavit režim úprav…", "uploadImageTextText": "Nahrávání obrázku...", "uploadImageTitleText": "Nahrávání obrázku", - "waitText": "Čekejte prosím..." + "waitText": "Čekejte prosím...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Chyba", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Přejmenovat soubor", "textSwitchedMobileView": "Přepnout na mobilní zobrazení", - "textSwitchedStandardView": "Přepnout na standartní zobrazení" + "textSwitchedStandardView": "Přepnout na standartní zobrazení", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/da.json b/apps/documenteditor/mobile/locale/da.json index b1752e186f..04935caf4e 100644 --- a/apps/documenteditor/mobile/locale/da.json +++ b/apps/documenteditor/mobile/locale/da.json @@ -506,7 +506,8 @@ "txtEditingMode": "Set editing mode...", "uploadImageTextText": "Uploading image...", "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." + "waitText": "Please, wait...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json index bfc4192ed2..bf93f18e5a 100644 --- a/apps/documenteditor/mobile/locale/de.json +++ b/apps/documenteditor/mobile/locale/de.json @@ -506,7 +506,8 @@ "txtEditingMode": "Bearbeitungsmodul wird festgelegt...", "uploadImageTextText": "Bild wird hochgeladen...", "uploadImageTitleText": "Bild wird hochgeladen", - "waitText": "Bitte warten..." + "waitText": "Bitte warten...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Fehler", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Datei umbenennen", "textSwitchedMobileView": "Mobile Ansicht aktiviert", - "textSwitchedStandardView": "Standard-Ansicht aktiviert" + "textSwitchedStandardView": "Standard-Ansicht aktiviert", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/el.json b/apps/documenteditor/mobile/locale/el.json index 3bc3cde04f..8e51b19744 100644 --- a/apps/documenteditor/mobile/locale/el.json +++ b/apps/documenteditor/mobile/locale/el.json @@ -506,7 +506,8 @@ "txtEditingMode": "Ορισμός κατάστασης επεξεργασίας...", "uploadImageTextText": "Μεταφόρτωση εικόνας...", "uploadImageTitleText": "Μεταφόρτωση Εικόνας", - "waitText": "Παρακαλούμε, περιμένετε..." + "waitText": "Παρακαλούμε, περιμένετε...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Σφάλμα", @@ -810,6 +811,7 @@ "textOk": "Εντάξει", "textRenameFile": "Μετονομασία αρχείου", "textSwitchedMobileView": "Μετάβαση σε προβολή κινητού", - "textSwitchedStandardView": "Εναλλαγή σε τυπική προβολή" + "textSwitchedStandardView": "Εναλλαγή σε τυπική προβολή", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index e08f66dcf6..69e5d40fd1 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -506,7 +506,8 @@ "txtEditingMode": "Set editing mode...", "uploadImageTextText": "Uploading image...", "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." + "waitText": "Please, wait...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json index 471eb60313..1288e2c0e8 100644 --- a/apps/documenteditor/mobile/locale/es.json +++ b/apps/documenteditor/mobile/locale/es.json @@ -506,7 +506,8 @@ "txtEditingMode": "Establecer el modo de edición...", "uploadImageTextText": "Cargando imagen...", "uploadImageTitleText": "Cargando imagen", - "waitText": "Por favor, espere..." + "waitText": "Por favor, espere...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", @@ -810,6 +811,7 @@ "textOk": "Aceptar", "textRenameFile": "Renombrar archivo", "textSwitchedMobileView": "Cambiado a vista móvil", - "textSwitchedStandardView": "Cambiado a vista estándar" + "textSwitchedStandardView": "Cambiado a vista estándar", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/eu.json b/apps/documenteditor/mobile/locale/eu.json index 3163a2dc82..a55b86f4b0 100644 --- a/apps/documenteditor/mobile/locale/eu.json +++ b/apps/documenteditor/mobile/locale/eu.json @@ -506,7 +506,8 @@ "txtEditingMode": "Ezarri edizio modua...", "uploadImageTextText": "Irudia kargatzen...", "uploadImageTitleText": "Irudia kargatzen", - "waitText": "Mesedez, itxaron..." + "waitText": "Mesedez, itxaron...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Errorea", @@ -810,6 +811,7 @@ "textOk": "Ados", "textRenameFile": "Berrizendatu fitxategia", "textSwitchedMobileView": "Mugikorreko ikuspegira aldatu da", - "textSwitchedStandardView": "Ikuspegi estandarrera aldatu da" + "textSwitchedStandardView": "Ikuspegi estandarrera aldatu da", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/fi.json b/apps/documenteditor/mobile/locale/fi.json index b3308b1afb..4d3452bd69 100644 --- a/apps/documenteditor/mobile/locale/fi.json +++ b/apps/documenteditor/mobile/locale/fi.json @@ -510,7 +510,8 @@ "waitText": "Please, wait...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textUndo": "Undo", - "textContinue": "Continue" + "textContinue": "Continue", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", @@ -841,6 +842,7 @@ "textSwitchedStandardView": "Switched to Standard view", "textRenameFile": "Rename File", "textEnterNewFileName": "Enter a new file name", - "textCloseHistory": "Close History" + "textCloseHistory": "Close History", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json index 9b7188c222..469d638569 100644 --- a/apps/documenteditor/mobile/locale/fr.json +++ b/apps/documenteditor/mobile/locale/fr.json @@ -506,7 +506,8 @@ "txtEditingMode": "Réglage mode d'édition...", "uploadImageTextText": "Chargement d'une image en cours...", "uploadImageTitleText": "Chargement d'une image", - "waitText": "Veuillez patienter..." + "waitText": "Veuillez patienter...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Erreur", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Renommer le fichier", "textSwitchedMobileView": "Passé à l'affichage mobile", - "textSwitchedStandardView": "Passé à l'affichage standard" + "textSwitchedStandardView": "Passé à l'affichage standard", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/gl.json b/apps/documenteditor/mobile/locale/gl.json index 6559a8fe54..aab1dfb0e8 100644 --- a/apps/documenteditor/mobile/locale/gl.json +++ b/apps/documenteditor/mobile/locale/gl.json @@ -506,7 +506,8 @@ "uploadImageTitleText": "Cargando imaxe", "waitText": "Agarde...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", - "textContinue": "Continue" + "textContinue": "Continue", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Erro", @@ -810,6 +811,7 @@ "textEnterNewFileName": "Enter a new file name", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/he.json b/apps/documenteditor/mobile/locale/he.json index 2caf95c74a..e0ce839614 100644 --- a/apps/documenteditor/mobile/locale/he.json +++ b/apps/documenteditor/mobile/locale/he.json @@ -506,7 +506,8 @@ "txtEditingMode": "הגדרת מצב עריכה...", "uploadImageTextText": "העלאת תמונה...", "uploadImageTitleText": "העלאת תמונה", - "waitText": "נא להמתין ..." + "waitText": "נא להמתין ...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "שגיאה", @@ -810,6 +811,7 @@ "textOk": "בסדר", "textRenameFile": "שינוי שם קובץ", "textSwitchedMobileView": "החלפה לתצוגה ניידת", - "textSwitchedStandardView": "החלפה לתצוגה רגילה" + "textSwitchedStandardView": "החלפה לתצוגה רגילה", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/hu.json b/apps/documenteditor/mobile/locale/hu.json index 14300ab49b..9cecdbd257 100644 --- a/apps/documenteditor/mobile/locale/hu.json +++ b/apps/documenteditor/mobile/locale/hu.json @@ -506,7 +506,8 @@ "txtEditingMode": "Szerkesztési mód beállítása...", "uploadImageTextText": "Kép feltöltése...", "uploadImageTitleText": "Kép feltöltése", - "waitText": "Kérjük, várjon..." + "waitText": "Kérjük, várjon...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Hiba", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Fájl Átnevezése", "textSwitchedMobileView": "Váltás Mobil nézetre", - "textSwitchedStandardView": "Normál nézetre váltott" + "textSwitchedStandardView": "Normál nézetre váltott", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/hy.json b/apps/documenteditor/mobile/locale/hy.json index e1bfc0a331..9307d89042 100644 --- a/apps/documenteditor/mobile/locale/hy.json +++ b/apps/documenteditor/mobile/locale/hy.json @@ -506,7 +506,8 @@ "txtEditingMode": "Սահմանել ցուցակի խմբագրում․․․", "uploadImageTextText": "Նկարի վերբեռնում...", "uploadImageTitleText": "Նկարի վերբեռնում", - "waitText": "Խնդրում ենք սպասել..." + "waitText": "Խնդրում ենք սպասել...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Սխալ", @@ -810,6 +811,7 @@ "textOk": "Լավ", "textRenameFile": "Վերանվանել ֆայլը", "textSwitchedMobileView": " Փոխարկվել է բջջային տեսքի", - "textSwitchedStandardView": " Փոխարկվել է ստանդարտ տեսքի" + "textSwitchedStandardView": " Փոխարկվել է ստանդարտ տեսքի", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/id.json b/apps/documenteditor/mobile/locale/id.json index 59ffd0af71..4fcbbda300 100644 --- a/apps/documenteditor/mobile/locale/id.json +++ b/apps/documenteditor/mobile/locale/id.json @@ -506,7 +506,8 @@ "txtEditingMode": "Atur mode editing...", "uploadImageTextText": "Mengunggah gambar...", "uploadImageTitleText": "Mengunggah Gambar", - "waitText": "Silahkan menunggu" + "waitText": "Silahkan menunggu", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Kesalahan", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Ganti Nama File", "textSwitchedMobileView": "Beralih ke Tampilan seluler", - "textSwitchedStandardView": "Beralih ke Tampilan standar" + "textSwitchedStandardView": "Beralih ke Tampilan standar", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json index 3a385360b6..ba4d4a2edf 100644 --- a/apps/documenteditor/mobile/locale/it.json +++ b/apps/documenteditor/mobile/locale/it.json @@ -506,7 +506,8 @@ "txtEditingMode": "Impostare la modalità di modifica...", "uploadImageTextText": "Caricamento dell'immagine...", "uploadImageTitleText": "Caricamento dell'immagine", - "waitText": "Attendere prego..." + "waitText": "Attendere prego...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Errore", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rinomina file", "textSwitchedMobileView": "Passato alla visualizzazione per dispositivi mobili", - "textSwitchedStandardView": "Passato alla visualizzazione standard" + "textSwitchedStandardView": "Passato alla visualizzazione standard", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/ja.json b/apps/documenteditor/mobile/locale/ja.json index 6321999e3e..70ddf1ffe6 100644 --- a/apps/documenteditor/mobile/locale/ja.json +++ b/apps/documenteditor/mobile/locale/ja.json @@ -506,7 +506,8 @@ "txtEditingMode": "編集モードを設定します...", "uploadImageTextText": "イメージのアップロード中...", "uploadImageTitleText": "イメージのアップロード中", - "waitText": "少々お待ちください..." + "waitText": "少々お待ちください...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "エラー", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "ファイル名の変更", "textSwitchedMobileView": "モバイルビューに切り替えました", - "textSwitchedStandardView": "標準ビューに切り替えました" + "textSwitchedStandardView": "標準ビューに切り替えました", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/ko.json b/apps/documenteditor/mobile/locale/ko.json index 3d6cef3633..5c7d63e614 100644 --- a/apps/documenteditor/mobile/locale/ko.json +++ b/apps/documenteditor/mobile/locale/ko.json @@ -506,7 +506,8 @@ "txtEditingMode": "편집 모드 설정 ...", "uploadImageTextText": "이미지 업로드 중 ...", "uploadImageTitleText": "이미지 업로드 중", - "waitText": "잠시만 기다려주세요..." + "waitText": "잠시만 기다려주세요...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "오류", @@ -810,6 +811,7 @@ "textOk": "확정", "textRenameFile": "파일 이름 변경", "textSwitchedMobileView": "모바일 보기로 전환되었습니다.", - "textSwitchedStandardView": "표준 보기로 전환되었습니다." + "textSwitchedStandardView": "표준 보기로 전환되었습니다.", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/lo.json b/apps/documenteditor/mobile/locale/lo.json index b87b2162ae..f4b5c3c516 100644 --- a/apps/documenteditor/mobile/locale/lo.json +++ b/apps/documenteditor/mobile/locale/lo.json @@ -506,7 +506,8 @@ "waitText": "ກະລຸນາລໍຖ້າ...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textContinue": "Continue", - "textUndo": "Undo" + "textUndo": "Undo", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "ຂໍ້ຜິດພາດ", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/lv.json b/apps/documenteditor/mobile/locale/lv.json index 489749ab45..6150e3bb90 100644 --- a/apps/documenteditor/mobile/locale/lv.json +++ b/apps/documenteditor/mobile/locale/lv.json @@ -506,7 +506,8 @@ "txtEditingMode": "Uzstāda rediģēšanas režīmu...", "uploadImageTextText": "Augšupielādē attēlu...", "uploadImageTitleText": "Augšupielādē attēlu", - "waitText": "Uzgaidiet..." + "waitText": "Uzgaidiet...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Kļūda", @@ -810,6 +811,7 @@ "textSwitchedMobileView": "Pārslēgts uz mobilo skatu", "textSwitchedStandardView": "Pārslēgts uz standarta skatu", "textEnterNewFileName": "Enter a new file name", - "textRenameFile": "Rename File" + "textRenameFile": "Rename File", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/ms.json b/apps/documenteditor/mobile/locale/ms.json index 587e0744d1..770f01627c 100644 --- a/apps/documenteditor/mobile/locale/ms.json +++ b/apps/documenteditor/mobile/locale/ms.json @@ -506,7 +506,8 @@ "waitText": "Sila, tunggu…", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textContinue": "Continue", - "textUndo": "Undo" + "textUndo": "Undo", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Ralat", @@ -810,6 +811,7 @@ "textEnterNewFileName": "Enter a new file name", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/nl.json b/apps/documenteditor/mobile/locale/nl.json index 63bcfb544d..a7ce18838d 100644 --- a/apps/documenteditor/mobile/locale/nl.json +++ b/apps/documenteditor/mobile/locale/nl.json @@ -506,7 +506,8 @@ "waitText": "Een moment geduld...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textContinue": "Continue", - "textUndo": "Undo" + "textUndo": "Undo", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Fout", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/pl.json b/apps/documenteditor/mobile/locale/pl.json index ea0b920d4c..ca36d58f16 100644 --- a/apps/documenteditor/mobile/locale/pl.json +++ b/apps/documenteditor/mobile/locale/pl.json @@ -506,7 +506,8 @@ "txtEditingMode": "Set editing mode...", "uploadImageTextText": "Uploading image...", "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." + "waitText": "Please, wait...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Błąd", @@ -810,6 +811,7 @@ "stayButtonText": "Stay on this page", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/pt-pt.json b/apps/documenteditor/mobile/locale/pt-pt.json index d74c51f4d2..4bdb70f840 100644 --- a/apps/documenteditor/mobile/locale/pt-pt.json +++ b/apps/documenteditor/mobile/locale/pt-pt.json @@ -506,7 +506,8 @@ "txtEditingMode": "Definir modo de edição…", "uploadImageTextText": "A carregar imagem...", "uploadImageTitleText": "A carregar imagem", - "waitText": "Aguarde..." + "waitText": "Aguarde...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Erro", @@ -810,6 +811,7 @@ "textOk": "Aceitar", "textRenameFile": "Mudar nome do ficheiro", "textSwitchedMobileView": "Alterado para vista móvel", - "textSwitchedStandardView": "Alterado para a vista predefinida" + "textSwitchedStandardView": "Alterado para a vista predefinida", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/pt.json b/apps/documenteditor/mobile/locale/pt.json index 9a3f5edb02..66e78955e3 100644 --- a/apps/documenteditor/mobile/locale/pt.json +++ b/apps/documenteditor/mobile/locale/pt.json @@ -506,7 +506,8 @@ "txtEditingMode": "Definir modo de edição...", "uploadImageTextText": "Carregando imagem...", "uploadImageTitleText": "Carregando imagem", - "waitText": "Por favor, aguarde..." + "waitText": "Por favor, aguarde...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Erro", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Renomear arquivo", "textSwitchedMobileView": "Alterado para a visualização móvel", - "textSwitchedStandardView": "Alterado para a visualização padrão" + "textSwitchedStandardView": "Alterado para a visualização padrão", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/ro.json b/apps/documenteditor/mobile/locale/ro.json index 90ecdc1d4c..8f245a6b28 100644 --- a/apps/documenteditor/mobile/locale/ro.json +++ b/apps/documenteditor/mobile/locale/ro.json @@ -506,7 +506,8 @@ "txtEditingMode": "Setare modul de editare...", "uploadImageTextText": "Încărcarea imaginii...", "uploadImageTitleText": "Încărcarea imaginii", - "waitText": "Vă rugăm să așteptați..." + "waitText": "Vă rugăm să așteptați...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Eroare", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Redenumire fișier", "textSwitchedMobileView": "Comutat la vizualizarea mobilă", - "textSwitchedStandardView": "Comutat la vizualizarea standard" + "textSwitchedStandardView": "Comutat la vizualizarea standard", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 526e73437a..1ed74afd8c 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -506,7 +506,8 @@ "txtEditingMode": "Установка режима редактирования...", "uploadImageTextText": "Загрузка рисунка...", "uploadImageTitleText": "Загрузка рисунка", - "waitText": "Пожалуйста, подождите..." + "waitText": "Пожалуйста, подождите...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Ошибка", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Переименовать файл", "textSwitchedMobileView": "Переключено на мобильный вид", - "textSwitchedStandardView": "Переключено на стандартный вид" + "textSwitchedStandardView": "Переключено на стандартный вид", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/si.json b/apps/documenteditor/mobile/locale/si.json index cdba8d3689..2fe0eff814 100644 --- a/apps/documenteditor/mobile/locale/si.json +++ b/apps/documenteditor/mobile/locale/si.json @@ -506,7 +506,8 @@ "txtEditingMode": "සංස්කරණ ප්‍රකාරය සකසන්න...", "uploadImageTextText": "අනුරුව උඩුගත වෙමින්...", "uploadImageTitleText": "අනුරුව උඩුගත වෙමින්", - "waitText": "කරුණාකර, රැඳෙන්න..." + "waitText": "කරුණාකර, රැඳෙන්න...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "දෝෂයකි", @@ -810,6 +811,7 @@ "textOk": "හරි", "textRenameFile": "ගොනුව නම් කරන්න", "textSwitchedMobileView": "ජංගම දැක්මට මාරු විය", - "textSwitchedStandardView": "සම්මත දැක්මට මාරු විය" + "textSwitchedStandardView": "සම්මත දැක්මට මාරු විය", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/sk.json b/apps/documenteditor/mobile/locale/sk.json index 04f3ea506f..a186ffc037 100644 --- a/apps/documenteditor/mobile/locale/sk.json +++ b/apps/documenteditor/mobile/locale/sk.json @@ -506,7 +506,8 @@ "waitText": "Čakajte, prosím...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textContinue": "Continue", - "textUndo": "Undo" + "textUndo": "Undo", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Chyba", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/sl.json b/apps/documenteditor/mobile/locale/sl.json index f59e74d10e..6ada945db5 100644 --- a/apps/documenteditor/mobile/locale/sl.json +++ b/apps/documenteditor/mobile/locale/sl.json @@ -798,7 +798,8 @@ "txtEditingMode": "Set editing mode...", "uploadImageTextText": "Uploading image...", "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." + "waitText": "Please, wait...", + "savingText": "Saving" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/sr-cyrl.json b/apps/documenteditor/mobile/locale/sr-cyrl.json index abdbe267c6..aaf0d73008 100644 --- a/apps/documenteditor/mobile/locale/sr-cyrl.json +++ b/apps/documenteditor/mobile/locale/sr-cyrl.json @@ -506,7 +506,8 @@ "txtEditingMode": "Подеси режим уређивања...", "uploadImageTextText": "Отпремљивање слике...", "uploadImageTitleText": "Отпремљивање слике", - "waitText": "Молимо, сачекајте..." + "waitText": "Молимо, сачекајте...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Грешка", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Преименуј фајл", "textSwitchedMobileView": "Пребачено на мобилни приказ", - "textSwitchedStandardView": "Пребачено на стандардни приказ" + "textSwitchedStandardView": "Пребачено на стандардни приказ", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/sr.json b/apps/documenteditor/mobile/locale/sr.json index b201dbee60..a16d070d18 100644 --- a/apps/documenteditor/mobile/locale/sr.json +++ b/apps/documenteditor/mobile/locale/sr.json @@ -506,7 +506,8 @@ "txtEditingMode": "Podesi režim uređivanja...", "uploadImageTextText": "Otpremljivanje slike...", "uploadImageTitleText": "Otpremljivanje Slike", - "waitText": "Molimo, sačekajte..." + "waitText": "Molimo, sačekajte...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Greška", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Preimenuj Fajl", "textSwitchedMobileView": "Prebačeno na mobilni prikaz", - "textSwitchedStandardView": "Prebačeno na standardni prikaz" + "textSwitchedStandardView": "Prebačeno na standardni prikaz", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/sv.json b/apps/documenteditor/mobile/locale/sv.json index 858660e8f4..cfe9a3d351 100644 --- a/apps/documenteditor/mobile/locale/sv.json +++ b/apps/documenteditor/mobile/locale/sv.json @@ -798,7 +798,8 @@ "txtEditingMode": "Set editing mode...", "uploadImageTextText": "Uploading image...", "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." + "waitText": "Please, wait...", + "savingText": "Saving" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/tr.json b/apps/documenteditor/mobile/locale/tr.json index 869cb7533a..875bce5f30 100644 --- a/apps/documenteditor/mobile/locale/tr.json +++ b/apps/documenteditor/mobile/locale/tr.json @@ -506,7 +506,8 @@ "txtEditingMode": "Düzenleme modunu belirle...", "uploadImageTextText": "Resim yükleniyor...", "uploadImageTitleText": "Resim Yükleniyor", - "waitText": "Lütfen bekleyin..." + "waitText": "Lütfen bekleyin...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Hata", @@ -810,6 +811,7 @@ "textOk": "Tamam", "textRenameFile": "Dosyayı yeniden adlandır.", "textSwitchedMobileView": "Mobil görünüme geçildi", - "textSwitchedStandardView": "Standart görünüme geçildi" + "textSwitchedStandardView": "Standart görünüme geçildi", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/uk.json b/apps/documenteditor/mobile/locale/uk.json index 41bba18ea0..69e45d5110 100644 --- a/apps/documenteditor/mobile/locale/uk.json +++ b/apps/documenteditor/mobile/locale/uk.json @@ -506,7 +506,8 @@ "waitText": "Будь ласка, зачекайте...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textContinue": "Continue", - "textUndo": "Undo" + "textUndo": "Undo", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Помилка", @@ -810,6 +811,7 @@ "textOk": "OK", "textRenameFile": "Rename File", "textSwitchedMobileView": "Switched to Mobile view", - "textSwitchedStandardView": "Switched to Standard view" + "textSwitchedStandardView": "Switched to Standard view", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/vi.json b/apps/documenteditor/mobile/locale/vi.json index d246ce5d14..ee82dcf5d9 100644 --- a/apps/documenteditor/mobile/locale/vi.json +++ b/apps/documenteditor/mobile/locale/vi.json @@ -510,7 +510,8 @@ "waitText": "Please, wait...", "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.
Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).", "textUndo": "Undo", - "textContinue": "Continue" + "textContinue": "Continue", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "Error", @@ -841,6 +842,7 @@ "textSwitchedStandardView": "Switched to Standard view", "textRenameFile": "Rename File", "textEnterNewFileName": "Enter a new file name", - "textCloseHistory": "Close History" + "textCloseHistory": "Close History", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/zh-tw.json b/apps/documenteditor/mobile/locale/zh-tw.json index 60b796b427..d07bf90d51 100644 --- a/apps/documenteditor/mobile/locale/zh-tw.json +++ b/apps/documenteditor/mobile/locale/zh-tw.json @@ -506,7 +506,8 @@ "txtEditingMode": "設定編輯模式...", "uploadImageTextText": "正在上傳圖片...", "uploadImageTitleText": "上傳圖片中", - "waitText": "請耐心等待..." + "waitText": "請耐心等待...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "錯誤", @@ -810,6 +811,7 @@ "textSwitchedStandardView": "切換至標準版檢視", "textCloseHistory": "Close History", "textEnterNewFileName": "Enter a new file name", - "textRenameFile": "Rename File" + "textRenameFile": "Rename File", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/zh.json b/apps/documenteditor/mobile/locale/zh.json index 3bb8618a9b..6890bc9f51 100644 --- a/apps/documenteditor/mobile/locale/zh.json +++ b/apps/documenteditor/mobile/locale/zh.json @@ -506,7 +506,8 @@ "txtEditingMode": "设置编辑模式..", "uploadImageTextText": "上传图片...", "uploadImageTitleText": "图片上传中", - "waitText": "请稍候..." + "waitText": "请稍候...", + "savingText": "Saving" }, "Main": { "criticalErrorTitle": "错误", @@ -810,6 +811,7 @@ "textOk": "确定", "textRenameFile": "重命名文件", "textSwitchedMobileView": "切换到“移动设备”视图", - "textSwitchedStandardView": "切换到标准视图" + "textSwitchedStandardView": "切换到标准视图", + "btnSend": "Send" } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/controller/LongActions.jsx b/apps/documenteditor/mobile/src/controller/LongActions.jsx index 4162dc5f1c..0842b121e1 100644 --- a/apps/documenteditor/mobile/src/controller/LongActions.jsx +++ b/apps/documenteditor/mobile/src/controller/LongActions.jsx @@ -17,6 +17,7 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { }); let loadMask = null; + let submitFail = false; const closePreloader = () => { if (loadMask && loadMask.el) { @@ -30,6 +31,7 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); api.asc_registerCallback('asc_onConfirmAction', onConfirmAction); + api.asc_registerCallback('asc_onError', onError); }; const api = Common.EditorApi.get(); @@ -47,6 +49,7 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd); api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument); api.asc_unregisterCallback('asc_onConfirmAction', onConfirmAction); + api.asc_unregisterCallback('asc_onError', onError); } Common.Notifications.off('engineCreated', on_engine_created); @@ -59,6 +62,9 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { const onLongActionBegin = (type, id) => { const action = {id: id, type: type}; stackLongActions.push(action); + if (id===Asc.c_oAscAsyncAction['Submit']) { + submitFail = false; + } setLongActionView(action); }; @@ -79,6 +85,9 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { f7.dialog.close(loadMask.el) : f7.dialog.close($$('.dialog-preloader')); } + if (id===Asc.c_oAscAsyncAction['Submit'] && !submitFail) { + Common.Gateway.submitForm(); + } }; const setLongActionView = (action) => { @@ -163,6 +172,10 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { // text = _t.waitText; break; + case Asc.c_oAscAsyncAction['Submit']: + title = _t.savingText; + break; + case ApplyEditRights: title = _t.txtEditingMode; // text = _t.txtEditingMode; @@ -226,7 +239,13 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { $title.innerHTML = `${_t.textLoadingDocument}: ${Math.min(Math.round(proc * 100), 100)}%`; } - } + }; + + const onError = (id, level, errData) => { + if (id===Asc.c_oAscError.ID.Submit) { + submitFail = true; + } + }; return null; }); From 21b9e08ad4d8ff821fd083d841f929b8bdf89f8b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Oct 2024 19:14:09 +0300 Subject: [PATCH 3/3] Fix Bug 70727 --- apps/common/main/resources/less/comments.less | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 68eff8f413..2ed9fae2ce 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -352,11 +352,11 @@ .btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto { width: 16px; height: 16px; - margin: 0 0 0 5px; + margin: 1px 0 0 5px; background-color: transparent; .rtl & { - margin: 0 5px 0 0; + margin: 1px 5px 0 0; } } @@ -432,7 +432,14 @@ } .btn-resolve.comment-resolved, .icon-resolve.i-comment-resolved { - background-position: 0px -64px; + background-position: 0px -63px; + width: 17px; + height: 18px; + margin: 0 0 0 4px; + + .rtl & { + margin: 0px 4px 0 0; + } } .btn-resolve:not(.comment-resolved), .btn-accept{