Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1752 from ONLYOFFICE/fix/bug_56029

Browse source 
Fix/bug 56029
This commit is contained in:
Julia Radzhabova 2022-05-19 19:36:08 +03:00 committed by GitHub
parent 42a1e0e1ee abd7a711b1
commit 6a0509e1ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -275,7 +275,7 @@ define([
delta = event.deltaY;
}
if ((event.ctrlKey || event.metaKey) && !event.altKey) {
if (event.ctrlKey && !event.altKey) {
if (delta < 0) {
me.api.zoomOut();
} else if (delta > 0) {

4
apps/documenteditor/main/resources/help/de/HelpfulHints/KeyboardShortcuts.htm
View file

@ -197,13 +197,13 @@
<tr>
<td>Vergrößern</td>
<td><kbd>STRG</kbd>+<kbd>+</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>=</kbd></td>
<td>Die Ansicht des aktuellen Dokuments wird vergrößert.</td>
</tr>
<tr>
<td>Verkleinern</td>
<td><kbd>STRG</kbd>+<kbd>-</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>-</kbd></td>
<td>Die Ansicht des aktuellen Dokuments wird verkleinert.</td>
</tr>
<tr>

4
apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
View file

@ -203,13 +203,13 @@
<tr>
<td>Zoom In</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom in the currently edited document.</td>
</tr>
<tr>
<td>Zoom Out</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited document.</td>
</tr>
<tr>

4
apps/documenteditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm
View file

@ -180,13 +180,13 @@
<tr>
<td>Acercar</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Acerca el documento actualmente editado.</td>
</tr>
<tr>
<td>Alejar</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Aleja el documento actualmente editado.</td>
</tr>
<tr>

4
apps/documenteditor/main/resources/help/fr/HelpfulHints/KeyboardShortcuts.htm
View file

@ -203,13 +203,13 @@
<tr>
<td>Zoom avant</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Agrandir le zoom du document en cours d'édition.</td>
</tr>
<tr>
<td>Zoom arrière</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Réduire le zoom du document en cours d'édition.</td>
</tr>
<tr>

4
apps/documenteditor/main/resources/help/it/HelpfulHints/KeyboardShortcuts.htm
View file

@ -180,13 +180,13 @@
<tr>
<td>Zoom In</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom in the currently edited document.</td>
</tr>
<tr>
<td>Zoom Out</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited document.</td>
</tr>
<tr>

4
apps/documenteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
View file

@ -208,13 +208,13 @@
<tr>
<td>Увеличить</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>+</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>+</kbd></td>
<td>Увеличить масштаб редактируемого документа.</td>
</tr>
<tr>
<td>Уменьшить</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Уменьшить масштаб редактируемого документа.</td>
</tr>
<tr>

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -263,7 +263,7 @@ define([
delta = event.deltaY;
}
if ((event.ctrlKey || event.metaKey) && !event.altKey){
if (event.ctrlKey && !event.altKey) {
if (delta < 0)
me.api.zoomOut();
else if (delta > 0)

4
apps/presentationeditor/main/resources/help/de/HelpfulHints/KeyboardShortcuts.htm
View file

@ -147,13 +147,13 @@
<tr>
<td>Vergrößern</td>
<td><kbd>STRG</kbd>+<kbd>+</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>=</kbd></td>
<td>Die Ansicht der aktuellen Präsentation vergrößern.</td>
</tr>
<tr>
<td>Verkleinern</td>
<td><kbd>STRG</kbd>+<kbd>-</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>-</kbd></td>
<td>Die Ansicht der aktuellen Präsentation verkleinern.</td>
</tr>
<tr id="manageslides">

6
apps/presentationeditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
View file

@ -155,13 +155,13 @@
<tr>
<td>Zoom In</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom in the currently edited presentation.</td>
</tr>
<tr>
<td>Zoom Out</td>
<td><kbd>Tab</kbd>/<kbd>Shift</kbd>+<kbd>Tab</kbd></td>
<td><kbd>↹ Tab</kbd>/<kbd>⇧ Shift</kbd>+<kbd>↹ Tab</kbd></td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited presentation.</td>
</tr>
<tr>

4
apps/presentationeditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm
View file

@ -132,13 +132,13 @@
<tr>
<td>Acercar</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Acerca la presentación que se está editando.</td>
</tr>
<tr>
<td>Alejar</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Aleja la presentación que se está editando.</td>
</tr>
<tr id="manageslides">

4
apps/presentationeditor/main/resources/help/fr/HelpfulHints/KeyboardShortcuts.htm
View file

@ -155,13 +155,13 @@
<tr>
<td>Zoom avant</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Agrandir la présentation en cours d'édition.</td>
</tr>
<tr>
<td>Zoom arrière</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Effectuer un zoom arrière de la présentation en cours d'édition.</td>
</tr>
<tr>

4
apps/presentationeditor/main/resources/help/it/HelpfulHints/KeyboardShortcuts.htm
View file

@ -132,13 +132,13 @@
<tr>
<td>Zoom In</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom in the currently edited presentation.</td>
</tr>
<tr>
<td>Zoom Out</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited presentation.</td>
</tr>
<tr id="manageslides">

4
apps/presentationeditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
View file

@ -140,13 +140,13 @@
<tr>
<td>Увеличить масштаб</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Увеличить масштаб редактируемой презентации.</td>
</tr>
<tr>
<td>Уменьшить масштаб</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Уменьшить масштаб редактируемой презентации.</td>
</tr>
<tr>

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1719,7 +1719,7 @@ define([
delta = e.deltaY;
}
if ((e.ctrlKey || e.metaKey) && !e.altKey) {
if (e.ctrlKey && !e.altKey) {
var factor = this.api.asc_getZoom();
if (delta < 0) {
factor = Math.ceil(factor * 10)/10;

4
apps/spreadsheeteditor/main/resources/help/de/HelpfulHints/KeyboardShortcuts.htm
View file

@ -221,13 +221,13 @@
<tr>
<td>Vergrößern</td>
<td><kbd>STRG</kbd>+<kbd>+</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>=</kbd></td>
<td>Die Ansicht der aktuellen Tabelle wird vergrößert.</td>
</tr>
<tr>
<td>Verkleinern</td>
<td><kbd>STRG</kbd>+<kbd>-</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ STRG</kbd>+<kbd>-</kbd></td>
<td>Die Ansicht der aktuelle bearbeiteten Tabelle wird verkleinert.</td>
</tr>
<tr>

4
apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm
View file

@ -239,13 +239,13 @@
<tr>
<td>Zoom In</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom in the currently edited spreadsheet.</td>
</tr>
<tr>
<td>Zoom Out</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited spreadsheet.</td>
</tr>
<tr>

4
apps/spreadsheeteditor/main/resources/help/es/HelpfulHints/KeyboardShortcuts.htm
View file

@ -198,13 +198,13 @@
<tr>
<td>Acercar</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Ampliar la hoja de cálculo que se está editando.</td>
</tr>
<tr>
<td>Alejar</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Alejar la hoja de cálculo que se está editando.</td>
</tr>
<tr>

4
apps/spreadsheeteditor/main/resources/help/fr/HelpfulHints/KeyboardShortcuts.htm
View file

@ -228,13 +228,13 @@
<tr>
<td>Zoom avant</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>⌘ Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom avant sur la feuille de calcul en cours d'édition.</td>
</tr>
<tr>
<td>Zoom arrière</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>⌘ Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom arrière sur la feuille de calcul en cours d'édition.</td>
</tr>
<tr>

4
apps/spreadsheeteditor/main/resources/help/it/HelpfulHints/KeyboardShortcuts.htm
View file

@ -198,13 +198,13 @@
<tr>
<td>Zoom In</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Zoom in the currently edited spreadsheet.</td>
</tr>
<tr>
<td>Zoom Out</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Zoom out the currently edited spreadsheet.</td>
</tr>
<tr>

4
apps/spreadsheeteditor/main/resources/help/ru/HelpfulHints/KeyboardShortcuts.htm
View file

@ -238,13 +238,13 @@
<tr>
<td>Увеличить</td>
<td><kbd>Ctrl</kbd>+<kbd>+</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>=</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>=</kbd></td>
<td>Увеличить масштаб редактируемой электронной таблицы.</td>
</tr>
<tr>
<td>Уменьшить</td>
<td><kbd>Ctrl</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd>,<br /><kbd>&#8984; Cmd</kbd>+<kbd>-</kbd></td>
<td><kbd>^ Ctrl</kbd>+<kbd>-</kbd></td>
<td>Уменьшить масштаб редактируемой электронной таблицы.</td>
</tr>
<tr>