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

[DE PE SSE mobile] Correct blocking keyboard

Browse source
This commit is contained in:
SergeyEzhin 2021-10-26 21:13:58 +04:00
parent c5e8d84172
commit 16bc4c07e7
13 changed files with 24 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/mobile/lib/view/collaboration/Collaboration.jsx
View file

@ -147,11 +147,7 @@ class CollaborationView extends Component {
}
const Collaboration = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone ) {
f7.sheet.open('.coauth__sheet');
} else {
@ -165,7 +161,6 @@ const Collaboration = props => {
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

8
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -522,6 +522,14 @@ class MainController extends Component {
this.api.Resize();
});
$$(window).on('popover:open popup:open sheet:open actions:open', () => {
this.api.asc_enableKeyEvents(false);
});
$$(window).on('popover:close popup:close sheet:close actions:close', () => {
this.api.asc_enableKeyEvents(true);
});
this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this));
this.api.asc_registerCallback('asc_onDocumentName', this.onDocumentName.bind(this));

5
apps/documenteditor/mobile/src/view/add/Add.jsx
View file

@ -213,11 +213,7 @@ class AddView extends Component {
}
const Add = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.popup.open('.add-popup');
else f7.popover.open('#add-popover', '#btn-add');
@ -230,7 +226,6 @@ const Add = props => {
});
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

5
apps/documenteditor/mobile/src/view/edit/Edit.jsx
View file

@ -328,11 +328,7 @@ const EditView = props => {
};
const EditOptions = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.sheet.open('#edit-sheet');
else f7.popover.open('#edit-popover', '#btn-edit');
@ -344,7 +340,6 @@ const EditOptions = props => {
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

7
apps/documenteditor/mobile/src/view/settings/Settings.jsx
View file

@ -60,7 +60,6 @@ const routes = [
const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => {
const { t } = useTranslation();
const _t = t('Settings', {returnObjects: true});
const api = Common.EditorApi.get();
const storeReview = props.storeReview;
const displayMode = storeReview.displayMode;
const navbar = <Navbar title={_t.textSettings}>
@ -73,8 +72,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
};
const closeModal = () => {
api.asc_enableKeyEvents(true);
if (Device.phone) {
f7.sheet.close('.settings-popup', false);
} else {
@ -87,10 +84,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
await props.openOptions('coauth');
}
useEffect(() => {
api.asc_enableKeyEvents(false);
});
// set mode
const appOptions = props.storeAppOptions;
let _isEdit = false,

8
apps/presentationeditor/mobile/src/controller/Main.jsx
View file

@ -297,6 +297,14 @@ class MainController extends Component {
this.api.Resize();
});
$$(window).on('popover:open popup:open sheet:open actions:open', () => {
this.api.asc_enableKeyEvents(false);
});
$$(window).on('popover:close popup:close sheet:close actions:close', () => {
this.api.asc_enableKeyEvents(true);
});
this.api.asc_registerCallback('asc_onDocumentContentReady', this.onDocumentContentReady.bind(this));
this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this));

5
apps/presentationeditor/mobile/src/view/add/Add.jsx
View file

@ -152,11 +152,7 @@ class AddView extends Component {
}
const Add = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.popup.open('.add-popup');
else f7.popover.open('#add-popover', '#btn-add');
@ -167,7 +163,6 @@ const Add = props => {
});
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

5
apps/presentationeditor/mobile/src/view/edit/Edit.jsx
View file

@ -349,11 +349,7 @@ const EditView = props => {
};
const EditOptions = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.sheet.open('#edit-sheet');
else f7.popover.open('#edit-popover', '#btn-edit');
@ -365,7 +361,6 @@ const EditOptions = props => {
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

5
apps/presentationeditor/mobile/src/view/settings/Settings.jsx
View file

@ -189,11 +189,7 @@ class SettingsView extends Component {
}
const Settings = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.popup.open('.settings-popup');
else f7.popover.open('#settings-popover', '#btn-settings');
@ -204,7 +200,6 @@ const Settings = props => {
const onviewclosed = () => {
if (props.onclosed) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

8
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -336,6 +336,14 @@ class MainController extends Component {
this.api.asc_Resize();
});
$$(window).on('popover:open popup:open sheet:open actions:open', () => {
this.api.asc_enableKeyEvents(false);
});
$$(window).on('popover:close popup:close sheet:close actions:close', () => {
this.api.asc_enableKeyEvents(true);
});
this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this));
this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this));
this.api.asc_registerCallback('asc_onPrintUrl', this.onPrintUrl.bind(this));

3
apps/spreadsheeteditor/mobile/src/view/add/Add.jsx
View file

@ -202,8 +202,6 @@ const Add = props => {
let options;
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone ) {
f7.popup.open('.add-popup');
} else {
@ -218,7 +216,6 @@ const Add = props => {
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

3
apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx
View file

@ -436,8 +436,6 @@ const EditOptions = props => {
const isAddShapeHyperlink = api.asc_canAddShapeHyperlink();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.sheet.open('#edit-sheet');
else f7.popover.open('#edit-popover', '#btn-edit');
@ -449,7 +447,6 @@ const EditOptions = props => {
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};

5
apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
View file

@ -193,11 +193,7 @@ class SettingsView extends Component {
}
const Settings = props => {
const api = Common.EditorApi.get();
useEffect(() => {
api.asc_enableKeyEvents(false);
if ( Device.phone )
f7.popup.open('.settings-popup');
else f7.popover.open('#settings-popover', '#btn-settings');
@ -209,7 +205,6 @@ const Settings = props => {
const onviewclosed = () => {
if ( props.onclosed ) {
api.asc_enableKeyEvents(true);
props.onclosed();
}
};