Merge pull request 'fix/bugfix' (#110) from fix/bugfix into hotfix/v8…

….2.1
ONLYOFFICE · Nov 6, 2024 · 906c274 · 906c274
2 parents 861270d + 885ed65
commit 906c274
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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;
             }
         }

diff --git 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;