pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix updating file: check onOutdatedVersion event

Browse Source
This commit is contained in:
Julia Radzhabova
2024-12-24 18:41:08 +03:00
parent a960cc2bf4
commit ee845aebff
12 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/api/documents/api.js
View File

@ -383,6 +383,7 @@
_config.editorConfig.canSaveDocumentToBinary = _config.events && !!_config.events.onSaveDocument;
_config.editorConfig.canStartFilling = _config.events && !!_config.events.onRequestStartFilling;
_config.editorConfig.canRequestRefreshFile = _config.events && !!_config.events.onRequestRefreshFile;
_config.editorConfig.canUpdateVersion = _config.events && !!_config.events.onOutdatedVersion;
_config.frameEditorId = placeholderId;
_config.parentOrigin = window.location.origin;

2
apps/common/mobile/lib/controller/collaboration/Comments.jsx
View File

@ -93,7 +93,7 @@ class CommentsController extends Component {
/** coauthoring end **/
}
this.curUserId = this.props.users.currentUser.asc_getIdOriginal();
this.curUserId = this.props.users.currentUser ? this.props.users.currentUser.asc_getIdOriginal() : '';
});
}
onApiActiveSheetChanged (index) {

3
apps/documenteditor/forms/app/controller/ApplicationController.js
View File

@ -785,10 +785,11 @@ define([
_.defer(function() {
Common.Gateway.updateVersion();
if (callback) callback.call(me);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
me.editorConfig && me.editorConfig.canUpdateVersion && me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
})
}
});
Common.NotificationCenter.trigger('api:disconnect');
},
onLicenseChanged: function(params) {

2
apps/documenteditor/main/app/controller/Main.js
View File

@ -2594,7 +2594,7 @@ define([
_.defer(function() {
Common.Gateway.updateVersion();
if (callback) callback.call(me);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
me.editorConfig && me.editorConfig.canUpdateVersion && me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
})
}});
this.disableEditing(true, 'not-loaded');

4
apps/documenteditor/mobile/src/controller/Main.jsx
View File

@ -1362,6 +1362,7 @@ class MainController extends Component {
this.needToUpdateVersion = true;
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], Asc.c_oAscAsyncAction['Open']);
f7.dialog.alert(
_t.errorUpdateVersion,
@ -1371,8 +1372,9 @@ class MainController extends Component {
if (callback) {
callback.call(this);
}
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
this.editorConfig && this.editorConfig.canUpdateVersion && Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
});
Common.Notifications.trigger('api:disconnect');
}
onDocumentName () {

2
apps/pdfeditor/main/app/controller/Main.js
View File

@ -2211,7 +2211,7 @@ define([
_.defer(function() {
Common.Gateway.updateVersion();
if (callback) callback.call(me);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
me.editorConfig && me.editorConfig.canUpdateVersion && me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
})
}
});

2
apps/presentationeditor/main/app/controller/Main.js
View File

@ -2081,7 +2081,7 @@ define([
_.defer(function() {
Common.Gateway.updateVersion();
if (callback) callback.call(me);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
me.editorConfig && me.editorConfig.canUpdateVersion && me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
})
}
});

4
apps/presentationeditor/mobile/src/controller/Main.jsx
View File

@ -765,6 +765,7 @@ class MainController extends Component {
this.needToUpdateVersion = true;
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], Asc.c_oAscAsyncAction['Open']);
f7.dialog.alert(
_t.errorUpdateVersion,
@ -774,8 +775,9 @@ class MainController extends Component {
if (callback) {
callback.call(this);
}
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
this.editorConfig && this.editorConfig.canUpdateVersion && Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
});
Common.Notifications.trigger('api:disconnect');
}
onServerVersion (buildVersion) {

2
apps/spreadsheeteditor/main/app/controller/Main.js
View File

@ -2519,7 +2519,7 @@ define([
_.defer(function() {
Common.Gateway.updateVersion();
if (callback) callback.call(me);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
me.editorConfig && me.editorConfig.canUpdateVersion && me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
})
}
});

4
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View File

@ -1120,6 +1120,7 @@ class MainController extends Component {
this.needToUpdateVersion = true;
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], Asc.c_oAscAsyncAction['Open']);
f7.dialog.alert(
_t.errorUpdateVersion,
@ -1129,8 +1130,9 @@ class MainController extends Component {
if (callback) {
callback.call(this);
}
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
this.editorConfig && this.editorConfig.canUpdateVersion && Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
});
Common.Notifications.trigger('api:disconnect');
}
onServerVersion (buildVersion) {

2
apps/visioeditor/main/app/controller/Main.js
View File

@ -1705,7 +1705,7 @@ define([
_.defer(function() {
Common.Gateway.updateVersion();
if (callback) callback.call(me);
me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
me.editorConfig && me.editorConfig.canUpdateVersion && me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
})
}
});

4
apps/visioeditor/mobile/src/controller/Main.jsx
View File

@ -527,6 +527,7 @@ class MainController extends Component {
this.needToUpdateVersion = true;
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], Asc.c_oAscAsyncAction['Open']);
f7.dialog.alert(
_t.errorUpdateVersion,
@ -536,8 +537,9 @@ class MainController extends Component {
if (callback) {
callback.call(this);
}
Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
this.editorConfig && this.editorConfig.canUpdateVersion && Common.Notifications.trigger('preloader:beginAction', Asc.c_oAscAsyncActionType['BlockInteraction'], this.LoadingDocument);
});
Common.Notifications.trigger('api:disconnect');
}
onServerVersion (buildVersion) {