pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/shortcuts-for-view' (#761) from fix/shortcuts-for-view into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/web-apps/pulls/761
This commit is contained in:
Oleg Korshul
2025-10-07 17:22:16 +00:00
parent a0bca37d97 caaec78686
commit c8778ef53c
19 changed files with 380 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1116,6 +1116,8 @@ define([
documentHolderController.getView().on('editcomplete', _.bind(me.onEditComplete, me));
PDFE.getController('Common.Controllers.Shortcuts').setApi(me.api);
if (me.appOptions.isEdit || me.appOptions.isRestrictedEdit) {
if (me.appOptions.isEdit && me.appOptions.canForcesave) {// use asc_setIsForceSaveOnUserSave only when customization->forcesave = true
me.appOptions.forcesave = Common.localStorage.getBool("pdfe-settings-forcesave", me.appOptions.canForcesave);
@ -1129,7 +1131,6 @@ define([
me.appOptions.isRestrictedEdit && me.api.asc_SetHighlightRequiredFields(true);
var timer_sl = setTimeout(function(){
PDFE.getController('Common.Controllers.Shortcuts').setApi(me.api);
toolbarController.createDelayedElements();
toolbarController.activateControls();