From 9a492900ab396eab1150acebd9f10ce157d11482 Mon Sep 17 00:00:00 2001
From: Andrey Shimagin
Date: Tue, 29 Mar 2022 08:22:24 +0300
Subject: [PATCH 01/17] Fix loading doc-info for large pdf (show download
progress)
---
.../mobile/src/controller/Main.jsx | 16 ++++++++++++++--
.../mobile/src/store/documentInfo.js | 2 +-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index aa1f50825..445543b3f 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -658,7 +658,9 @@ class MainController extends Component {
const storeDocumentInfo = this.props.storeDocumentInfo;
this.api.asc_registerCallback("asc_onGetDocInfoStart", () => {
- storeDocumentInfo.switchIsLoaded(false);
+ this.timerLoading = setTimeout(() => {
+ storeDocumentInfo.switchIsLoaded(false);
+ }, 2000);
});
this.api.asc_registerCallback("asc_onGetDocInfoStop", () => {
@@ -666,11 +668,21 @@ class MainController extends Component {
});
this.api.asc_registerCallback("asc_onDocInfo", (obj) => {
- storeDocumentInfo.changeCount(obj);
+ this.objectInfo = obj;
+ if(!this.timerDocInfo) {
+ this.timerDocInfo = setInterval(() => {
+ storeDocumentInfo.changeCount(this.objectInfo);
+ }, 300);
+ storeDocumentInfo.changeCount(this.objectInfo);
+ }
+
+ clearTimeout(this.timerLoading);
});
this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => {
storeDocumentInfo.switchIsLoaded(true);
+ clearTimeout(this.timerLoading);
+ clearInterval(this.timerDocInfo);
});
// Color Schemes
diff --git a/apps/documenteditor/mobile/src/store/documentInfo.js b/apps/documenteditor/mobile/src/store/documentInfo.js
index 3bfa67356..d57b4b90c 100644
--- a/apps/documenteditor/mobile/src/store/documentInfo.js
+++ b/apps/documenteditor/mobile/src/store/documentInfo.js
@@ -20,7 +20,7 @@ export class storeDocumentInfo {
symbolsWSCount: 0,
};
- isLoaded = false;
+ isLoaded = true;
dataDoc;
switchIsLoaded(value) {
From a61ed63286c45979ca15bdec2369547d651ce67a Mon Sep 17 00:00:00 2001
From: Andrey Shimagin
Date: Wed, 30 Mar 2022 13:46:31 +0300
Subject: [PATCH 02/17] [DE PE] Fix Bug 56325
---
apps/common/mobile/resources/less/dataview.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/common/mobile/resources/less/dataview.less b/apps/common/mobile/resources/less/dataview.less
index 8ca304ead..0143ebe41 100644
--- a/apps/common/mobile/resources/less/dataview.less
+++ b/apps/common/mobile/resources/less/dataview.less
@@ -25,7 +25,7 @@
height: 22px;
right: -5px;
bottom: -5px;
- .encoded-svg-background('');
+ .encoded-svg-mask('');
}
}
}
\ No newline at end of file
From 43fe49e599a34b7d6cd281d472ffb186cdf7c1e5 Mon Sep 17 00:00:00 2001
From: Andrey Shimagin
Date: Wed, 30 Mar 2022 14:19:41 +0300
Subject: [PATCH 03/17] [DE PE] Fix Bug 56223
---
apps/common/mobile/resources/less/dataview.less | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/apps/common/mobile/resources/less/dataview.less b/apps/common/mobile/resources/less/dataview.less
index 0143ebe41..d47858754 100644
--- a/apps/common/mobile/resources/less/dataview.less
+++ b/apps/common/mobile/resources/less/dataview.less
@@ -14,7 +14,11 @@
}
}
- .active {
+ .row.list:last-child li:not(.active):last-child::after {
+ content: none;
+ }
+
+ .row.list:last-child li.active:last-child, .active {
position: relative;
z-index: 1;
@@ -24,7 +28,9 @@
width: 22px;
height: 22px;
right: -5px;
+ left: auto;
bottom: -5px;
+ transform: none;
.encoded-svg-mask('');
}
}
From 2b5a7a0c6f2802471e016897355e4c1bf9b14766 Mon Sep 17 00:00:00 2001
From: Andrey Shimagin
Date: Wed, 30 Mar 2022 17:34:52 +0300
Subject: [PATCH 04/17] Correct timer-func
---
apps/documenteditor/mobile/src/controller/Main.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index 445543b3f..e673ca908 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -668,6 +668,8 @@ class MainController extends Component {
});
this.api.asc_registerCallback("asc_onDocInfo", (obj) => {
+ clearTimeout(this.timerLoading);
+
this.objectInfo = obj;
if(!this.timerDocInfo) {
this.timerDocInfo = setInterval(() => {
@@ -675,14 +677,12 @@ class MainController extends Component {
}, 300);
storeDocumentInfo.changeCount(this.objectInfo);
}
-
- clearTimeout(this.timerLoading);
});
this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => {
- storeDocumentInfo.switchIsLoaded(true);
clearTimeout(this.timerLoading);
clearInterval(this.timerDocInfo);
+ storeDocumentInfo.switchIsLoaded(true);
});
// Color Schemes
From e50ed3ebcc2204accda4e9f034ab26305eabdec3 Mon Sep 17 00:00:00 2001
From: SergeyEzhin
Date: Wed, 30 Mar 2022 18:45:06 +0400
Subject: [PATCH 05/17] [common] Fix Bug 56305
---
apps/common/mobile/lib/view/About.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/common/mobile/lib/view/About.jsx b/apps/common/mobile/lib/view/About.jsx
index 3dd4cac9a..f553ab95c 100644
--- a/apps/common/mobile/lib/view/About.jsx
+++ b/apps/common/mobile/lib/view/About.jsx
@@ -58,7 +58,7 @@ const PageAbout = props => {
{mailCustomer && mailCustomer.length ? (
- {mailCustomer}
+ {mailCustomer}
) : null}
{urlCustomer && urlCustomer.length ? (
@@ -103,11 +103,11 @@ const PageAbout = props => {
- {__SUPPORT_EMAIL__}
+ {__SUPPORT_EMAIL__}
- {__PUBLISHER_PHONE__}
+ {__PUBLISHER_PHONE__}
{publisherPrintUrl}
From a71d39025bf151d3cb1f1c05a972ee5fed67f276 Mon Sep 17 00:00:00 2001
From: Andrey Shimagin
Date: Wed, 30 Mar 2022 20:22:57 +0300
Subject: [PATCH 06/17] [DE PE] Fix Bug 56354
---
apps/common/mobile/resources/less/common.less | 6 +++---
apps/documenteditor/mobile/src/less/app-ios.less | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 1fdd09e1a..2a1d61bed 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -128,7 +128,7 @@
.bullets,
.numbers,
.multilevels {
- .list{
+ .row.list{
margin: 5px;
ul {
background: none;
@@ -182,12 +182,12 @@
}
}
-.popover__titled .popover-inner{
+.popover {
.list {
ul {
background-color: var(--f7-list-bg-color);
li:first-child, li:last-child {
- a {
+ .item-link {
border-radius: 0;
}
}
diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less
index 3d5e10cf2..f377f5e6a 100644
--- a/apps/documenteditor/mobile/src/less/app-ios.less
+++ b/apps/documenteditor/mobile/src/less/app-ios.less
@@ -1,9 +1,4 @@
.ios {
- .view {
- .bullets-numbers{
- background: @brand-text-on-brand;
- }
- }
// Stepper
.content-block.stepper-block {
From 6ee1794862dcf8e855a6dd4e8bf34c5daec825ba Mon Sep 17 00:00:00 2001
From: Julia Radzhabova
Date: Wed, 30 Mar 2022 23:27:30 +0300
Subject: [PATCH 07/17] [Mobile] Fix translation
---
apps/documenteditor/mobile/locale/az.json | 8 +++++++-
apps/documenteditor/mobile/locale/be.json | 8 +++++++-
apps/documenteditor/mobile/locale/bg.json | 8 +++++++-
apps/documenteditor/mobile/locale/ca.json | 8 +++++++-
apps/documenteditor/mobile/locale/cs.json | 8 +++++++-
apps/documenteditor/mobile/locale/da.json | 8 +++++++-
apps/documenteditor/mobile/locale/de.json | 8 +++++++-
apps/documenteditor/mobile/locale/el.json | 8 +++++++-
apps/documenteditor/mobile/locale/es.json | 8 +++++++-
apps/documenteditor/mobile/locale/fi.json | 8 +++++++-
apps/documenteditor/mobile/locale/fr.json | 8 +++++++-
apps/documenteditor/mobile/locale/gl.json | 8 +++++++-
apps/documenteditor/mobile/locale/hu.json | 8 +++++++-
apps/documenteditor/mobile/locale/it.json | 8 +++++++-
apps/documenteditor/mobile/locale/ja.json | 8 +++++++-
apps/documenteditor/mobile/locale/ko.json | 8 +++++++-
apps/documenteditor/mobile/locale/lo.json | 8 +++++++-
apps/documenteditor/mobile/locale/lv.json | 8 +++++++-
apps/documenteditor/mobile/locale/nb.json | 8 +++++++-
apps/documenteditor/mobile/locale/nl.json | 8 +++++++-
apps/documenteditor/mobile/locale/pl.json | 8 +++++++-
apps/documenteditor/mobile/locale/pt.json | 8 +++++++-
apps/documenteditor/mobile/locale/ro.json | 8 +++++++-
apps/documenteditor/mobile/locale/ru.json | 8 +++++++-
apps/documenteditor/mobile/locale/sk.json | 8 +++++++-
apps/documenteditor/mobile/locale/sl.json | 8 +++++++-
apps/documenteditor/mobile/locale/sv.json | 8 +++++++-
apps/documenteditor/mobile/locale/tr.json | 8 +++++++-
apps/documenteditor/mobile/locale/uk.json | 8 +++++++-
apps/documenteditor/mobile/locale/vi.json | 8 +++++++-
apps/documenteditor/mobile/locale/zh.json | 8 +++++++-
31 files changed, 217 insertions(+), 31 deletions(-)
diff --git a/apps/documenteditor/mobile/locale/az.json b/apps/documenteditor/mobile/locale/az.json
index 75ba31d8b..ff5173d49 100644
--- a/apps/documenteditor/mobile/locale/az.json
+++ b/apps/documenteditor/mobile/locale/az.json
@@ -615,7 +615,13 @@
"txtScheme6": "Konkurs",
"txtScheme7": "Bərabər",
"txtScheme8": "Axın",
- "txtScheme9": "Emalatxana"
+ "txtScheme9": "Emalatxana",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Saxlanmamış dəyişiklikləriniz var. Avtomatik saxlanmanı gözləmək üçün \"Bu Səhifədə Qalın\" üzərinə klikləyin. Bütün saxlanmamış dəyişiklikləri ləğv etmək üçün \"Bu səhifədən Çıxın\" hissəsinin üzərinə klikləyin.",
diff --git a/apps/documenteditor/mobile/locale/be.json b/apps/documenteditor/mobile/locale/be.json
index 5d3cf75ac..eaaabc4fb 100644
--- a/apps/documenteditor/mobile/locale/be.json
+++ b/apps/documenteditor/mobile/locale/be.json
@@ -615,7 +615,13 @@
"txtDownloadTxt": "Download TXT",
"txtIncorrectPwd": "Password is incorrect",
"txtProtected": "Once you enter the password and open the file, the current password will be reset",
- "txtScheme22": "New Office"
+ "txtScheme22": "New Office",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveTitleText": "Вы выходзіце з праграмы",
diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/bg.json
+++ b/apps/documenteditor/mobile/locale/bg.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/ca.json b/apps/documenteditor/mobile/locale/ca.json
index eff9bb386..81d7cc93e 100644
--- a/apps/documenteditor/mobile/locale/ca.json
+++ b/apps/documenteditor/mobile/locale/ca.json
@@ -615,7 +615,13 @@
"txtScheme6": "Esplanada",
"txtScheme7": "Equitat",
"txtScheme8": "Flux",
- "txtScheme9": "Foneria"
+ "txtScheme9": "Foneria",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Tens canvis sense desar. Fes clic a \"Mantingueu-vos en aquesta pàgina\" per esperar al desament automàtic. Fes clic a \"Deixar aquesta pàgina\" per descartar tots els canvis no desats.",
diff --git a/apps/documenteditor/mobile/locale/cs.json b/apps/documenteditor/mobile/locale/cs.json
index d2d03ed7f..ce04ac412 100644
--- a/apps/documenteditor/mobile/locale/cs.json
+++ b/apps/documenteditor/mobile/locale/cs.json
@@ -615,7 +615,13 @@
"txtScheme6": "Hala",
"txtScheme7": "Rovnost",
"txtScheme8": "Tok",
- "txtScheme9": "Slévárna"
+ "txtScheme9": "Slévárna",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "V tomto dokumentu máte neuložené změny. Klikněte na 'Zůstat na této stránce'. Klikněte na 'Opustit tuto stránku' pro zahození neuložených změn.",
diff --git a/apps/documenteditor/mobile/locale/da.json b/apps/documenteditor/mobile/locale/da.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/da.json
+++ b/apps/documenteditor/mobile/locale/da.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json
index d66b6af5c..46e1669e8 100644
--- a/apps/documenteditor/mobile/locale/de.json
+++ b/apps/documenteditor/mobile/locale/de.json
@@ -615,7 +615,13 @@
"txtScheme6": "Halle",
"txtScheme7": "Kapital",
"txtScheme8": "Fluss",
- "txtScheme9": "Gießerei"
+ "txtScheme9": "Gießerei",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Sie haben nicht gespeicherte Änderungen. Klicken Sie auf \"Auf dieser Seite bleiben\" und warten Sie, bis die Datei automatisch gespeichert wird. Klicken Sie auf \"Die Seite verlassen\", um nicht gespeicherte Änderungen zu verwerfen.",
diff --git a/apps/documenteditor/mobile/locale/el.json b/apps/documenteditor/mobile/locale/el.json
index ff44ef5b3..17330cbd0 100644
--- a/apps/documenteditor/mobile/locale/el.json
+++ b/apps/documenteditor/mobile/locale/el.json
@@ -615,7 +615,13 @@
"txtScheme6": "Συνάθροιση",
"txtScheme7": "Μετοχή",
"txtScheme8": "Ροή",
- "txtScheme9": "Χυτήριο"
+ "txtScheme9": "Χυτήριο",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Έχετε μη αποθηκευμένες αλλαγές. Πατήστε 'Παραμονή στη Σελίδα' για να περιμένετε την αυτόματη αποθήκευση. Πατήστε 'Έξοδος από τη Σελίδα' για να απορρίψετε όλες τις μη αποθηκευμένες αλλαγές.",
diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json
index 9b007d802..7df32c868 100644
--- a/apps/documenteditor/mobile/locale/es.json
+++ b/apps/documenteditor/mobile/locale/es.json
@@ -615,7 +615,13 @@
"txtScheme6": "Concurrencia",
"txtScheme7": "Equidad ",
"txtScheme8": "Flujo",
- "txtScheme9": "Fundición"
+ "txtScheme9": "Fundición",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Tiene cambios sin guardar. Haga clic en \"Permanecer en esta página\" para esperar a que se guarde automáticamente. Haga clic en \"Salir de esta página\" para descartar todos los cambios no guardados.",
diff --git a/apps/documenteditor/mobile/locale/fi.json b/apps/documenteditor/mobile/locale/fi.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/fi.json
+++ b/apps/documenteditor/mobile/locale/fi.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json
index 9ba12ca5d..86a2cdcd3 100644
--- a/apps/documenteditor/mobile/locale/fr.json
+++ b/apps/documenteditor/mobile/locale/fr.json
@@ -615,7 +615,13 @@
"txtScheme6": "Rotonde",
"txtScheme7": "Capitaux",
"txtScheme8": "Flux",
- "txtScheme9": "Fonderie"
+ "txtScheme9": "Fonderie",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur Rester sur cette page et attendez l'enregistrement automatique. Cliquez sur Quitter cette page pour annuler toutes les modifications non enregistrées.",
diff --git a/apps/documenteditor/mobile/locale/gl.json b/apps/documenteditor/mobile/locale/gl.json
index 158b8067e..c773c1f0f 100644
--- a/apps/documenteditor/mobile/locale/gl.json
+++ b/apps/documenteditor/mobile/locale/gl.json
@@ -615,7 +615,13 @@
"txtScheme6": "Concorrencia",
"txtScheme7": "Equidade",
"txtScheme8": "Fluxo",
- "txtScheme9": "Fundición"
+ "txtScheme9": "Fundición",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Ten cambios sen gardar. Prema en \"Permanecer nesta páxina\" para esperar a que se garde automaticamente. Prema en \"Saír desta páxina\" para descartar todos os cambios non gardados.",
diff --git a/apps/documenteditor/mobile/locale/hu.json b/apps/documenteditor/mobile/locale/hu.json
index e1d0cada3..3b00337fa 100644
--- a/apps/documenteditor/mobile/locale/hu.json
+++ b/apps/documenteditor/mobile/locale/hu.json
@@ -615,7 +615,13 @@
"txtScheme6": "Előcsarnok",
"txtScheme7": "Saját tőke",
"txtScheme8": "Folyam",
- "txtScheme9": "Öntöde"
+ "txtScheme9": "Öntöde",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Nem mentett módosításai vannak. Kattintson a „Maradj ezen az oldalon” gombra az automatikus mentés megvárásához. Kattintson a \"Hagyja el ezt az oldalt\" gombra az összes nem mentett módosítás elvetéséhez.",
diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json
index 903498de8..b73769def 100644
--- a/apps/documenteditor/mobile/locale/it.json
+++ b/apps/documenteditor/mobile/locale/it.json
@@ -615,7 +615,13 @@
"txtScheme6": "Concorso",
"txtScheme7": "Equità",
"txtScheme8": "Flusso",
- "txtScheme9": "Fonderia"
+ "txtScheme9": "Fonderia",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Hai dei cambiamenti non salvati. Premi 'Rimanere sulla pagina' per attendere il salvataggio automatico. Premi 'Lasciare la pagina' per eliminare tutte le modifiche non salvate.",
diff --git a/apps/documenteditor/mobile/locale/ja.json b/apps/documenteditor/mobile/locale/ja.json
index 78599cf30..0c93612ab 100644
--- a/apps/documenteditor/mobile/locale/ja.json
+++ b/apps/documenteditor/mobile/locale/ja.json
@@ -615,7 +615,13 @@
"txtScheme6": "コンコース",
"txtScheme7": "株主資本",
"txtScheme8": "フロー",
- "txtScheme9": "ファウンドリ"
+ "txtScheme9": "ファウンドリ",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "保存されていない変更があります。自動保存を待つように「このページから移動しない」をクリックしてください。保存されていない変更を破棄ように「このページから移動する」をクリックしてください。",
diff --git a/apps/documenteditor/mobile/locale/ko.json b/apps/documenteditor/mobile/locale/ko.json
index cc5d5fa2c..0afbdfc82 100644
--- a/apps/documenteditor/mobile/locale/ko.json
+++ b/apps/documenteditor/mobile/locale/ko.json
@@ -615,7 +615,13 @@
"txtScheme6": "광장",
"txtScheme7": "같음",
"txtScheme8": "플로우",
- "txtScheme9": "발견"
+ "txtScheme9": "발견",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "저장하지 않은 변경 사항이 있습니다. 자동 저장이 완료될 때까지 기다리려면 \"이 페이지에 머물기\"를 클릭하십시오. \"이 페이지에서 나가기\"를 클릭하면 저장되지 않은 모든 변경 사항이 삭제됩니다.",
diff --git a/apps/documenteditor/mobile/locale/lo.json b/apps/documenteditor/mobile/locale/lo.json
index 656842d2a..281b40971 100644
--- a/apps/documenteditor/mobile/locale/lo.json
+++ b/apps/documenteditor/mobile/locale/lo.json
@@ -615,7 +615,13 @@
"txtScheme21": "Verve",
"txtScheme22": "New Office",
"txtScheme5": "Civic",
- "txtScheme6": "Concourse"
+ "txtScheme6": "Concourse",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"leaveButtonText": "ອອກຈາກໜ້ານີ້",
diff --git a/apps/documenteditor/mobile/locale/lv.json b/apps/documenteditor/mobile/locale/lv.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/lv.json
+++ b/apps/documenteditor/mobile/locale/lv.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/nb.json b/apps/documenteditor/mobile/locale/nb.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/nb.json
+++ b/apps/documenteditor/mobile/locale/nb.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/nl.json b/apps/documenteditor/mobile/locale/nl.json
index 3615e2157..d7f68c0bf 100644
--- a/apps/documenteditor/mobile/locale/nl.json
+++ b/apps/documenteditor/mobile/locale/nl.json
@@ -615,7 +615,13 @@
"txtScheme6": "Concours",
"txtScheme7": "Vermogen",
"txtScheme8": "Stroom",
- "txtScheme9": "Gieterij"
+ "txtScheme9": "Gieterij",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "U heeft nog niet opgeslagen wijzigingen. Klik op 'Blijf op deze pagina' om te wachten op automatisch opslaan. Klik op 'Verlaat deze pagina' om alle niet-opgeslagen wijzigingen te verwijderen.",
diff --git a/apps/documenteditor/mobile/locale/pl.json b/apps/documenteditor/mobile/locale/pl.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/pl.json
+++ b/apps/documenteditor/mobile/locale/pl.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/pt.json b/apps/documenteditor/mobile/locale/pt.json
index 778fe96fa..d00445300 100644
--- a/apps/documenteditor/mobile/locale/pt.json
+++ b/apps/documenteditor/mobile/locale/pt.json
@@ -615,7 +615,13 @@
"txtScheme6": "Concurso",
"txtScheme7": "Patrimônio Líquido",
"txtScheme8": "Fluxo",
- "txtScheme9": "Fundição"
+ "txtScheme9": "Fundição",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Você tem mudanças não salvas. Clique em 'Ficar nesta página' para esperar pela auto-salvar. Clique em 'Sair desta página' para descartar todas as mudanças não salvas.",
diff --git a/apps/documenteditor/mobile/locale/ro.json b/apps/documenteditor/mobile/locale/ro.json
index e97bee31b..e4e7fb337 100644
--- a/apps/documenteditor/mobile/locale/ro.json
+++ b/apps/documenteditor/mobile/locale/ro.json
@@ -615,7 +615,13 @@
"txtScheme6": "Concurență",
"txtScheme7": "Echilibru",
"txtScheme8": "Flux",
- "txtScheme9": "Forjă"
+ "txtScheme9": "Forjă",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Nu ați salvat modificările din documentul. Faceți clic pe Rămâi în pagină și așteptați la salvare automată. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.",
diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json
index 20dcafc5f..184da95c8 100644
--- a/apps/documenteditor/mobile/locale/ru.json
+++ b/apps/documenteditor/mobile/locale/ru.json
@@ -615,7 +615,13 @@
"txtScheme6": "Открытая",
"txtScheme7": "Справедливость",
"txtScheme8": "Поток",
- "txtScheme9": "Литейная"
+ "txtScheme9": "Литейная",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
diff --git a/apps/documenteditor/mobile/locale/sk.json b/apps/documenteditor/mobile/locale/sk.json
index c27da8b86..b736d16bf 100644
--- a/apps/documenteditor/mobile/locale/sk.json
+++ b/apps/documenteditor/mobile/locale/sk.json
@@ -615,7 +615,13 @@
"txtScheme6": "Hala",
"txtScheme7": "Spravodlivosť",
"txtScheme8": "Tok",
- "txtScheme9": "Zlieváreň"
+ "txtScheme9": "Zlieváreň",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Máte neuložené zmeny. Kliknite na „Zostať na tejto stránke“ a počkajte na automatické uloženie. Kliknutím na „Opustiť túto stránku“ zahodíte všetky neuložené zmeny.",
diff --git a/apps/documenteditor/mobile/locale/sl.json b/apps/documenteditor/mobile/locale/sl.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/sl.json
+++ b/apps/documenteditor/mobile/locale/sl.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/sv.json b/apps/documenteditor/mobile/locale/sv.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/sv.json
+++ b/apps/documenteditor/mobile/locale/sv.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/tr.json b/apps/documenteditor/mobile/locale/tr.json
index 95e2e661c..99ed2ca66 100644
--- a/apps/documenteditor/mobile/locale/tr.json
+++ b/apps/documenteditor/mobile/locale/tr.json
@@ -615,7 +615,13 @@
"txtScheme8": "Yayılma",
"txtScheme9": "Döküm",
"txtScheme14": "Oriel",
- "txtScheme19": "Trek"
+ "txtScheme19": "Trek",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "Kaydedilmemiş değişiklikleriniz mevcut. Otomatik kaydetmeyi beklemek için 'Bu Sayfada Kal' seçeneğini tıklayın. Kaydedilmemiş tüm değişiklikleri atmak için 'Bu Sayfadan Ayrıl'ı tıklayın.",
diff --git a/apps/documenteditor/mobile/locale/uk.json b/apps/documenteditor/mobile/locale/uk.json
index e20475d42..4c414123a 100644
--- a/apps/documenteditor/mobile/locale/uk.json
+++ b/apps/documenteditor/mobile/locale/uk.json
@@ -615,7 +615,13 @@
"txtScheme6": "Відкрита",
"txtScheme7": "Власний",
"txtScheme8": "Потік",
- "txtScheme9": "Ливарна"
+ "txtScheme9": "Ливарна",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "У документі є незбережені зміни. Натисніть 'Залишитись на сторінці', щоб дочекатися автозбереження. Натисніть 'Піти зі сторінки', щоб скинути всі незбережені зміни.",
diff --git a/apps/documenteditor/mobile/locale/vi.json b/apps/documenteditor/mobile/locale/vi.json
index a33c05493..d3d23cc88 100644
--- a/apps/documenteditor/mobile/locale/vi.json
+++ b/apps/documenteditor/mobile/locale/vi.json
@@ -615,7 +615,13 @@
"textParagraphs": "Paragraphs",
"textSpaces": "Spaces",
"textSymbols": "Symbols",
- "textWords": "Words"
+ "textWords": "Words",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"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.",
diff --git a/apps/documenteditor/mobile/locale/zh.json b/apps/documenteditor/mobile/locale/zh.json
index 2c2e7b066..feb22db83 100644
--- a/apps/documenteditor/mobile/locale/zh.json
+++ b/apps/documenteditor/mobile/locale/zh.json
@@ -615,7 +615,13 @@
"txtScheme6": "汇合",
"txtScheme7": "公平",
"txtScheme8": "流动",
- "txtScheme9": "发现"
+ "txtScheme9": "发现",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No"
},
"Toolbar": {
"dlgLeaveMsgText": "你有未保存的修改。点击“留在该页”可等待自动保存完成。点击“离开该页”将丢弃全部未经保存的修改。",
From aad4424ed8d54cd9ca1a89447a4a20021be5cdfb Mon Sep 17 00:00:00 2001
From: JuliaSvinareva
Date: Thu, 31 Mar 2022 18:15:58 +0300
Subject: [PATCH 08/17] [SSE] Fix bug 56380
---
apps/spreadsheeteditor/main/app/controller/Print.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js
index ff0c5c8e0..ae8eda435 100644
--- a/apps/spreadsheeteditor/main/app/controller/Print.js
+++ b/apps/spreadsheeteditor/main/app/controller/Print.js
@@ -456,8 +456,8 @@ define([
panel.spnMarginRight.on('change', _.bind(this.propertyChange, this, panel));
panel.chPrintGrid.on('change', _.bind(this.propertyChange, this, panel));
panel.chPrintRows.on('change', _.bind(this.propertyChange, this, panel));
- panel.txtRangeTop.on('changing', _.bind(this.propertyChange, this, panel));
- panel.txtRangeLeft.on('changing', _.bind(this.propertyChange, this, panel));
+ panel.txtRangeTop.on('changed:after', _.bind(this.propertyChange, this, panel));
+ panel.txtRangeLeft.on('changed:after', _.bind(this.propertyChange, this, panel));
panel.txtRangeTop.on('button:click', _.bind(this.onPresetSelect, this, panel, 'top', panel.btnPresetsTop.menu, {value: 'select'}));
panel.txtRangeLeft.on('button:click', _.bind(this.onPresetSelect, this, panel, 'left', panel.btnPresetsLeft.menu, {value: 'select'}));
panel.btnPresetsTop.menu.on('item:click', _.bind(this.onPresetSelect, this, panel, 'top'));
@@ -521,7 +521,6 @@ define([
fillComponents: function(panel, selectdata) {
var me = this;
panel.txtRangeTop.validation = function(value) {
- !me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) {
return true;
}
@@ -531,7 +530,6 @@ define([
selectdata && panel.txtRangeTop.updateBtnHint(this.textSelectRange);
panel.txtRangeLeft.validation = function(value) {
- !me._noApply && me.propertyChange(panel);
if (_.isEmpty(value)) {
return true;
}
From b8f6ae7d3abe195b74869ce4181cb02bf558971b Mon Sep 17 00:00:00 2001
From: SergeyEzhin
Date: Thu, 31 Mar 2022 20:38:01 +0400
Subject: [PATCH 09/17] [DE PE SSE mobile] Fix Bug 53597
---
apps/common/mobile/lib/controller/ContextMenu.jsx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx
index 94cce47c8..9a41688bc 100644
--- a/apps/common/mobile/lib/controller/ContextMenu.jsx
+++ b/apps/common/mobile/lib/controller/ContextMenu.jsx
@@ -105,6 +105,9 @@ class ContextMenuController extends Component {
onApiOpenContextMenu(x, y) {
if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup, .actions-modal.modal-in').length < 1) {
+ const subNav = document.querySelector('.subnavbar');
+ const rect = subNav.getBoundingClientRect();
+
this.setState({
items: this.initMenuItems(),
extraItems: this.initExtraItems()
@@ -112,8 +115,8 @@ class ContextMenuController extends Component {
if ( this.state.items.length > 0 ) {
const api = Common.EditorApi.get();
-
- this.$targetEl.css({left: `${x}px`, top: `${y}px`});
+
+ this.$targetEl.css({left: `${x}px`, top: y < rect.bottom ? `${rect.bottom}px` : `${y}px`});
const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement);
if (Device.android)
From d660b569753d9d4151d46c47a4a66459f8407c49 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova
Date: Thu, 31 Mar 2022 20:29:11 +0300
Subject: [PATCH 10/17] Fix Bug 56388
---
apps/common/main/lib/component/ComboBoxFonts.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js
index de9b2a3d0..df6242964 100644
--- a/apps/common/main/lib/component/ComboBoxFonts.js
+++ b/apps/common/main/lib/component/ComboBoxFonts.js
@@ -457,6 +457,7 @@ define([
this.trigger('show:after', this, e);
this.flushVisibleFontsTiles();
this.updateVisibleFontsTiles(null, 0);
+ Common.Utils.isGecko && this.scroller && this.scroller.update();
} else {
Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments);
}
From 9d0e5525a6708d2150352ac69a26b20304875583 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva
Date: Thu, 31 Mar 2022 22:19:38 +0300
Subject: [PATCH 11/17] [SSE] Fix bug 56326
---
apps/spreadsheeteditor/main/app/controller/Print.js | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js
index ae8eda435..39bafbddd 100644
--- a/apps/spreadsheeteditor/main/app/controller/Print.js
+++ b/apps/spreadsheeteditor/main/app/controller/Print.js
@@ -115,6 +115,7 @@ define([
this.api = o;
this.api.asc_registerCallback('asc_onSheetsChanged', _.bind(this.updateSheetsInfo, this));
this.api.asc_registerCallback('asc_onPrintPreviewSheetChanged', _.bind(this.onApiChangePreviewSheet, this));
+ this.api.asc_registerCallback('asc_onUpdateDocumentProps', _.bind(this.updateDocumentProps, this));
},
updateSheetsInfo: function() {
@@ -746,6 +747,13 @@ define([
this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
},
+ updateDocumentProps: function (index) {
+ if (this._isPreviewVisible) {
+ this._changedProps[index] = this.api.asc_getPageOptions(index);
+ this.updatePreview();
+ }
+ },
+
warnCheckMargings: 'Margins are incorrect',
strAllSheets: 'All Sheets',
textWarning: 'Warning',
From 278467b74ac7f73b5dbff047d14e76010275a83b Mon Sep 17 00:00:00 2001
From: Julia Radzhabova
Date: Fri, 1 Apr 2022 13:10:56 +0300
Subject: [PATCH 12/17] [PE] Fix lock animation tab
---
.../main/app/controller/Animation.js | 7 +++-
.../main/app/view/Animation.js | 34 +++++++++----------
.../main/app/view/Toolbar.js | 3 +-
3 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js
index b4ec5c97a..4b36a0e52 100644
--- a/apps/presentationeditor/main/app/controller/Animation.js
+++ b/apps/presentationeditor/main/app/controller/Animation.js
@@ -347,8 +347,11 @@ define([
onFocusObject: function(selectedObjects) {
this.AnimationProperties = null;
for (var i = 0; i
Date: Fri, 1 Apr 2022 18:07:01 +0300
Subject: [PATCH 13/17] Update translation
---
apps/presentationeditor/embed/locale/id.json | 6 ++++++
apps/spreadsheeteditor/embed/locale/id.json | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/apps/presentationeditor/embed/locale/id.json b/apps/presentationeditor/embed/locale/id.json
index 826ba68e6..a1c4e51f7 100644
--- a/apps/presentationeditor/embed/locale/id.json
+++ b/apps/presentationeditor/embed/locale/id.json
@@ -13,11 +13,16 @@
"PE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
"PE.ApplicationController.errorFilePassProtect": "File diproteksi kata sandi",
"PE.ApplicationController.errorFileSizeExceed": "Ukuran file melebihi",
+ "PE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
+ "PE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.
Silakan kontak admin Server Dokumen Anda.",
+ "PE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.
Silakan hubungi admin Server Dokumen Anda.",
"PE.ApplicationController.errorUpdateVersionOnDisconnect": "Hubungan internet telah",
"PE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
"PE.ApplicationController.notcriticalErrorTitle": "Peringatan",
+ "PE.ApplicationController.openErrorText": "Eror ketika membuka file.",
"PE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat,",
"PE.ApplicationController.textAnonymous": "Anonim",
+ "PE.ApplicationController.textGuest": "Tamu",
"PE.ApplicationController.textLoadingDocument": "Memuat penyajian",
"PE.ApplicationController.textOf": "Dari",
"PE.ApplicationController.txtClose": "Tutup",
@@ -28,5 +33,6 @@
"PE.ApplicationView.txtEmbed": "Melekatkan",
"PE.ApplicationView.txtFileLocation": "Buka Dokumen",
"PE.ApplicationView.txtFullScreen": "Layar penuh",
+ "PE.ApplicationView.txtPrint": "Cetak",
"PE.ApplicationView.txtShare": "Bagikan"
}
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/embed/locale/id.json b/apps/spreadsheeteditor/embed/locale/id.json
index 74414bda4..d2ba60a9a 100644
--- a/apps/spreadsheeteditor/embed/locale/id.json
+++ b/apps/spreadsheeteditor/embed/locale/id.json
@@ -13,10 +13,15 @@
"SSE.ApplicationController.errorDefaultMessage": "Kode kesalahan %1",
"SSE.ApplicationController.errorFilePassProtect": "Dokumen dilindungi dengan kata sandi dan tidak dapat dibuka.",
"SSE.ApplicationController.errorFileSizeExceed": "Dokumen melebihi ukuran ",
+ "SSE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
+ "SSE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.
Silakan kontak admin Server Dokumen Anda.",
+ "SSE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.
Silakan hubungi admin Server Dokumen Anda.",
"SSE.ApplicationController.errorUpdateVersionOnDisconnect": "Huhungan internet telah",
"SSE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
"SSE.ApplicationController.notcriticalErrorTitle": "Peringatan",
+ "SSE.ApplicationController.openErrorText": "Eror ketika membuka file.",
"SSE.ApplicationController.scriptLoadError": "Hubungan terlalu lambat",
+ "SSE.ApplicationController.textAnonymous": "Anonim",
"SSE.ApplicationController.textGuest": "Tamu",
"SSE.ApplicationController.textLoadingDocument": "Memuat spread sheet",
"SSE.ApplicationController.textOf": "Dari",
From c84abb1d8ed471c1af681749261cb172c0c1c791 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova
Date: Fri, 1 Apr 2022 18:10:50 +0300
Subject: [PATCH 14/17] [Mobile] Update translation
---
apps/documenteditor/mobile/locale/be.json | 10 +++++-----
apps/documenteditor/mobile/locale/lo.json | 14 +++++++-------
apps/documenteditor/mobile/locale/tr.json | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/apps/documenteditor/mobile/locale/be.json b/apps/documenteditor/mobile/locale/be.json
index eaaabc4fb..993625c8b 100644
--- a/apps/documenteditor/mobile/locale/be.json
+++ b/apps/documenteditor/mobile/locale/be.json
@@ -612,16 +612,16 @@
"textDownloadTxt": "If you continue saving in this format all features except the text will be lost. Are you sure you want to continue?",
"textEnableAllMacrosWithoutNotification": "Enable all macros without notification",
"textFindAndReplaceAll": "Find and Replace All",
- "txtDownloadTxt": "Download TXT",
- "txtIncorrectPwd": "Password is incorrect",
- "txtProtected": "Once you enter the password and open the file, the current password will be reset",
- "txtScheme22": "New Office",
"textPageSize": "Page Size",
"textPdfVer": "PDF Version",
"textPdfTagged": "Tagged PDF",
"textFastWV": "Fast Web View",
"textYes": "Yes",
- "textNo": "No"
+ "textNo": "No",
+ "txtDownloadTxt": "Download TXT",
+ "txtIncorrectPwd": "Password is incorrect",
+ "txtProtected": "Once you enter the password and open the file, the current password will be reset",
+ "txtScheme22": "New Office"
},
"Toolbar": {
"dlgLeaveTitleText": "Вы выходзіце з праграмы",
diff --git a/apps/documenteditor/mobile/locale/lo.json b/apps/documenteditor/mobile/locale/lo.json
index 281b40971..9b65e5353 100644
--- a/apps/documenteditor/mobile/locale/lo.json
+++ b/apps/documenteditor/mobile/locale/lo.json
@@ -606,6 +606,12 @@
"textMarginsW": "Left and right margins are too wide for a given page width",
"textOpenFile": "Enter a password to open the file",
"textPages": "Pages",
+ "textPageSize": "Page Size",
+ "textPdfVer": "PDF Version",
+ "textPdfTagged": "Tagged PDF",
+ "textFastWV": "Fast Web View",
+ "textYes": "Yes",
+ "textNo": "No",
"txtDownloadTxt": "Download TXT",
"txtIncorrectPwd": "Password is incorrect",
"txtProtected": "Once you enter the password and open the file, the current password will be reset",
@@ -615,13 +621,7 @@
"txtScheme21": "Verve",
"txtScheme22": "New Office",
"txtScheme5": "Civic",
- "txtScheme6": "Concourse",
- "textPageSize": "Page Size",
- "textPdfVer": "PDF Version",
- "textPdfTagged": "Tagged PDF",
- "textFastWV": "Fast Web View",
- "textYes": "Yes",
- "textNo": "No"
+ "txtScheme6": "Concourse"
},
"Toolbar": {
"leaveButtonText": "ອອກຈາກໜ້ານີ້",
diff --git a/apps/documenteditor/mobile/locale/tr.json b/apps/documenteditor/mobile/locale/tr.json
index 99ed2ca66..cf9ca375a 100644
--- a/apps/documenteditor/mobile/locale/tr.json
+++ b/apps/documenteditor/mobile/locale/tr.json
@@ -614,14 +614,14 @@
"txtScheme7": "Net Değer",
"txtScheme8": "Yayılma",
"txtScheme9": "Döküm",
- "txtScheme14": "Oriel",
- "txtScheme19": "Trek",
"textPageSize": "Page Size",
"textPdfVer": "PDF Version",
"textPdfTagged": "Tagged PDF",
"textFastWV": "Fast Web View",
"textYes": "Yes",
- "textNo": "No"
+ "textNo": "No",
+ "txtScheme14": "Oriel",
+ "txtScheme19": "Trek"
},
"Toolbar": {
"dlgLeaveMsgText": "Kaydedilmemiş değişiklikleriniz mevcut. Otomatik kaydetmeyi beklemek için 'Bu Sayfada Kal' seçeneğini tıklayın. Kaydedilmemiş tüm değişiklikleri atmak için 'Bu Sayfadan Ayrıl'ı tıklayın.",
From 44013eb572512f0b9a799ff3489c2f3c6d385662 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva
Date: Mon, 4 Apr 2022 16:42:34 +0300
Subject: [PATCH 15/17] [SSE] Fix bug 56426
---
apps/spreadsheeteditor/main/app/controller/Print.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js
index 39bafbddd..3a6f827e5 100644
--- a/apps/spreadsheeteditor/main/app/controller/Print.js
+++ b/apps/spreadsheeteditor/main/app/controller/Print.js
@@ -647,6 +647,8 @@ define([
e.preventDefault();
e.stopImmediatePropagation();
}
+ this.printSettings.txtRangeTop.cmpEl.find('input:focus').blur();
+ this.printSettings.txtRangeLeft.cmpEl.find('input:focus').blur();
var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0;
this.onChangePreviewPage(forward);
},
From f4075fd6c89afde73be1cf4e7049ec5774cc922a Mon Sep 17 00:00:00 2001
From: Julia Radzhabova
Date: Tue, 5 Apr 2022 11:28:35 +0300
Subject: [PATCH 16/17] Refactoring info tips
---
apps/common/main/resources/less/synchronize-tip.less | 8 --------
1 file changed, 8 deletions(-)
diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less
index 06b72e9f7..2e3297484 100644
--- a/apps/common/main/resources/less/synchronize-tip.less
+++ b/apps/common/main/resources/less/synchronize-tip.less
@@ -195,7 +195,6 @@
top: 0;
left: 8px;
width: 16px;
- .box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
}
}
}
@@ -212,7 +211,6 @@
top: 0;
left: -8px;
width: 16px;
- .box-shadow(0 4px 8px -1px rgba(0, 0, 0, 0.2));
}
}
}
@@ -324,7 +322,6 @@
&:before {
top: -8px;
left: -8px;
- .box-shadow(2px 2px 8px -1px rgba(0, 0, 0, 0.2));
}
&:after {
top: -6px;
@@ -346,7 +343,6 @@
&:before {
top: 8px;
left: 8px;
- .box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
}
&:after {
top: 6px;
@@ -368,7 +364,6 @@
&:before {
top: 8px;
left: -8px;
- .box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
}
&:after {
top: 6px;
@@ -412,8 +407,6 @@
&:before {
bottom: -7px;
left: -7px;
- //width: 15px;
- .box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2));
}
&:after {
top: -2px;
@@ -475,7 +468,6 @@
-o-transform: rotate(45deg);
transform: rotate(45deg);
- .box-shadow(0 4px 8px -1px rgba(0, 0, 0, 0.2));
border: @scaled-one-px-value-ie solid @background-notification-popover-ie;
border: @scaled-one-px-value solid @background-notification-popover;
}
From bbf94ac3a150e2bd4182b1fdb5b4fcb47f2b61fb Mon Sep 17 00:00:00 2001
From: Julia Radzhabova
Date: Tue, 5 Apr 2022 13:08:19 +0300
Subject: [PATCH 17/17] [DE] For Bug 55810
---
apps/documenteditor/main/app/controller/Navigation.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/apps/documenteditor/main/app/controller/Navigation.js b/apps/documenteditor/main/app/controller/Navigation.js
index f528e131e..b36373da3 100644
--- a/apps/documenteditor/main/app/controller/Navigation.js
+++ b/apps/documenteditor/main/app/controller/Navigation.js
@@ -112,6 +112,12 @@ define([
panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this));
panelNavigation.navigationMenu.on('item:click', _.bind(this.onMenuItemClick, this));
panelNavigation.navigationMenu.items[11].menu.on('item:click', _.bind(this.onMenuLevelsItemClick, this));
+
+ var viewport = this.getApplication().getController('Viewport').getView('Viewport');
+ viewport.hlayout.on('layout:resizedrag', function () {
+ if (panelNavigation.viewNavigationList && panelNavigation.viewNavigationList.scroller)
+ panelNavigation.viewNavigationList.scroller.update({alwaysVisibleY: true});
+ });
},
updateNavigation: function() {