Merge pull request #2923 from ONLYOFFICE/fix/bugfix

Fix/bugfix
ONLYOFFICE · Apr 8, 2024 · a3f6877 · a3f6877
2 parents 5fc8c66 + f115de2
commit a3f6877
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 25 deletions.
diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
@@ -1056,9 +1056,10 @@
                 if ( config.editorConfig.customization.logo ) {
                     if (config.editorConfig.customization.logo.visible===false) {
                         params += "&headerlogo=";
-                    } else if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
-                        params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
-                    else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) {
+                    } else if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded || config.editorConfig.customization.logo.imageDark)) {
+                        (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded) && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded));
+                        config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark));
+                    } else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) {
                         config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image));
                         config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark));
                     }

diff --git a/apps/common/index.html b/apps/common/index.html
@@ -54,7 +54,7 @@
       <script>
           listenApiMsg(function (isform) {
               var match = window.location.href.match(/(.*)common\/index.html/i);
-              match && window.location.replace(match[1] + (isform || embed ? 'documenteditor' : 'pdfeditor') + '/' + (isform && embed ? 'forms' : embed ? 'embed' : 'main') + '/index' + postfix + '.html' +
+              match && window.location.replace(match[1] + (isform || embed ? 'documenteditor' : 'pdfeditor') + '/' + (isform && embed ? 'forms' : embed ? 'embed' : 'main') + '/index' + (isform && embed ? '' : postfix) + '.html' +
                        window.location.search + ("&isForm=" + !!isform));
           });
       </script>

diff --git a/apps/common/index.html.deploy b/apps/common/index.html.deploy
@@ -54,7 +54,7 @@
       <script>
           listenApiMsg(function (isform) {
               var match = window.location.href.match(/(.*)common\/index.html/i);
-              match && window.location.replace(match[1] + (isform || embed ? 'documenteditor' : 'pdfeditor') + '/' + (isform && embed ? 'forms' : embed ? 'embed' : 'main') + '/index' + postfix + '.html' +
+              match && window.location.replace(match[1] + (isform || embed ? 'documenteditor' : 'pdfeditor') + '/' + (isform && embed ? 'forms' : embed ? 'embed' : 'main') + '/index' + (isform && embed ? '' : postfix) + '.html' +
                        window.location.search + ("&isForm=" + !!isform));
           });
       </script>

diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js
@@ -805,6 +805,12 @@ define([
         setBranding: function (value) {
             if ( value && value.logo) {
                 var logo = $('#header-logo');
+                if (value.logo.visible===false) {
+                    logo.addClass('hidden');
+                    logo.parent().removeClass('margin-right-large');
+                    return;
+                }
+
                 if (value.logo.image || value.logo.imageDark) {
                     var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
                     logo.html('<img src="' + image + '" style="max-width:100px; max-height:20px;"/>');

diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html
@@ -225,6 +225,7 @@
 
            var params = getUrlParams(),
                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
+               hideLogo = params["headerlogo"]==='',
                logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
                logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
@@ -238,13 +239,17 @@
                document.body.removeChild(document.getElementById('loading-mask'));
            } else {
                var elem = document.querySelector('.loading-logo');
-               if (elem && (logo || logoDark)) {
-                   elem.style.backgroundImage= 'none';
-                   elem.style.width = 'auto';
-                   elem.style.height = 'auto';
-                   var img = document.querySelector('.loading-logo img');
-                   img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
-                   img.style.opacity = 1;
+               if (elem) {
+                   if (hideLogo) {
+                       elem.style.display = 'none';
+                   } else if (logo || logoDark) {
+                       elem.style.backgroundImage= 'none';
+                       elem.style.width = 'auto';
+                       elem.style.height = 'auto';
+                       var img = document.querySelector('.loading-logo img');
+                       img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
+                       img.style.opacity = 1;
+                   }
                }
            }
        </script>

diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy
@@ -209,6 +209,7 @@
 
             var params = getUrlParams(),
                            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
+                           hideLogo = params["headerlogo"]==='',
                            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
                            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
@@ -218,15 +219,19 @@
             if (stopLoading) {
                document.body.removeChild(document.getElementById('loading-mask'));
             } else {
-               var elem = document.querySelector('.loading-logo');
-               if (elem && (logo || logoDark)) {
-                   elem.style.backgroundImage= 'none';
-                   elem.style.width = 'auto';
-                   elem.style.height = 'auto';
-                   var img = document.querySelector('.loading-logo img');
-                   img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
-                   img.style.opacity = 1;
-               }
+                var elem = document.querySelector('.loading-logo');
+                if (elem) {
+                    if (hideLogo) {
+                        elem.style.display = 'none';
+                    } else if (logo || logoDark) {
+                        elem.style.backgroundImage= 'none';
+                        elem.style.width = 'auto';
+                        elem.style.height = 'auto';
+                        var img = document.querySelector('.loading-logo img');
+                        img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
+                        img.style.opacity = 1;
+                    }
+                }
             }
         </script>
 

diff --git a/apps/documenteditor/main/resources/less/filemenu.less b/apps/documenteditor/main/resources/less/filemenu.less
@@ -48,7 +48,8 @@
         padding-top: 4px;
         cursor: pointer;
         .font-size-large();
-
+        overflow: hidden;
+        text-overflow: ellipsis;
         &:hover {
           text-decoration: none;
         }

diff --git a/apps/pdfeditor/main/resources/less/filemenu.less b/apps/pdfeditor/main/resources/less/filemenu.less
@@ -48,7 +48,8 @@
         padding-top: 4px;
         cursor: pointer;
         .font-size-large();
-
+        overflow: hidden;
+        text-overflow: ellipsis;
         &:hover {
           text-decoration: none;
         }

diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less
@@ -163,7 +163,8 @@
                 padding-top: 4px;
                 cursor: pointer;
                 .font-size-large();
-
+                overflow: hidden;
+                text-overflow: ellipsis;
                 &:hover {
                     text-decoration: none;
                 }

diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less
@@ -157,7 +157,8 @@
                 padding-top: 4px;
                 cursor: pointer;
                 .font-size-large();
-
+                overflow: hidden;
+                text-overflow: ellipsis;
                 &:hover {
                     text-decoration: none;
                 }