From 25f232e8390c0f627ade71f7a727b0c02d193f20 Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 30 Sep 2020 11:06:48 +0300
Subject: [PATCH] Update bootstrap (fix dropdown menu)

---
 apps/common/main/lib/component/ComboBorderSize.js    |  2 +-
 apps/common/main/lib/component/ComboBox.js           |  1 +
 apps/common/main/lib/component/ComboBoxFonts.js      |  4 ++--
 apps/common/main/lib/view/LanguageDialog.js          |  2 +-
 apps/common/main/resources/less/buttons.less         | 12 ++++++++----
 apps/documenteditor/main/app/controller/LeftMenu.js  |  4 ++--
 .../main/app/template/RightMenu.template             |  4 ++--
 apps/documenteditor/main/app/view/Statusbar.js       |  2 +-
 .../main/resources/less/rightmenu.less               |  4 ++--
 .../main/resources/less/statusbar.less               |  6 ++++++
 .../main/app/template/RightMenu.template             |  2 +-
 .../main/app/template/RightMenu.template             |  2 +-
 12 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/apps/common/main/lib/component/ComboBorderSize.js b/apps/common/main/lib/component/ComboBorderSize.js
index bd25b6c59..5ce6c83e8 100644
--- a/apps/common/main/lib/component/ComboBorderSize.js
+++ b/apps/common/main/lib/component/ComboBorderSize.js
@@ -82,7 +82,7 @@ define([
                 '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-reference="parent"><span class="caret img-commonctrl"></span></button>',
                 '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
                     '<% _.each(items, function(item) { %>',
-                        '<li id="<%= item.id %>" class="dropdown-item" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
+                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a class="dropdown-item" tabindex="-1" type="menuitem">',
                             '<span><%= item.displayValue %></span>',
                             '<% if (item.offsety!==undefined) { %>',
                                 '<img src="data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" align="right" style="background-position: 0 -<%= item.offsety %>px;">',
diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js
index 085ee504b..d0dfea40c 100644
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@@ -265,6 +265,7 @@ define([
 
                 _.delay(function(){
                     me.cmpEl.addClass('show');
+                    me.cmpEl.find('.dropdown-menu').addClass('show');
                 }, delay || 0);
             },
 
diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js
index 1e6990760..240238e0d 100644
--- a/apps/common/main/lib/component/ComboBoxFonts.js
+++ b/apps/common/main/lib/component/ComboBoxFonts.js
@@ -381,8 +381,8 @@ define([
 
             onInsertItem: function(item) {
                 $(this.el).find('ul').prepend(_.template([
-                    '<li id="<%= item.id %>" class="dropdown-item">',
-                        '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
+                    '<li id="<%= item.id %>">',
+                        '<a class="font-item dropdown-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
                     '</li>'
                 ].join(''))({
                     item: item.attributes,
diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js
index efd4bf487..87ef8ad04 100644
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@@ -113,7 +113,7 @@ define([
 
     close: function(suppressevent) {
         var $window = this.getChild();
-        if (!$window.find('.combobox.open').length) {
+        if (!$window.find('.combobox.show').length) {
             Common.UI.Window.prototype.close.call(this, arguments);
         }
     },
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 8468c9d7c..a08b6d0b2 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -170,7 +170,7 @@
     display: inline-flex;
     flex-direction: column;
 
-    &.open,
+    &.show,
     &.over {
         &.split {
             > .inner-box-icon {
@@ -434,7 +434,7 @@
         }
     }
 
-    &.open {
+    &.show {
         > .btn-toolbar {
                 //color: lighten(@gray-lighter, 10%);
 
@@ -502,7 +502,7 @@
     &.split {
 
         &.over:not(.disabled),
-        &.open {
+        &.show {
             box-shadow: inset 0 0 0 1px @color-gray;
 
             button:not(.active):not(.btn-text-split-default) {
@@ -525,7 +525,7 @@
             }
         }
 
-        &.open {
+        &.show {
             > button:not(.active) {
                 &:last-of-type {
                     background-color: @color-dark;
@@ -606,6 +606,10 @@
     .box-shadow(none);
     background-color: transparent;
 
+    &:focus {
+        box-shadow: inset 0 0 0 1px @gray;
+    }
+
     &.bg-white {
         background-color: #fff;
     }
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index ef762b511..5c6fff1cc 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -806,13 +806,13 @@ define([
                     }
 
                     var statusbar = DE.getController('Statusbar');
-                    var menu_opened = statusbar.statusbar.$el.find('.open > [data-toggle="dropdown"]');
+                    var menu_opened = statusbar.statusbar.$el.find('.show > [data-toggle="dropdown"]');
                     if (menu_opened.length) {
                         $.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e);
                         return false;
                     }
                     if (this.mode.canPlugins && this.leftMenu.panelPlugins) {
-                        menu_opened = this.leftMenu.panelPlugins.$el.find('#menu-plugin-container.open > [data-toggle="dropdown"]');
+                        menu_opened = this.leftMenu.panelPlugins.$el.find('#menu-plugin-container.show > [data-toggle="dropdown"]');
                         if (menu_opened.length) {
                             $.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e);
                             return false;
diff --git a/apps/documenteditor/main/app/template/RightMenu.template b/apps/documenteditor/main/app/template/RightMenu.template
index 7b4bb1ba8..56b68ef85 100644
--- a/apps/documenteditor/main/app/template/RightMenu.template
+++ b/apps/documenteditor/main/app/template/RightMenu.template
@@ -28,7 +28,7 @@
         <button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
         <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
         <button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
-        <button id="id-right-menu-mail-merge" class="btn btn-category arrow-left hidden" content-target="id-mail-merge-settings"><i class="icon toolbar__icon btn-mailmerge">&nbsp;</i></button>
-        <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
+        <button id="id-right-menu-mail-merge" class="btn btn-category arrow-left d-none" content-target="id-mail-merge-settings"><i class="icon toolbar__icon btn-mailmerge">&nbsp;</i></button>
+        <button id="id-right-menu-signature" class="btn btn-category arrow-left d-none" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js
index 0959f9036..7cb2000f4 100644
--- a/apps/documenteditor/main/app/view/Statusbar.js
+++ b/apps/documenteditor/main/app/view/Statusbar.js
@@ -233,7 +233,7 @@ define([
                     style: 'margin-top:-5px;',
                     restoreHeight: 285,
                     itemTemplate: _.template([
-                        '<a id="<%= id %>" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
+                        '<a id="<%= id %>" class="dropdown-item" tabindex="-1" type="menuitem" style="padding-left: 28px !important;" langval="<%= value.value %>" class="<% if (checked) { %> checked <% } %>">',
                             '<i class="icon <% if (spellcheck) { %> toolbar__icon btn-ic-docspell spellcheck-lang <% } %>"></i>',
                             '<%= caption %>',
                         '</a>'
diff --git a/apps/documenteditor/main/resources/less/rightmenu.less b/apps/documenteditor/main/resources/less/rightmenu.less
index 46ea05174..a6e37ff3d 100644
--- a/apps/documenteditor/main/resources/less/rightmenu.less
+++ b/apps/documenteditor/main/resources/less/rightmenu.less
@@ -166,13 +166,13 @@
 
 .btn-edit-table                  {background-position: 0      0;}
 button.over .btn-edit-table      {background-position: -28px  0;}
-.btn-group.open .btn-edit-table,
+.btn-group.show .btn-edit-table,
 button.active:not(.disabled) .btn-edit-table,
 button:active:not(.disabled) .btn-edit-table    {background-position: -56px  0;}
 
 .btn-change-shape                  {background-position: 0      -16px;}
 button.over .btn-change-shape      {background-position: -28px  -16px;}
-.btn-group.open .btn-change-shape,
+.btn-group.show .btn-change-shape,
 button.active:not(.disabled) .btn-change-shape,
 button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -16px;}
 
diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less
index 176835bb4..37453da7d 100644
--- a/apps/documenteditor/main/resources/less/statusbar.less
+++ b/apps/documenteditor/main/resources/less/statusbar.less
@@ -78,6 +78,12 @@
         color: #000;
         margin-left: 6px;
 
+        .caret {
+            display: inline-block;
+            margin-left: 2px;
+            vertical-align: middle;
+        }
+
         .caret.up {
             background-position: @arrow-up-small-offset-x @arrow-up-small-offset-y;
 
diff --git a/apps/presentationeditor/main/app/template/RightMenu.template b/apps/presentationeditor/main/app/template/RightMenu.template
index a1e1e9c5d..687aa816a 100644
--- a/apps/presentationeditor/main/app/template/RightMenu.template
+++ b/apps/presentationeditor/main/app/template/RightMenu.template
@@ -26,6 +26,6 @@
         <button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
         <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
         <button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
-        <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
+        <button id="id-right-menu-signature" class="btn btn-category arrow-left d-none" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/template/RightMenu.template b/apps/spreadsheeteditor/main/app/template/RightMenu.template
index 1a6b96c13..2d39122e8 100644
--- a/apps/spreadsheeteditor/main/app/template/RightMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/RightMenu.template
@@ -32,6 +32,6 @@
         <button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
         <button id="id-right-menu-pivot" class="btn btn-category arrow-left" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-pivot-sum">&nbsp;</i></button>
         <button id="id-right-menu-slicer" class="btn btn-category arrow-left" content-target="id-slicer-settings"><i class="icon toolbar__icon btn-slicer">&nbsp;</i></button>
-        <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
+        <button id="id-right-menu-signature" class="btn btn-category arrow-left d-none" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
     </div>
 </div>
\ No newline at end of file