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

Merge pull request #1937 from ONLYOFFICE/feature/fix-bugs

Browse source 
[DE mobile] Fix Bug 58759
This commit is contained in:
maxkadushkin 2022-09-02 16:03:40 +03:00 committed by GitHub
parent 8824d7c2e2 5505fb3f47
commit 7fdea4c431
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/mobile/src/controller/Toolbar.jsx
View file

@ -168,7 +168,6 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview', 'sto
onEditDocument={onEditDocument} onEditDocument={onEditDocument}
isDisconnected={isDisconnected} isDisconnected={isDisconnected}
isViewer={isViewer} isViewer={isViewer}
// turnOffViewerMode={turnOffViewerMode}
turnOnViewerMode={turnOnViewerMode} turnOnViewerMode={turnOnViewerMode}
isMobileView={isMobileView} isMobileView={isMobileView}
changeMobileView={changeMobileView} changeMobileView={changeMobileView}

14
apps/documenteditor/mobile/src/controller/settings/Settings.jsx
View file

@ -82,19 +82,15 @@ const Settings = props => {
}, 0); }, 0);
}; };
const onChangeMobileView = async () => { const onChangeMobileView = () => {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
const isMobileView = appOptions.isMobileView; const isMobileView = appOptions.isMobileView;
await LocalStorage.setBool('mobile-view', !isMobileView); LocalStorage.setBool('mobile-view', !isMobileView);
await appOptions.changeMobileView(); appOptions.changeMobileView();
await api.ChangeReaderMode(); api.ChangeReaderMode();
};
if(Device.phone) {
await closeModal();
}
}
return <SettingsView usePopover={!Device.phone} return <SettingsView usePopover={!Device.phone}
openOptions={props.openOptions} openOptions={props.openOptions}

10
apps/documenteditor/mobile/src/view/Toolbar.jsx
View file

@ -46,12 +46,14 @@ const ToolbarView = props => {
onUndoClick: props.onUndo, onUndoClick: props.onUndo,
onRedoClick: props.onRedo onRedoClick: props.onRedo
})} })}
{(isViewer || !Device.phone) && isAvailableExt && <Link className={props.disabledControls ? 'disabled' : ''} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={() => { {(isViewer || !Device.phone) && isAvailableExt && <Link className={props.disabledControls ? 'disabled' : ''} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => {
props.changeMobileView(); e.target.closest('.link').classList.add('disabled');
props.openOptions('snackbar'); await props.changeMobileView();
await props.openOptions('snackbar');
setTimeout(() => { setTimeout(() => {
props.closeOptions('snackbar'); props.closeOptions('snackbar');
}, 500); e.target.closest('.link').classList.remove('disabled');
}, 1500);
}}></Link>} }}></Link>}
{(props.showEditDocument && !isViewer) && {(props.showEditDocument && !isViewer) &&
<Link className={props.disabledControls ? 'disabled' : ''} icon='icon-edit' href={false} onClick={props.onEditDocument}></Link> <Link className={props.disabledControls ? 'disabled' : ''} icon='icon-edit' href={false} onClick={props.onEditDocument}></Link>

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

@ -163,12 +163,13 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
{!isViewer && Device.phone && {!isViewer && Device.phone &&
<ListItem title={t('Settings.textMobileView')}> <ListItem title={t('Settings.textMobileView')}>
<Icon slot="media" icon="icon-mobile-view"></Icon> <Icon slot="media" icon="icon-mobile-view"></Icon>
<Toggle checked={isMobileView} onToggleChange={() => { <Toggle checked={isMobileView} onToggleChange={async () => {
props.onChangeMobileView(); await props.onChangeMobileView();
props.openOptions('snackbar'); await closeModal();
await props.openOptions('snackbar');
setTimeout(() => { setTimeout(() => {
props.closeOptions('snackbar'); props.closeOptions('snackbar');
}, 1000); }, 1500);
}} /> }} />
</ListItem> </ListItem>
} }