diff --git a/apps/documenteditor/mobile/locale/be.json b/apps/documenteditor/mobile/locale/be.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/be.json +++ b/apps/documenteditor/mobile/locale/be.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/bg.json +++ b/apps/documenteditor/mobile/locale/bg.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/cs.json b/apps/documenteditor/mobile/locale/cs.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/cs.json +++ b/apps/documenteditor/mobile/locale/cs.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/da.json b/apps/documenteditor/mobile/locale/da.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/da.json +++ b/apps/documenteditor/mobile/locale/da.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/el.json b/apps/documenteditor/mobile/locale/el.json index 33c407da8..fec0b67e6 100644 --- a/apps/documenteditor/mobile/locale/el.json +++ b/apps/documenteditor/mobile/locale/el.json @@ -449,7 +449,7 @@ "closeButtonText": "Close File", "notcriticalErrorTitle": "Warning", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index cb0bdaffa..ed5477af9 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/fi.json b/apps/documenteditor/mobile/locale/fi.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/fi.json +++ b/apps/documenteditor/mobile/locale/fi.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/hu.json b/apps/documenteditor/mobile/locale/hu.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/hu.json +++ b/apps/documenteditor/mobile/locale/hu.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/lo.json b/apps/documenteditor/mobile/locale/lo.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/lo.json +++ b/apps/documenteditor/mobile/locale/lo.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/lv.json b/apps/documenteditor/mobile/locale/lv.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/lv.json +++ b/apps/documenteditor/mobile/locale/lv.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/nb.json b/apps/documenteditor/mobile/locale/nb.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/nb.json +++ b/apps/documenteditor/mobile/locale/nb.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/nl.json b/apps/documenteditor/mobile/locale/nl.json index 67106efb6..55a4ad33e 100644 --- a/apps/documenteditor/mobile/locale/nl.json +++ b/apps/documenteditor/mobile/locale/nl.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Waarschuwing", "textAbout": "Over", "textApplication": "Applicatie", - "textApplicationSettings": "Applicatie instellingen", + "textApplicationSettings": "Applicatie Instellingen", "textAuthor": "Auteur", "textBack": "Terug", "textBottom": "Onder", diff --git a/apps/documenteditor/mobile/locale/pl.json b/apps/documenteditor/mobile/locale/pl.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/pl.json +++ b/apps/documenteditor/mobile/locale/pl.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/sk.json b/apps/documenteditor/mobile/locale/sk.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/sk.json +++ b/apps/documenteditor/mobile/locale/sk.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/sl.json b/apps/documenteditor/mobile/locale/sl.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/sl.json +++ b/apps/documenteditor/mobile/locale/sl.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/sv.json b/apps/documenteditor/mobile/locale/sv.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/sv.json +++ b/apps/documenteditor/mobile/locale/sv.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/uk.json b/apps/documenteditor/mobile/locale/uk.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/uk.json +++ b/apps/documenteditor/mobile/locale/uk.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/locale/vi.json b/apps/documenteditor/mobile/locale/vi.json index e6ca0528d..a06018906 100644 --- a/apps/documenteditor/mobile/locale/vi.json +++ b/apps/documenteditor/mobile/locale/vi.json @@ -484,7 +484,7 @@ "notcriticalErrorTitle": "Warning", "textAbout": "About", "textApplication": "Application", - "textApplicationSettings": "Application settings", + "textApplicationSettings": "Application Settings", "textAuthor": "Author", "textBack": "Back", "textBottom": "Bottom", diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx index ceba79997..347b3a67e 100644 --- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx @@ -165,28 +165,30 @@ class ContextMenu extends ContextMenuController { Common.EditorApi.get().SplitCell(parseInt(size[0]), parseInt(size[1])); } } - ] + ], + on: { + open: () => { + picker = f7.picker.create({ + containerEl: document.getElementById('picker-split-size'), + cols: [ + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + }, + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + } + ], + toolbar: false, + rotateEffect: true, + value: [3, 3] + }); + } + } }).open(); - dialog.on('opened', () => { - picker = f7.picker.create({ - containerEl: document.getElementById('picker-split-size'), - cols: [ - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - }, - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - } - ], - toolbar: false, - rotateEffect: true, - value: [3, 3] - }); - }); } openLink(url) { diff --git a/apps/documenteditor/mobile/src/controller/Search.jsx b/apps/documenteditor/mobile/src/controller/Search.jsx index c3f8ae3f9..fc2ea6c7a 100644 --- a/apps/documenteditor/mobile/src/controller/Search.jsx +++ b/apps/documenteditor/mobile/src/controller/Search.jsx @@ -28,7 +28,7 @@ class SearchSettings extends SearchSettingsView { const markup = ( - + {!show_popover && {_t.textDone} @@ -95,6 +95,8 @@ const Search = withTranslation()(props => { const onSearchQuery = params => { const api = Common.EditorApi.get(); + f7.popover.close('.document-menu.modal-in', false); + if (params.find && params.find.length) { if (!api.asc_findText(params.find, params.forward, params.caseSensitive, params.highlight) ) { f7.dialog.alert(null, _t.textNoTextFound); diff --git a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx index 3fbdd6566..a9d9f3370 100644 --- a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx @@ -145,28 +145,30 @@ class ContextMenu extends ContextMenuController { Common.EditorApi.get().SplitCell(parseInt(size[0]), parseInt(size[1])); } } - ] + ], + on: { + open: () => { + picker = f7.picker.create({ + containerEl: document.getElementById('picker-split-size'), + cols: [ + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + }, + { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + } + ], + toolbar: false, + rotateEffect: true, + value: [3, 3] + }); + } + } }).open(); - dialog.on('opened', () => { - picker = f7.picker.create({ - containerEl: document.getElementById('picker-split-size'), - cols: [ - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - }, - { - textAlign: 'center', - width: '100%', - values: [1,2,3,4,5,6,7,8,9,10] - } - ], - toolbar: false, - rotateEffect: true, - value: [3, 3] - }); - }); } openLink(url) { diff --git a/apps/presentationeditor/mobile/src/controller/Search.jsx b/apps/presentationeditor/mobile/src/controller/Search.jsx index b854ae12f..fe0064ecb 100644 --- a/apps/presentationeditor/mobile/src/controller/Search.jsx +++ b/apps/presentationeditor/mobile/src/controller/Search.jsx @@ -21,7 +21,7 @@ class SearchSettings extends SearchSettingsView { const markup = ( - + {!show_popover && {_t.textDone} @@ -77,6 +77,8 @@ const Search = withTranslation()(props => { const onSearchQuery = params => { const api = Common.EditorApi.get(); + f7.popover.close('.document-menu.modal-in', false); + if (params.find && params.find.length) { if (!api.findText(params.find, params.forward, params.caseSensitive) ) { f7.dialog.alert(null, _t.textNoTextFound); diff --git a/apps/spreadsheeteditor/mobile/src/controller/Search.jsx b/apps/spreadsheeteditor/mobile/src/controller/Search.jsx index f80e789fc..fbdc7614f 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Search.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Search.jsx @@ -29,7 +29,7 @@ class SearchSettings extends SearchSettingsView { const markup = ( - + {!show_popover && {_t.textDone}