[DE mobile] Fix Bug 60365
This commit is contained in:
parent
a7255d1dd4
commit
e87995d33a
|
@ -236,6 +236,9 @@ class MainController extends Component {
|
||||||
|
|
||||||
const appOptions = this.props.storeAppOptions;
|
const appOptions = this.props.storeAppOptions;
|
||||||
const appSettings = this.props.storeApplicationSettings;
|
const appSettings = this.props.storeApplicationSettings;
|
||||||
|
const storeDocumentInfo = this.props.storeDocumentInfo;
|
||||||
|
const dataDoc = storeDocumentInfo.dataDoc;
|
||||||
|
const isExtRestriction = dataDoc.fileType !== 'oform';
|
||||||
|
|
||||||
f7.emit('resize');
|
f7.emit('resize');
|
||||||
|
|
||||||
|
@ -268,7 +271,7 @@ class MainController extends Component {
|
||||||
|
|
||||||
value = LocalStorage.getBool('mobile-view', true);
|
value = LocalStorage.getBool('mobile-view', true);
|
||||||
|
|
||||||
if(value) {
|
if(value && isExtRestriction) {
|
||||||
this.api.ChangeReaderMode();
|
this.api.ChangeReaderMode();
|
||||||
} else {
|
} else {
|
||||||
appOptions.changeMobileView();
|
appOptions.changeMobileView();
|
||||||
|
|
|
@ -8,7 +8,7 @@ const ToolbarView = props => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const isDisconnected = props.isDisconnected;
|
const isDisconnected = props.isDisconnected;
|
||||||
const docExt = props.docExt;
|
const docExt = props.docExt;
|
||||||
const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps';
|
const isAvailableExt = docExt && docExt !== 'djvu' && docExt !== 'pdf' && docExt !== 'xps' && docExt !== 'oform';
|
||||||
const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls || isDisconnected;
|
const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls || isDisconnected;
|
||||||
const isViewer = props.isViewer;
|
const isViewer = props.isViewer;
|
||||||
const isMobileView = props.isMobileView;
|
const isMobileView = props.isMobileView;
|
||||||
|
@ -62,7 +62,7 @@ const ToolbarView = props => {
|
||||||
onRedoClick: props.onRedo
|
onRedoClick: props.onRedo
|
||||||
})}
|
})}
|
||||||
{/*isAvailableExt && !props.disabledControls &&*/}
|
{/*isAvailableExt && !props.disabledControls &&*/}
|
||||||
{(isViewer || !Device.phone) && <Link className={(!isAvailableExt || 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={() => {
|
||||||
props.changeMobileView();
|
props.changeMobileView();
|
||||||
props.openOptions('snackbar');
|
props.openOptions('snackbar');
|
||||||
}}></Link>}
|
}}></Link>}
|
||||||
|
|
Loading…
Reference in a new issue