From d899bcabbf2d2a47718a6b7d0cffbe869e9bb444 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 15 Oct 2021 15:22:07 +0400 Subject: [PATCH 1/6] [common] Correct searchbar --- apps/common/mobile/lib/view/Search.jsx | 62 +++++++++++++------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index 6860c45cf..2bf447733 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -93,41 +93,39 @@ class SearchView extends Component { const $$ = Dom7; $$(document).on('page:init', (e, page) => { - if ( page.name == 'home' ) { - this.searchbar = f7.searchbar.create({ - el: '.searchbar', - customSearch: true, - expandable: true, - backdrop: false, - on: { - search: (bar, curval, prevval) => { - }, - enable: this.onSearchbarShow.bind(this, true), - disable: this.onSearchbarShow.bind(this, false) - } - }); - - // function iOSVersion() { - // var ua = navigator.userAgent; - // var m; - // return (m = /(iPad|iPhone|iphone).*?(OS |os |OS\_)(\d+((_|\.)\d)?((_|\.)\d)?)/.exec(ua)) ? parseFloat(m[3]) : 0; - // } - - const $editor = $$('#editor_sdk'); - // const $replaceLink = $$('#replace-link'); - - if (false /* iOSVersion < 13 */) { - // $editor.on('mousedown touchstart', this.onEditorTouchStart.bind(this)); - // $editor.on('mouseup touchend', this.onEditorTouchEnd.bind(this)); - } else { - // $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); - // $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); + this.searchbar = f7.searchbar.create({ + el: '.searchbar', + customSearch: true, + expandable: true, + backdrop: false, + on: { + search: (bar, curval, prevval) => { + }, + enable: this.onSearchbarShow.bind(this, true), + disable: this.onSearchbarShow.bind(this, false) } + }); - $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); - $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); - // $replaceLink.on('click', this.onReplaceHold.bind(this)); + // function iOSVersion() { + // var ua = navigator.userAgent; + // var m; + // return (m = /(iPad|iPhone|iphone).*?(OS |os |OS\_)(\d+((_|\.)\d)?((_|\.)\d)?)/.exec(ua)) ? parseFloat(m[3]) : 0; + // } + + const $editor = $$('#editor_sdk'); + // const $replaceLink = $$('#replace-link'); + + if (false /* iOSVersion < 13 */) { + // $editor.on('mousedown touchstart', this.onEditorTouchStart.bind(this)); + // $editor.on('mouseup touchend', this.onEditorTouchEnd.bind(this)); + } else { + // $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); + // $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); } + + $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); + $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); + // $replaceLink.on('click', this.onReplaceHold.bind(this)); }); this.onSettingsClick = this.onSettingsClick.bind(this); From c45fcb0ca55fad85c1b089278e9ad81d36874fa0 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 16 Oct 2021 02:13:31 +0400 Subject: [PATCH 2/6] [common] Correct searchbar v.2 --- apps/common/mobile/lib/view/Search.jsx | 60 +++++++++++--------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index 2bf447733..b2b2af398 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -85,47 +85,29 @@ class SearchView extends Component { constructor(props) { super(props); + const $$ = Dom7; + this.state = { searchQuery: '', replaceQuery: '' }; - - const $$ = Dom7; + this.$editor = $$('#editor_sdk'); $$(document).on('page:init', (e, page) => { - this.searchbar = f7.searchbar.create({ - el: '.searchbar', - customSearch: true, - expandable: true, - backdrop: false, - on: { - search: (bar, curval, prevval) => { - }, - enable: this.onSearchbarShow.bind(this, true), - disable: this.onSearchbarShow.bind(this, false) - } - }); - - // function iOSVersion() { - // var ua = navigator.userAgent; - // var m; - // return (m = /(iPad|iPhone|iphone).*?(OS |os |OS\_)(\d+((_|\.)\d)?((_|\.)\d)?)/.exec(ua)) ? parseFloat(m[3]) : 0; - // } - - const $editor = $$('#editor_sdk'); - // const $replaceLink = $$('#replace-link'); - - if (false /* iOSVersion < 13 */) { - // $editor.on('mousedown touchstart', this.onEditorTouchStart.bind(this)); - // $editor.on('mouseup touchend', this.onEditorTouchEnd.bind(this)); - } else { - // $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); - // $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); + if(!this.searchbar) { + this.searchbar = f7.searchbar.create({ + el: '.searchbar', + customSearch: true, + expandable: true, + backdrop: false, + on: { + search: (bar, curval, prevval) => { + }, + enable: this.onSearchbarShow.bind(this, true), + disable: this.onSearchbarShow.bind(this, false) + } + }); } - - $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); - $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); - // $replaceLink.on('click', this.onReplaceHold.bind(this)); }); this.onSettingsClick = this.onSettingsClick.bind(this); @@ -135,7 +117,15 @@ class SearchView extends Component { componentDidMount(){ const $$ = Dom7; + this.$replace = $$('#idx-replace-val'); + this.$editor.on('pointerdown', this.onEditorTouchStart.bind(this)); + this.$editor.on('pointerup', this.onEditorTouchEnd.bind(this)); + } + + componentWillUnmount() { + this.$editor.off('pointerdown', this.onEditorTouchStart.bind(this)); + this.$editor.off('pointerup', this.onEditorTouchEnd.bind(this)); } onSettingsClick(e) { @@ -304,7 +294,7 @@ class SearchView extends Component { ) - } + } } const SearchViewWithObserver = observer(SearchView); From 24705bec8c5a1eecd778fec2bfed8f8689317c88 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 16 Oct 2021 18:08:40 +0400 Subject: [PATCH 3/6] [DE SSE mobile] Fix Bug 52821 --- .../mobile/src/controller/Encoding.jsx | 19 +++++++------- .../mobile/src/view/Encoding.jsx | 26 ++++++++----------- .../mobile/src/controller/Encoding.jsx | 17 ++++++------ .../mobile/src/view/Encoding.jsx | 26 ++++++++----------- 4 files changed, 41 insertions(+), 47 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Encoding.jsx b/apps/documenteditor/mobile/src/controller/Encoding.jsx index 52ad79181..e1ca68d82 100644 --- a/apps/documenteditor/mobile/src/controller/Encoding.jsx +++ b/apps/documenteditor/mobile/src/controller/Encoding.jsx @@ -32,24 +32,26 @@ class EncodingController extends Component { this.mode = mode; this.advOptions = advOptions; this.formatOptions = formatOptions; - this.pages = []; - this.pagesName = []; + this.encodeData = []; const recommendedSettings = this.advOptions.asc_getRecommendedSettings(); - this.initPages(); + this.initEncodeData(); this.valueEncoding = recommendedSettings.asc_getCodePage(); this.setState({ - isOpen: true + isOpen: true }); } } - initPages() { + initEncodeData() { for (let page of this.advOptions.asc_getCodePages()) { - this.pages.push(page.asc_getCodePage()); - this.pagesName.push(page.asc_getCodePageName()); + this.encodeData.push({ + value: page.asc_getCodePage(), + displayValue: page.asc_getCodePageName(), + lcid: page.asc_getLcid() + }); } } @@ -78,8 +80,7 @@ class EncodingController extends Component { closeModal={this.closeModal} mode={this.mode} onSaveFormat={this.onSaveFormat} - pages={this.pages} - pagesName={this.pagesName} + encodeData={this.encodeData} valueEncoding={this.valueEncoding} /> ); diff --git a/apps/documenteditor/mobile/src/view/Encoding.jsx b/apps/documenteditor/mobile/src/view/Encoding.jsx index 3911a2d85..de9bddb55 100644 --- a/apps/documenteditor/mobile/src/view/Encoding.jsx +++ b/apps/documenteditor/mobile/src/view/Encoding.jsx @@ -6,10 +6,10 @@ import { Device } from '../../../../common/mobile/utils/device'; const PageEncoding = props => { const { t } = useTranslation(); const _t = t("Settings", { returnObjects: true }); - const pagesName = props.pagesName; - const pages = props.pages; + const encodeData = props.encodeData; const [stateEncoding, setStateEncoding] = useState(props.valueEncoding); - const nameEncoding = pagesName[pages.indexOf(stateEncoding)]; + const getIndexNameEncoding = () => encodeData.findIndex(encoding => encoding.value === stateEncoding); + const nameEncoding = encodeData[getIndexNameEncoding()].displayValue; const mode = props.mode; const changeStateEncoding = value => { @@ -24,8 +24,7 @@ const PageEncoding = props => { @@ -45,19 +44,18 @@ const PageEncodingList = props => { const { t } = useTranslation(); const _t = t("Settings", { returnObjects: true }); const [currentEncoding, changeCurrentEncoding] = useState(props.stateEncoding); - const pages = props.pages; - const pagesName = props.pagesName; + const encodeData = props.encodeData; return ( {_t.textChooseEncoding} - {pagesName.map((name, index) => { + {encodeData.map((encoding, index) => { return ( - { - changeCurrentEncoding(pages[index]); - props.changeStateEncoding(pages[index]); + { + changeCurrentEncoding(encoding.value); + props.changeStateEncoding(encoding.value); f7.views.current.router.back(); }}> ) @@ -79,8 +77,7 @@ class EncodingView extends Component { onSaveFormat={this.props.onSaveFormat} closeModal={this.props.closeModal} mode={this.props.mode} - pages={this.props.pages} - pagesName={this.props.pagesName} + encodeData={this.props.encodeData} valueEncoding={this.props.valueEncoding} /> @@ -108,8 +105,7 @@ const Encoding = props => { closeModal={props.closeModal} onSaveFormat={props.onSaveFormat} mode={props.mode} - pages={props.pages} - pagesName={props.pagesName} + encodeData={props.encodeData} valueEncoding={props.valueEncoding} /> ) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Encoding.jsx b/apps/spreadsheeteditor/mobile/src/controller/Encoding.jsx index d99271a38..9052a5bb9 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Encoding.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Encoding.jsx @@ -38,12 +38,11 @@ class EncodingController extends Component { this.mode = mode; this.advOptions = advOptions; this.formatOptions = formatOptions; - this.pages = []; - this.pagesName = []; + this.encodeData = []; const recommendedSettings = this.advOptions.asc_getRecommendedSettings(); - this.initPages(); + this.initEncodeData(); this.valueEncoding = recommendedSettings.asc_getCodePage(); this.valueDelimeter = recommendedSettings && recommendedSettings.asc_getDelimiter() ? recommendedSettings.asc_getDelimiter() : 4; @@ -53,10 +52,13 @@ class EncodingController extends Component { } } - initPages() { + initEncodeData() { for (let page of this.advOptions.asc_getCodePages()) { - this.pages.push(page.asc_getCodePage()); - this.pagesName.push(page.asc_getCodePageName()); + this.encodeData.push({ + value: page.asc_getCodePage(), + displayValue: page.asc_getCodePageName(), + lcid: page.asc_getLcid() + }); } } @@ -85,8 +87,7 @@ class EncodingController extends Component { closeModal={this.closeModal} mode={this.mode} onSaveFormat={this.onSaveFormat} - pages={this.pages} - pagesName={this.pagesName} + encodeData={this.encodeData} namesDelimeter={this.namesDelimeter} valueEncoding={this.valueEncoding} valueDelimeter={this.valueDelimeter} diff --git a/apps/spreadsheeteditor/mobile/src/view/Encoding.jsx b/apps/spreadsheeteditor/mobile/src/view/Encoding.jsx index a746a38c9..8899d960f 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Encoding.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Encoding.jsx @@ -6,13 +6,13 @@ import { Device } from '../../../../common/mobile/utils/device'; const PageEncoding = props => { const { t } = useTranslation(); const _t = t("View.Settings", { returnObjects: true }); - const pagesName = props.pagesName; - const pages = props.pages; + const encodeData = props.encodeData; const valuesDelimeter = props.valuesDelimeter; const namesDelimeter = props.namesDelimeter; const [stateEncoding, setStateEncoding] = useState(props.valueEncoding); const [stateDelimeter, setStateDelimeter] = useState(props.valueDelimeter); - const nameEncoding = pagesName[pages.indexOf(stateEncoding)]; + const getIndexNameEncoding = () => encodeData.findIndex(encoding => encoding.value === stateEncoding); + const nameEncoding = encodeData[getIndexNameEncoding()].displayValue; const nameDelimeter = namesDelimeter[valuesDelimeter.indexOf(stateDelimeter)]; const mode = props.mode; @@ -41,8 +41,7 @@ const PageEncoding = props => { @@ -62,19 +61,18 @@ const PageEncodingList = props => { const { t } = useTranslation(); const _t = t("View.Settings", { returnObjects: true }); const [currentEncoding, changeCurrentEncoding] = useState(props.stateEncoding); - const pages = props.pages; - const pagesName = props.pagesName; + const encodeData = props.encodeData; return ( {_t.textChooseEncoding} - {pagesName.map((name, index) => { + {encodeData.map((encoding, index) => { return ( - { - changeCurrentEncoding(pages[index]); - props.changeStateEncoding(pages[index]); + { + changeCurrentEncoding(encoding.value); + props.changeStateEncoding(encoding.value); f7.views.current.router.back(); }}> ) @@ -122,8 +120,7 @@ class EncodingView extends Component { onSaveFormat={this.props.onSaveFormat} closeModal={this.props.closeModal} mode={this.props.mode} - pages={this.props.pages} - pagesName={this.props.pagesName} + encodeData={this.props.encodeData} namesDelimeter={this.props.namesDelimeter} valueEncoding={this.props.valueEncoding} valueDelimeter={this.props.valueDelimeter} @@ -158,8 +155,7 @@ const Encoding = props => { closeModal={props.closeModal} onSaveFormat={props.onSaveFormat} mode={props.mode} - pages={props.pages} - pagesName={props.pagesName} + encodeData={props.encodeData} namesDelimeter={props.namesDelimeter} valueEncoding={props.valueEncoding} valueDelimeter={props.valueDelimeter} From 8e1032215514f8b829ca591ae3c3df6de97006c8 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 16 Oct 2021 18:38:43 +0400 Subject: [PATCH 4/6] [SSE mobile] For Bug 53071 --- apps/spreadsheeteditor/mobile/locale/be.json | 2 +- apps/spreadsheeteditor/mobile/locale/bg.json | 2 +- apps/spreadsheeteditor/mobile/locale/cs.json | 2 +- apps/spreadsheeteditor/mobile/locale/el.json | 2 +- apps/spreadsheeteditor/mobile/locale/en.json | 2 +- apps/spreadsheeteditor/mobile/locale/hu.json | 2 +- apps/spreadsheeteditor/mobile/locale/it.json | 2 +- apps/spreadsheeteditor/mobile/locale/ko.json | 2 +- apps/spreadsheeteditor/mobile/locale/lo.json | 2 +- apps/spreadsheeteditor/mobile/locale/lv.json | 2 +- apps/spreadsheeteditor/mobile/locale/nb.json | 2 +- apps/spreadsheeteditor/mobile/locale/pl.json | 2 +- apps/spreadsheeteditor/mobile/locale/sk.json | 2 +- apps/spreadsheeteditor/mobile/locale/sl.json | 2 +- apps/spreadsheeteditor/mobile/locale/tr.json | 2 +- apps/spreadsheeteditor/mobile/locale/uk.json | 2 +- apps/spreadsheeteditor/mobile/locale/vi.json | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/locale/be.json b/apps/spreadsheeteditor/mobile/locale/be.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/be.json +++ b/apps/spreadsheeteditor/mobile/locale/be.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/bg.json b/apps/spreadsheeteditor/mobile/locale/bg.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/bg.json +++ b/apps/spreadsheeteditor/mobile/locale/bg.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/cs.json +++ b/apps/spreadsheeteditor/mobile/locale/cs.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/el.json b/apps/spreadsheeteditor/mobile/locale/el.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/el.json +++ b/apps/spreadsheeteditor/mobile/locale/el.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index aa0f2a74f..24bb6aab8 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -215,7 +215,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download or print it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/hu.json b/apps/spreadsheeteditor/mobile/locale/hu.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/hu.json +++ b/apps/spreadsheeteditor/mobile/locale/hu.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index 8f1605d71..4c4d0bf0f 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -215,7 +215,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download or print it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json index 2307df303..87de16fe0 100644 --- a/apps/spreadsheeteditor/mobile/locale/ko.json +++ b/apps/spreadsheeteditor/mobile/locale/ko.json @@ -218,7 +218,7 @@ "errorUserDrop": "The file cannot be accessed right now.", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download or print it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "pastInMergeAreaError": "Cannot change a part of a merged cell", "unknownErrorText": "Unknown error.", diff --git a/apps/spreadsheeteditor/mobile/locale/lo.json b/apps/spreadsheeteditor/mobile/locale/lo.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/lo.json +++ b/apps/spreadsheeteditor/mobile/locale/lo.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/lv.json +++ b/apps/spreadsheeteditor/mobile/locale/lv.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/nb.json b/apps/spreadsheeteditor/mobile/locale/nb.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/nb.json +++ b/apps/spreadsheeteditor/mobile/locale/nb.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/pl.json b/apps/spreadsheeteditor/mobile/locale/pl.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/pl.json +++ b/apps/spreadsheeteditor/mobile/locale/pl.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/sk.json b/apps/spreadsheeteditor/mobile/locale/sk.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/sk.json +++ b/apps/spreadsheeteditor/mobile/locale/sk.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/sl.json b/apps/spreadsheeteditor/mobile/locale/sl.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/sl.json +++ b/apps/spreadsheeteditor/mobile/locale/sl.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/tr.json b/apps/spreadsheeteditor/mobile/locale/tr.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/tr.json +++ b/apps/spreadsheeteditor/mobile/locale/tr.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/uk.json b/apps/spreadsheeteditor/mobile/locale/uk.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/uk.json +++ b/apps/spreadsheeteditor/mobile/locale/uk.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", diff --git a/apps/spreadsheeteditor/mobile/locale/vi.json b/apps/spreadsheeteditor/mobile/locale/vi.json index be1f2ab84..45d92d9ab 100644 --- a/apps/spreadsheeteditor/mobile/locale/vi.json +++ b/apps/spreadsheeteditor/mobile/locale/vi.json @@ -214,7 +214,7 @@ "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "errorViewerDisconnect": "Connection is lost. You can still view the document,
but you won't be able to download it until the connection is restored and the page is reloaded.", "errorWrongBracketsCount": "An error in the formula.
Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
Correct the error or use the Esc button to cancel the formula editing.", + "errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", "notcriticalErrorTitle": "Warning", "openErrorText": "An error has occurred while opening the file", "pastInMergeAreaError": "Cannot change a part of a merged cell", From cd592d564ba462c9e127454b43a0002758db31fa Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 16 Oct 2021 18:55:25 +0400 Subject: [PATCH 5/6] [common] Fix Bug 53181 --- apps/common/mobile/lib/view/Search.jsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/common/mobile/lib/view/Search.jsx b/apps/common/mobile/lib/view/Search.jsx index b2b2af398..5b54457da 100644 --- a/apps/common/mobile/lib/view/Search.jsx +++ b/apps/common/mobile/lib/view/Search.jsx @@ -91,7 +91,6 @@ class SearchView extends Component { searchQuery: '', replaceQuery: '' }; - this.$editor = $$('#editor_sdk'); $$(document).on('page:init', (e, page) => { if(!this.searchbar) { @@ -107,6 +106,11 @@ class SearchView extends Component { disable: this.onSearchbarShow.bind(this, false) } }); + + const $editor = $$('#editor_sdk'); + + $editor.on('pointerdown', this.onEditorTouchStart.bind(this)); + $editor.on('pointerup', this.onEditorTouchEnd.bind(this)); } }); @@ -117,15 +121,15 @@ class SearchView extends Component { componentDidMount(){ const $$ = Dom7; - this.$replace = $$('#idx-replace-val'); - this.$editor.on('pointerdown', this.onEditorTouchStart.bind(this)); - this.$editor.on('pointerup', this.onEditorTouchEnd.bind(this)); } componentWillUnmount() { - this.$editor.off('pointerdown', this.onEditorTouchStart.bind(this)); - this.$editor.off('pointerup', this.onEditorTouchEnd.bind(this)); + const $$ = Dom7; + const $editor = $$('#editor_sdk'); + + $editor.off('pointerdown', this.onEditorTouchStart.bind(this)); + $editor.off('pointerup', this.onEditorTouchEnd.bind(this)); } onSettingsClick(e) { From 2829c2b6dc316a23d8aadb8991d73c8f9fc73bc3 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 18 Oct 2021 17:02:05 +0400 Subject: [PATCH 6/6] [PE mobile] Fix Bug 53006 --- apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx index 60acd7b49..1ff87c957 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx @@ -296,7 +296,7 @@ const PageTransition = props => { onRangeChanged={(value) => {props.onDelay(value)}} > -
+
{stateRange + ' ' + _t.textSec}