Merge pull request 'fix/bugfix' (#172) from fix/bugfix into release/v…

…8.3.0
ONLYOFFICE · Dec 11, 2024 · ae42027 · ae42027
2 parents 858179a + c1cad8d
commit ae42027
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
@@ -480,7 +480,7 @@
 
                 if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
                     _config.document.fileType = _config.document.fileType.toLowerCase();
-                    var type = /^(?:(xls|xlsx|ods|csv|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|sxc|et|ett|numbers)|(pps|ppsx|ppt|pptx|odp|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|sxi|dps|dpt|key)|(pdf|djvu|xps|oxps)|(doc|docx|odt|gdoc|txt|rtf|mht|htm|html|mhtml|epub|docm|dot|dotm|dotx|fodt|ott|fb2|xml|oform|docxf|sxw|stw|wps|wpt|pages)|(vsdx))$/
+                    var type = /^(?:(xls|xlsx|ods|csv|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|sxc|et|ett|numbers)|(pps|ppsx|ppt|pptx|odp|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|sxi|dps|dpt|key)|(pdf|djvu|xps|oxps)|(doc|docx|odt|gdoc|txt|rtf|mht|htm|html|mhtml|epub|docm|dot|dotm|dotx|fodt|ott|fb2|xml|oform|docxf|sxw|stw|wps|wpt|pages)|(vsdx|vssx|vstx|vsdm|vssm|vstm))$/
                                     .exec(_config.document.fileType);
                     if (!type) {
                         window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");
@@ -1033,7 +1033,7 @@
             isForm = false;
         if (config.document) {
             if (typeof config.document.fileType === 'string')
-                type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|numbers)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|key)|(oform|docxf)|(vsdx))$/
+                type = /^(?:(pdf)|(djvu|xps|oxps)|(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots|xlsb|numbers)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp|key)|(oform|docxf)|(vsdx|vssx|vstx|vsdm|vssm|vstm))$/
                     .exec(config.document.fileType);
 
             if (config.document.permissions)

diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less
@@ -59,10 +59,6 @@
 @import "../../../../common/main/resources/less/advanced-settings-window.less";
 @import "../../../../common/main/resources/less/searchdialog.less";
 
-@toolbarBorderColor:            @border-toolbar-ie;
-@toolbarBorderColor:            @border-toolbar;
-@toolbarTopColor:               @background-toolbar-ie;
-@toolbarTopColor:               @background-toolbar;
 @toolbarFontSize:               12px;
 
 @iconSpriteCommonPath:          "../../../../common/forms/resources/img/glyphicons.png";
@@ -112,7 +108,7 @@
     min-width: 340px;
     z-index: 100;
     background-color: @background-toolbar-ie;
-    background-color: @toolbarTopColor;
+    background-color: @background-toolbar;
 
     display: flex;
     align-items: center;
@@ -124,7 +120,8 @@
         width: 100%;
         height: 40px;
 
-        .box-inner-shadow(0 -1px 0 @toolbarBorderColor);
+        .box-inner-shadow(0 -1px 0 @border-toolbar-ie);
+        .box-inner-shadow(0 -1px 0 @border-toolbar);
     }
 
     .group {