[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3

See sub-commits for details.

task-49280
Closes https://github.com/odoo/odoo/pull/25045

1 files changed, 7 insertions, 7 deletions

diff --git a/addons/web/static/src/js/widgets/dropdown_menu.js b/addons/web/static/src/js/widgets/dropdown_menu.js
index a3a83519678..6f8f78a13d5 100644
--- a/addons/web/static/src/js/widgets/dropdown_menu.js
+++ b/addons/web/static/src/js/widgets/dropdown_menu.js
@@ -11,8 +11,8 @@ var QWeb = core.qweb;
 var DropdownMenu = Widget.extend({
     template: 'web.DropdownMenu',
     events: {
-        'click li.o_menu_item': '_onItemClick',
-        'click li.o_item_option': '_onOptionClick',
+        'click .o_menu_item': '_onItemClick',
+        'click .o_item_option': '_onOptionClick',
         'click span.o_trash_button': '_onTrashClick',
         'hidden.bs.dropdown': '_onBootstrapClose',
     },
@@ -44,12 +44,12 @@ var DropdownMenu = Widget.extend({
         this.dropdownCategory = dropdownHeader.category;
         this.dropdownTitle = dropdownHeader.title;
         this.dropdownIcon = dropdownHeader.icon;
-        this.dropdownSymbol = dropdownHeader.symbol || 'caret';
+        this.dropdownSymbol = dropdownHeader.symbol || false;
         // this parameter fixes the menu style. By default,
         // the style used is the one used in the search view
         this.dropdownStyle = dropdownHeader.style || {
                 el: {class: 'btn-group o_dropdown', attrs: {}},
-                mainButton: {class: 'o_dropdown_toggler_btn btn btn-sm btn-default dropdown-toggle'},
+                mainButton: {class: 'o_dropdown_toggler_btn btn btn-secondary dropdown-toggle' + (this.dropdownSymbol ? ' o-no-caret' : '')},
             };
         this.items = items;
         _.each(this.items, this._prepareItem.bind(this));
@@ -105,8 +105,8 @@ var DropdownMenu = Widget.extend({
      */
     _renderMenuItems: function () {
         var newMenuItems = QWeb.render('DropdownMenu.MenuItems', {widget: this});
-        this.$el.find('.o_menu_item,.divider[data-removable="1"]').remove();
-        this.$('ul.o_dropdown_menu').prepend($(newMenuItems));
+        this.$el.find('.o_menu_item, .dropdown-divider[data-removable="1"]').remove();
+        this.$('.o_dropdown_menu').prepend($(newMenuItems));
     },
     /**
      * this function computes some default values for some of the item keys
@@ -189,7 +189,7 @@ var DropdownMenu = Widget.extend({
      * @param {jQueryEvent} event
      */
     _onBootstrapClose: function () {
-        _.each(this.items, function(item) {
+        _.each(this.items, function (item) {
             item.isOpen = false;
         });
         this._renderMenuItems();