Merge pull request #922 from ONLYOFFICE/fix/fix-bugs-on-mobiles
Fix/fix bugs on mobiles
This commit is contained in:
commit
badd41c924
|
@ -39,11 +39,7 @@ const LongActionsController = () => {
|
|||
api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd);
|
||||
api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
|
||||
|
||||
Common.Notifications.off('preloader:endAction', (type, id) => {
|
||||
if (stackLongActions.exist({id: id, type: type})) {
|
||||
onLongActionEnd(type, id);
|
||||
}
|
||||
});
|
||||
Common.Notifications.off('preloader:endAction', onLongActionEnd);
|
||||
Common.Notifications.off('preloader:beginAction', onLongActionBegin);
|
||||
Common.Notifications.off('preloader:close', closePreloader);
|
||||
})
|
||||
|
@ -55,22 +51,18 @@ const LongActionsController = () => {
|
|||
setLongActionView(action);
|
||||
};
|
||||
|
||||
const onLongActionEnd = (type, id) => {
|
||||
const onLongActionEnd = (type, id, forceClose) => {
|
||||
if (!stackLongActions.exist({id: id, type: type})) return;
|
||||
|
||||
let action = {id: id, type: type};
|
||||
stackLongActions.pop(action);
|
||||
|
||||
//this.updateWindowTitle(true);
|
||||
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}) || stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
|
||||
|
||||
if (action) {
|
||||
setLongActionView(action)
|
||||
}
|
||||
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
|
||||
|
||||
if (action) {
|
||||
setLongActionView(action)
|
||||
if (action && !forceClose) {
|
||||
setLongActionView(action);
|
||||
} else {
|
||||
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el);
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady
|
|||
pagesName.push(page.asc_getCodePageName());
|
||||
}
|
||||
Common.Notifications.trigger('preloader:close');
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
|
||||
const buttons = [];
|
||||
if (mode === 2) {
|
||||
buttons.push({
|
||||
|
@ -122,16 +122,16 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady
|
|||
});
|
||||
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
|
||||
Common.Notifications.trigger('preloader:close');
|
||||
// Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
|
||||
const buttons = [{
|
||||
text: 'OK',
|
||||
bold: true,
|
||||
onClick: function () {
|
||||
const password = document.getElementById('modal-password').value;
|
||||
api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
|
||||
// if (!isDocReady) {
|
||||
// Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
|
||||
// }
|
||||
if (!isDocReady) {
|
||||
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
|
||||
}
|
||||
}
|
||||
}];
|
||||
if (canRequestClose)
|
||||
|
|
|
@ -39,11 +39,7 @@ const LongActionsController = () => {
|
|||
api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd);
|
||||
api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
|
||||
|
||||
Common.Notifications.off('preloader:endAction', (type, id) => {
|
||||
if (stackLongActions.exist({id: id, type: type})) {
|
||||
onLongActionEnd(type, id);
|
||||
}
|
||||
});
|
||||
Common.Notifications.off('preloader:endAction', onLongActionEnd);
|
||||
Common.Notifications.off('preloader:beginAction', onLongActionBegin);
|
||||
Common.Notifications.off('preloader:close', closePreloader);
|
||||
})
|
||||
|
@ -55,21 +51,17 @@ const LongActionsController = () => {
|
|||
setLongActionView(action);
|
||||
};
|
||||
|
||||
const onLongActionEnd = (type, id) => {
|
||||
const onLongActionEnd = (type, id, forceClose) => {
|
||||
if (!stackLongActions.exist({id: id, type: type})) return;
|
||||
|
||||
let action = {id: id, type: type};
|
||||
stackLongActions.pop(action);
|
||||
|
||||
//this.updateWindowTitle(true);
|
||||
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}) || stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
|
||||
|
||||
if (action) {
|
||||
setLongActionView(action)
|
||||
}
|
||||
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
|
||||
|
||||
if (action) {
|
||||
if (action && !forceClose) {
|
||||
setLongActionView(action)
|
||||
} else {
|
||||
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el);
|
||||
|
|
|
@ -590,7 +590,7 @@ class MainController extends Component {
|
|||
|
||||
if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
|
||||
Common.Notifications.trigger('preloader:close');
|
||||
// Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument, true);
|
||||
|
||||
const buttons = [{
|
||||
text: 'OK',
|
||||
|
@ -599,9 +599,9 @@ class MainController extends Component {
|
|||
const password = document.getElementById('modal-password').value;
|
||||
this.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
|
||||
|
||||
// if (!this._isDocReady) {
|
||||
// Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
|
||||
// }
|
||||
if (!this._isDocReady) {
|
||||
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
|
||||
}
|
||||
}
|
||||
}];
|
||||
if (this.props.storeAppOptions.canRequestClose)
|
||||
|
|
|
@ -41,11 +41,7 @@ const LongActionsController = () => {
|
|||
api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
|
||||
api.asc_unregisterCallback('asc_onConfirmAction', onConfirmAction);
|
||||
|
||||
Common.Notifications.off('preloader:endAction', (type, id) => {
|
||||
if (stackLongActions.exist({id: id, type: type})) {
|
||||
onLongActionEnd(type, id);
|
||||
}
|
||||
});
|
||||
Common.Notifications.off('preloader:endAction', onLongActionEnd);
|
||||
Common.Notifications.off('preloader:beginAction', onLongActionBegin);
|
||||
Common.Notifications.off('preloader:close', closePreloader);
|
||||
})
|
||||
|
@ -57,21 +53,17 @@ const LongActionsController = () => {
|
|||
setLongActionView(action);
|
||||
};
|
||||
|
||||
const onLongActionEnd = (type, id) => {
|
||||
const onLongActionEnd = (type, id, forceClose) => {
|
||||
if (!stackLongActions.exist({id: id, type: type})) return;
|
||||
|
||||
let action = {id: id, type: type};
|
||||
stackLongActions.pop(action);
|
||||
|
||||
//this.updateWindowTitle(true);
|
||||
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}) || stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
|
||||
|
||||
if (action) {
|
||||
setLongActionView(action)
|
||||
}
|
||||
|
||||
action = stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
|
||||
|
||||
if (action) {
|
||||
if (action && !forceClose) {
|
||||
setLongActionView(action)
|
||||
} else {
|
||||
loadMask && loadMask.el && loadMask.el.classList.contains('modal-in') && f7.dialog.close(loadMask.el);
|
||||
|
|
|
@ -323,7 +323,7 @@ class MainController extends Component {
|
|||
this.api.asc_registerCallback('asc_onAdvancedOptions', (type, advOptions, mode, formatOptions) => {
|
||||
const {t} = this.props;
|
||||
const _t = t("View.Settings", { returnObjects: true });
|
||||
onAdvancedOptions(type, advOptions, mode, formatOptions, _t, this.props.storeAppOptions.canRequestClose);
|
||||
onAdvancedOptions(type, advOptions, mode, formatOptions, _t, this._isDocReady, this.props.storeAppOptions.canRequestClose);
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
@ -21,7 +21,7 @@ class DownloadController extends Component {
|
|||
_t.warnDownloadAs,
|
||||
_t.notcriticalErrorTitle,
|
||||
function () {
|
||||
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t)
|
||||
onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true);
|
||||
}
|
||||
)
|
||||
} else {
|
||||
|
@ -39,7 +39,7 @@ class DownloadController extends Component {
|
|||
|
||||
const DownloadWithTranslation = withTranslation()(DownloadController);
|
||||
|
||||
const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequestClose) => {
|
||||
const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady, canRequestClose) => {
|
||||
const api = Common.EditorApi.get();
|
||||
|
||||
if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
|
||||
|
@ -52,7 +52,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest
|
|||
pagesName.push(page.asc_getCodePageName());
|
||||
}
|
||||
|
||||
// me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
|
||||
Common.Notifications.trigger('preloader:close');
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
|
||||
|
||||
const buttons = [];
|
||||
|
||||
|
@ -76,9 +77,9 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest
|
|||
api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter));
|
||||
}
|
||||
|
||||
//if (!me._isDocReady) {
|
||||
//me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
|
||||
//}
|
||||
if (!isDocReady) {
|
||||
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -122,16 +123,16 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, canRequest
|
|||
|
||||
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
|
||||
Common.Notifications.trigger('preloader:close');
|
||||
//me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
|
||||
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256, true);
|
||||
const buttons = [{
|
||||
text: 'OK',
|
||||
bold: true,
|
||||
onClick: function () {
|
||||
const password = document.getElementById('modal-password').value;
|
||||
api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(password));
|
||||
//if (!me._isDocReady) {
|
||||
//me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
|
||||
//}
|
||||
if (!isDocReady) {
|
||||
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], -256);
|
||||
}
|
||||
}
|
||||
}];
|
||||
|
||||
|
|
|
@ -6,13 +6,17 @@ class SpreadsheetInfoController extends Component {
|
|||
constructor(props) {
|
||||
super(props);
|
||||
this.docProps = this.getDocProps();
|
||||
this.getModified = this.getModified();
|
||||
this.getModifiedBy = this.getModifiedBy();
|
||||
this.getCreators = this.getCreators();
|
||||
this.title = this.getTitle();
|
||||
this.subject = this.getSubject();
|
||||
this.description = this.getDescription();
|
||||
this.getCreated = this.getCreated();
|
||||
if (this.docProps) {
|
||||
this.dataApp = this.getAppProps();
|
||||
this.modified = this.getModified();
|
||||
this.modifiedBy = this.getModifiedBy();
|
||||
this.creators = this.getCreators();
|
||||
this.title = this.getTitle();
|
||||
this.subject = this.getSubject();
|
||||
this.description = this.getDescription();
|
||||
this.created = this.getCreated();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
getDocProps() {
|
||||
|
@ -23,7 +27,6 @@ class SpreadsheetInfoController extends Component {
|
|||
getAppProps() {
|
||||
const api = Common.EditorApi.get();
|
||||
const appProps = api.asc_getAppProps();
|
||||
|
||||
if (appProps) {
|
||||
let appName =
|
||||
(appProps.asc_getApplication() || "") +
|
||||
|
@ -31,12 +34,12 @@ class SpreadsheetInfoController extends Component {
|
|||
(appProps.asc_getAppVersion() || "");
|
||||
return appName;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
getModified() {
|
||||
let valueModified = this.docProps.asc_getModified();
|
||||
const _lang = this.props.storeAppOptions.lang;
|
||||
|
||||
if (valueModified) {
|
||||
return (
|
||||
valueModified.toLocaleString(_lang, {
|
||||
|
@ -48,14 +51,15 @@ class SpreadsheetInfoController extends Component {
|
|||
valueModified.toLocaleTimeString(_lang, { timeStyle: "short" })
|
||||
);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
getModifiedBy() {
|
||||
let valueModifiedBy = this.docProps.asc_getLastModifiedBy();
|
||||
|
||||
if (valueModifiedBy) {
|
||||
return Common.Utils.UserInfoParser.getParsedName(valueModifiedBy);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
getCreators() {
|
||||
|
@ -77,20 +81,20 @@ class SpreadsheetInfoController extends Component {
|
|||
getCreated() {
|
||||
let value = this.docProps.asc_getCreated();
|
||||
const _lang = this.props.storeAppOptions.lang;
|
||||
|
||||
if(value) {
|
||||
return value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleTimeString(_lang, {timeStyle: 'short'});
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<SpreadsheetInfo
|
||||
getAppProps={this.getAppProps}
|
||||
getModified={this.getModified}
|
||||
getModifiedBy={this.getModifiedBy}
|
||||
getCreators={this.getCreators}
|
||||
getCreated={this.getCreated}
|
||||
dataApp={this.dataApp}
|
||||
modified={this.modified}
|
||||
modifiedBy={this.modifiedBy}
|
||||
creators={this.creators}
|
||||
created={this.created}
|
||||
title={this.title}
|
||||
subject={this.subject}
|
||||
description={this.description}
|
||||
|
|
|
@ -7,11 +7,11 @@ const PageSpreadsheetInfo = (props) => {
|
|||
const { t } = useTranslation();
|
||||
const _t = t("View.Settings", { returnObjects: true });
|
||||
const storeSpreadsheetInfo = props.storeSpreadsheetInfo;
|
||||
const dataApp = props.getAppProps();
|
||||
const dataModified = props.getModified;
|
||||
const dataModifiedBy = props.getModifiedBy;
|
||||
const creators = props.getCreators;
|
||||
const dataDoc = storeSpreadsheetInfo.dataDoc;
|
||||
const dataApp = props.dataApp;
|
||||
const dataModified = props.modified;
|
||||
const dataModifiedBy = props.modifiedBy;
|
||||
const creators = props.creators;
|
||||
|
||||
return (
|
||||
<Page>
|
||||
|
|
Loading…
Reference in a new issue