[FIX] mail: adapt forward-ported code and test to BS4

2 files changed, 5 insertions, 5 deletions

diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index 8c72ea3dc86..ff1cf8b5761 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -229,7 +229,7 @@ var BasicActivity = AbstractField.extend({
     _bindPopoverFocusout: function ($popover_el) {
         var self = this;
         // Retrieve the actual popover's HTML
-        var $popover = $popover_el.data("bs.popover").tip();
+        var $popover = $($popover_el.data("bs.popover").tip);
         var activityID = $popover_el.data('activity-id');
         $popover.off('focusout');
         $popover.focusout(function (e) {
@@ -241,7 +241,7 @@ var BasicActivity = AbstractField.extend({
             }
         });
     },
-    
+
     /**
      * @private
      * @param {MouseEvent} ev
diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js
index 144bba0f75c..379b128fe89 100644
--- a/addons/mail/static/tests/chatter_tests.js
+++ b/addons/mail/static/tests/chatter_tests.js
@@ -262,7 +262,7 @@ QUnit.test('Activity Done keep feedback on blur', function (assert) {
     assert.strictEqual($activityEl.find('.o_thread_message .o_thread_message_note').text().trim(),
         'But I\'m talkin\' about Shaft', 'The activity should have the right note');
 
-    var $popoverEl = $activityEl.find('.o_thread_message_tools .o_activity_done');
+    var $popoverEl = $activityEl.find('.o_thread_message_tools .o_mark_as_done');
     $popoverEl.on('hidden.bs.popover', hiddenDef.resolve.bind(hiddenDef));
 
     // open popover
@@ -270,7 +270,7 @@ QUnit.test('Activity Done keep feedback on blur', function (assert) {
 
     shownDef.then(function () {
         // write a feedback and focusout
-        var $feedbackPopover = $popoverEl.data('bs.popover').tip();
+        var $feedbackPopover = $($popoverEl.data('bs.popover').tip);
         $feedbackPopover.find('#activity_feedback').val('John Shaft').focusout();
 
         hiddenDef.then(function () {
@@ -280,7 +280,7 @@ QUnit.test('Activity Done keep feedback on blur', function (assert) {
             $popoverEl.click();
 
             shownDef.then(function () {
-                var $feedbackPopover = $popoverEl.data('bs.popover').tip();
+                var $feedbackPopover = $($popoverEl.data('bs.popover').tip);
                 assert.strictEqual($feedbackPopover.find('#activity_feedback').val(), 'John Shaft',
                     "feedback should have been kept");