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

[forms] fix bug 75432

Browse Source
This commit is contained in:
maxkadushkin
2025-06-25 00:51:04 +03:00
parent 50d7f87ae8
commit bb20ba6e25
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/main/lib/controller/Themes.js
View File

@ -550,7 +550,7 @@ define([
document.body.classList.add('theme-icons-cls-' + themes_map[theme_id].icons.cls);
}
if ( icons_base_url ) {
if ( icons_base_url && !(window.uitheme.embedicons === true) ) {
window.uitheme.apply_icons_from_url(theme_id, icons_base_url);
}
@ -640,7 +640,7 @@ define([
const comp_style = getComputedStyle(document.body);
if (themes_map[theme_id] && themes_map[theme_id].icons) {
if ( !document.querySelector('style#' + theme_id) ) {
if ( !document.querySelector('style#' + theme_id) && !(window.uitheme.embedicons === true) ) {
const icons_base_url = !!themes_map[theme_id].icons.basepath ? themes_map[theme_id].icons.basepath :
comp_style.getPropertyValue('--sprite-button-icons-base-url');

2
apps/common/main/lib/util/themeinit.js
View File

@ -157,7 +157,7 @@
inject_style_tag('.' + objtheme.id + '{' + colors.join(';') + ';}');
}
if ( objtheme.icons ) {
if ( objtheme.icons && !(window.uitheme.embedicons === true) ) {
window.uitheme.apply_icons_from_url(objtheme.id, objtheme.icons.basepath);
}

3
apps/documenteditor/forms/index.html
View File

@ -171,6 +171,9 @@
window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"];
!window.uitheme && (window.uitheme = {});
window.uitheme.embedicons = true;
</script>
</head>

3
apps/documenteditor/forms/index.html.deploy
View File

@ -146,6 +146,9 @@
window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"];
!window.uitheme && (window.uitheme = {});
window.uitheme.embedicons = true;
</script>
<script src="../../../../../apps/common/main/lib/util/desktopinit.js?__inline=true"></script>
</head>