pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 20:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2708 from ONLYOFFICE/fix/bugfix

Browse Source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova
2023-11-24 20:55:53 +03:00
committed by GitHub
parent ff49dba08e f66b4f1eea
commit 2ffc010803
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/documenteditor/embed/js/ApplicationController.js
View File

@ -702,6 +702,9 @@ DE.ApplicationController = new(function(){
$('#loading-mask').addClass("none-animation");
}
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} else if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, advOptions.asc_getRecommendedSettings() || new Asc.asc_CTextOptions());
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
}
}

3
apps/pdfeditor/main/app/view/Toolbar.js
View File

@ -532,10 +532,11 @@ define([
id: 'id-toolbar-menu-' + id + '-color-new',
template: _.template('<a tabindex="-1" type="menuitem" style="">' + button.textNewColor + '</a>')
},
{caption: '--'},
{caption: '--', visible: false},
mnu = new Common.UI.MenuItem({
caption: this.strMenuNoFill,
checkable: true,
visible: false,
style: 'padding-left:20px;padding-right:20px;'
})
]

3
apps/spreadsheeteditor/embed/js/ApplicationController.js
View File

@ -481,6 +481,9 @@ SSE.ApplicationController = new(function(){
if(isCustomLoader) hidePreloader();
else $('#loading-mask').addClass("none-animation");
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
} else if (type == Asc.c_oAscAdvancedOptionsID.CSV) {
api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, advOptions.asc_getRecommendedSettings() || new Asc.asc_CTextOptions());
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
}
}