From 03666e20572fa2e231655b2d8196e342195debe2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2024 18:08:33 +0300 Subject: [PATCH 1/2] [Mobile] Fix plugins loading --- apps/common/mobile/lib/controller/Plugins.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/mobile/lib/controller/Plugins.jsx b/apps/common/mobile/lib/controller/Plugins.jsx index 92a3e04a48..54ba90ed39 100644 --- a/apps/common/mobile/lib/controller/Plugins.jsx +++ b/apps/common/mobile/lib/controller/Plugins.jsx @@ -10,7 +10,7 @@ const PluginsController = inject('storeAppOptions')(observer(props => { let modal, iframe; useEffect(() => { - if (storeAppOptions.customization && !!storeAppOptions.customization.plugins) { + if (storeAppOptions.customization && storeAppOptions.customization.plugins!==false) { const api = Common.EditorApi.get(); api.asc_registerCallback("asc_onPluginShow", showPluginModal); @@ -246,9 +246,9 @@ const PluginsController = inject('storeAppOptions')(observer(props => { refConfigPlugins.current.plugins = loaded; mergePlugins(); }); - if (configPlugins.config.options) { + if (refConfigPlugins.current.config.options) { const api = Common.EditorApi.get(); - api && api.setPluginsOptions(configPlugins.config.options); + api && api.setPluginsOptions(refConfigPlugins.current.config.options); } } else { refConfigPlugins.current.plugins = false; From 885ed65ed0069c3d88651dfc918ec6559c5778f3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2024 18:24:39 +0300 Subject: [PATCH 2/2] Fix icons for custom plugin button --- apps/common/main/resources/less/bigscaling.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/bigscaling.less b/apps/common/main/resources/less/bigscaling.less index d516e5ab47..25a32726d6 100644 --- a/apps/common/main/resources/less/bigscaling.less +++ b/apps/common/main/resources/less/bigscaling.less @@ -5,7 +5,7 @@ .btn-options, .label-cmp { i.icon { - &:not(.scaling-off) { + &:not(.scaling-off):not(.icon-custom) { display: none; } }