Merge pull request #1599 from ONLYOFFICE/fix/bugfix

Fix/bugfix

apps/presentationeditor/mobile/locale/ca.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Superior-esquerra",
       "textTopRight": "Superior-dreta",
       "textTotalRow": "Fila de total",
-      "textTransition": "Transició",
       "textTransitions": "Transicions",
       "textType": "Tipus",
       "textUnCover": "Descobreix",

apps/presentationeditor/mobile/locale/cs.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Vlevo nahoře",
       "textTopRight": "Vpravo nahoře",
       "textTotalRow": "Součtový řádek",
-      "textTransition": "Přechod",
       "textTransitions": "Přechody",
       "textType": "Typ",
       "textUnCover": "Odkrýt",

apps/presentationeditor/mobile/locale/de.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Oben links",
       "textTopRight": "Oben rechts",
       "textTotalRow": "Ergebniszeile",
-      "textTransition": "Übergang",
       "textTransitions": "Übergänge",
       "textType": "Typ",
       "textUnCover": "Aufdecken",

apps/presentationeditor/mobile/locale/el.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Πάνω-Αριστερά",
       "textTopRight": "Πάνω-Δεξιά",
       "textTotalRow": "Συνολική Γραμμή",
-      "textTransition": "Μετάβαση",
       "textTransitions": "Μεταβάσεις",
       "textType": "Τύπος",
       "textUnCover": "Αποκάλυψη",

apps/presentationeditor/mobile/locale/en.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Top-Left",
       "textTopRight": "Top-Right",
       "textTotalRow": "Total Row",
-      "del_textTransition": "Transition",
       "textTransitions": "Transitions",
       "textType": "Type",
       "textUnCover": "UnCover",

apps/presentationeditor/mobile/locale/es.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Arriba a la izquierda",
       "textTopRight": "Arriba a la derecha",
       "textTotalRow": "Fila de totales",
-      "textTransition": "Transición",
       "textTransitions": "Transiciones",
       "textType": "Tipo",
       "textUnCover": "Revelar",

apps/presentationeditor/mobile/locale/fr.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Haut à gauche",
       "textTopRight": "Haut à droite",
       "textTotalRow": "Ligne de total",
-      "textTransition": "Transition",
       "textTransitions": "Transitions",
       "textType": "Type",
       "textUnCover": "Découvrir",

apps/presentationeditor/mobile/locale/gl.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Parte superior esquerda",
       "textTopRight": "Parte superior dereita",
       "textTotalRow": "Fila total",
-      "textTransition": "Transición",
       "textTransitions": "Transicións",
       "textType": "Tipo",
       "textUnCover": "Rebelar",

apps/presentationeditor/mobile/locale/hu.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Bal felső",
       "textTopRight": "Jobb felső",
       "textTotalRow": "Összes sor",
-      "textTransition": "Átmenet",
       "textTransitions": "Átmenetek",
       "textType": "Típus",
       "textUnCover": "Felfed",

apps/presentationeditor/mobile/locale/it.json

@@ -382,7 +382,6 @@
       "textTopLeft": "In alto a sinistra",
       "textTopRight": "In alto a destra",
       "textTotalRow": "Riga del totale",
-      "textTransition": "Transizione",
       "textTransitions": "Transizioni",
       "textType": "Tipo",
       "textUnCover": "Scoprire",

apps/presentationeditor/mobile/locale/ja.json

@@ -294,7 +294,7 @@
       "textDone": "完了",
       "textDoubleStrikethrough": "二重取り消し線",
       "textDuplicateSlide": "スライドの複製",
-      "textDuration": "期間",
+      "textDuration": "継続時間",
       "textEditLink": "リンクを編集する",
       "textEffect": "効果",
       "textEffects": "効果",
@@ -382,7 +382,6 @@
       "textTopLeft": "左上",
       "textTopRight": "右上",
       "textTotalRow": "合計行",
-      "textTransition": "切り替え​​",
       "textTransitions": "切り替え効果",
       "textType": "タイプ",
       "textUnCover": "アンカバー",

apps/presentationeditor/mobile/locale/ko.json

@@ -379,7 +379,6 @@
       "textTopLeft": "왼쪽 위",
       "textTopRight": "오른쪽 위",
       "textTotalRow": "합계",
-      "textTransition": "전환",
       "textTransitions": "전환",
       "textType": "유형",
       "textUnCover": "당기기",

apps/presentationeditor/mobile/locale/nl.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Linksboven",
       "textTopRight": "Rechtsboven",
       "textTotalRow": "Totaalrij",
-      "textTransition": "Overgang",
       "textTransitions": "Overgangen",
       "textType": "Type",
       "textUnCover": "Onthullen",

apps/presentationeditor/mobile/locale/pt.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Parte superior esquerda",
       "textTopRight": "Parte superior direita",
       "textTotalRow": "Linha total",
-      "textTransition": "Transição",
       "textTransitions": "Transições",
       "textType": "Tipo",
       "textUnCover": "Descobrir",

apps/presentationeditor/mobile/locale/ro.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Stânga sus",
       "textTopRight": "Dreapta sus",
       "textTotalRow": "Rând total",
-      "textTransition": "Tranziții",
       "textTransitions": "Tranziții",
       "textType": "Tip",
       "textUnCover": "Descoperire",

apps/presentationeditor/mobile/locale/ru.json

@@ -382,7 +382,6 @@
       "textTopLeft": "Сверху слева",
       "textTopRight": "Сверху справа",
       "textTotalRow": "Строка итогов",
-      "textTransition": "Переход",
       "textTransitions": "Переходы",
       "textType": "Тип",
       "textUnCover": "Открывание",

apps/presentationeditor/mobile/locale/tr.json

@@ -379,7 +379,6 @@
       "textTopLeft": "Üst-Sol",
       "textTopRight": "Üst-Sağ",
       "textTotalRow": "Toplam Satır",
-      "textTransition": "Geçiş",
       "textTransitions": "geçişler",
       "textType": "Tip",
       "textUnCover": "Meydana çıkar",

apps/presentationeditor/mobile/locale/zh.json

@@ -382,7 +382,6 @@
       "textTopLeft": "左上",
       "textTopRight": "右上",
       "textTotalRow": "总行",
-      "textTransition": "过渡",
       "textTransitions": "切换",
       "textType": "类型",
       "textUnCover": "揭露",

apps/spreadsheeteditor/main/app.js

@@ -152,9 +152,9 @@ require([
             'Print',
             'Toolbar',
             'Statusbar',
-            'Spellcheck',
             'RightMenu',
             'LeftMenu',
+            'Spellcheck',
             'Main',
             'PivotTable',
             'DataTab',
@@ -177,9 +177,9 @@ require([
             'spreadsheeteditor/main/app/controller/CellEditor',
             'spreadsheeteditor/main/app/controller/Toolbar',
             'spreadsheeteditor/main/app/controller/Statusbar',
-            'spreadsheeteditor/main/app/controller/Spellcheck',
             'spreadsheeteditor/main/app/controller/RightMenu',
             'spreadsheeteditor/main/app/controller/LeftMenu',
+            'spreadsheeteditor/main/app/controller/Spellcheck',
             'spreadsheeteditor/main/app/controller/Main',
             'spreadsheeteditor/main/app/controller/Print',
             'spreadsheeteditor/main/app/controller/PivotTable',

apps/spreadsheeteditor/main/app/controller/Spellcheck.js

@@ -254,6 +254,9 @@ define([
         },
 
         onSpellCheckVariantsFound: function (property) {
+            if (property===null && this._currentSpellObj === property && !(this.panelSpellcheck && this.panelSpellcheck.isVisible()))
+                return;
+
             this._currentSpellObj = property;
 
             var arr = [],

apps/spreadsheeteditor/main/app_dev.js

@@ -142,9 +142,9 @@ require([
             'Print',
             'Toolbar',
             'Statusbar',
-            'Spellcheck',
             'RightMenu',
             'LeftMenu',
+            'Spellcheck',
             'Main',
             'PivotTable',
             'DataTab',
@@ -167,9 +167,9 @@ require([
             'spreadsheeteditor/main/app/controller/CellEditor',
             'spreadsheeteditor/main/app/controller/Toolbar',
             'spreadsheeteditor/main/app/controller/Statusbar',
-            'spreadsheeteditor/main/app/controller/Spellcheck',
             'spreadsheeteditor/main/app/controller/RightMenu',
             'spreadsheeteditor/main/app/controller/LeftMenu',
+            'spreadsheeteditor/main/app/controller/Spellcheck',
             'spreadsheeteditor/main/app/controller/Main',
             'spreadsheeteditor/main/app/controller/Print',
             'spreadsheeteditor/main/app/controller/PivotTable',