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

Merge pull request #1276 from ONLYOFFICE/feature/fix-bug-reactjs

Browse source 
Feature/fix bug reactjs
This commit is contained in:
maxkadushkin 2021-10-28 16:29:01 +03:00 committed by GitHub
parent a2cb348723 7f9d94270f
commit c7b59c0675
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 71 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/locale/be.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/bg.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/cs.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/da.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/el.json
View file

@ -449,7 +449,7 @@
"closeButtonText": "Close File", "closeButtonText": "Close File",
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/en.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/fi.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/hu.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/lo.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/lv.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/nb.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/nl.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Waarschuwing", "notcriticalErrorTitle": "Waarschuwing",
"textAbout": "Over", "textAbout": "Over",
"textApplication": "Applicatie", "textApplication": "Applicatie",
"textApplicationSettings": "Applicatie instellingen", "textApplicationSettings": "Applicatie Instellingen",
"textAuthor": "Auteur", "textAuthor": "Auteur",
"textBack": "Terug", "textBack": "Terug",
"textBottom": "Onder", "textBottom": "Onder",

2
apps/documenteditor/mobile/locale/pl.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/sk.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/sl.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/sv.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/uk.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

2
apps/documenteditor/mobile/locale/vi.json
View file

@ -484,7 +484,7 @@
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",
"textAbout": "About", "textAbout": "About",
"textApplication": "Application", "textApplication": "Application",
"textApplicationSettings": "Application settings", "textApplicationSettings": "Application Settings",
"textAuthor": "Author", "textAuthor": "Author",
"textBack": "Back", "textBack": "Back",
"textBottom": "Bottom", "textBottom": "Bottom",

44
apps/documenteditor/mobile/src/controller/ContextMenu.jsx
View file

@ -165,28 +165,30 @@ class ContextMenu extends ContextMenuController {
Common.EditorApi.get().SplitCell(parseInt(size[0]), parseInt(size[1])); 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(); }).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) { openLink(url) {

4
apps/documenteditor/mobile/src/controller/Search.jsx
View file

@ -28,7 +28,7 @@ class SearchSettings extends SearchSettingsView {
const markup = ( const markup = (
<Page> <Page>
<Navbar title={_t.textFindAndReplace}> <Navbar title={isEdit ? _t.textFindAndReplace : _t.textFind}>
{!show_popover && {!show_popover &&
<NavRight> <NavRight>
<Link popupClose=".search-settings-popup">{_t.textDone}</Link> <Link popupClose=".search-settings-popup">{_t.textDone}</Link>
@ -95,6 +95,8 @@ const Search = withTranslation()(props => {
const onSearchQuery = params => { const onSearchQuery = params => {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
f7.popover.close('.document-menu.modal-in', false);
if (params.find && params.find.length) { if (params.find && params.find.length) {
if (!api.asc_findText(params.find, params.forward, params.caseSensitive, params.highlight) ) { if (!api.asc_findText(params.find, params.forward, params.caseSensitive, params.highlight) ) {
f7.dialog.alert(null, _t.textNoTextFound); f7.dialog.alert(null, _t.textNoTextFound);

44
apps/presentationeditor/mobile/src/controller/ContextMenu.jsx
View file

@ -145,28 +145,30 @@ class ContextMenu extends ContextMenuController {
Common.EditorApi.get().SplitCell(parseInt(size[0]), parseInt(size[1])); 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(); }).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) { openLink(url) {

4
apps/presentationeditor/mobile/src/controller/Search.jsx
View file

@ -21,7 +21,7 @@ class SearchSettings extends SearchSettingsView {
const markup = ( const markup = (
<Page> <Page>
<Navbar title={_t.textFindAndReplace}> <Navbar title={isEdit ? _t.textFindAndReplace : _t.textFind}>
{!show_popover && {!show_popover &&
<NavRight> <NavRight>
<Link popupClose=".search-settings-popup">{_t.textDone}</Link> <Link popupClose=".search-settings-popup">{_t.textDone}</Link>
@ -77,6 +77,8 @@ const Search = withTranslation()(props => {
const onSearchQuery = params => { const onSearchQuery = params => {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
f7.popover.close('.document-menu.modal-in', false);
if (params.find && params.find.length) { if (params.find && params.find.length) {
if (!api.findText(params.find, params.forward, params.caseSensitive) ) { if (!api.findText(params.find, params.forward, params.caseSensitive) ) {
f7.dialog.alert(null, _t.textNoTextFound); f7.dialog.alert(null, _t.textNoTextFound);

2
apps/spreadsheeteditor/mobile/src/controller/Search.jsx
View file

@ -29,7 +29,7 @@ class SearchSettings extends SearchSettingsView {
const markup = ( const markup = (
<Page> <Page>
<Navbar title={_t.textFindAndReplace}> <Navbar title={isEdit ? _t.textFindAndReplace : _t.textFind}>
{!show_popover && {!show_popover &&
<NavRight> <NavRight>
<Link popupClose=".search-settings-popup">{_t.textDone}</Link> <Link popupClose=".search-settings-popup">{_t.textDone}</Link>