2 files changed, 14 insertions, 23 deletions

diff --git a/addons/mail/static/src/js/services/mail_status_manager.js b/addons/mail/static/src/js/services/mail_status_manager.js
index 2b75cdc6ee7..5ca151d47bf 100644
--- a/addons/mail/static/src/js/services/mail_status_manager.js
+++ b/addons/mail/static/src/js/services/mail_status_manager.js
@@ -3,6 +3,7 @@ odoo.define('mail.Manager.Status', function (require) {
 
 var core = require('web.core');
 var MailManager = require('mail.Manager');
+var mailUtils = require('mail.utils');
 var QWeb = core.qweb;
 
 /**
@@ -33,8 +34,8 @@ MailManager.include({
             // Add to list to call it in next bus update or _fetchMissingImStatus
             this._imStatus[partnerID] = undefined;
             // fetch after some time if no other getImStatus occurs
-            this._clearStatusServiceTimeout(this._fetchStatusTimeout);
-            this._fetchStatusTimeout = this._setStatusServiceTimeout(function () {
+            mailUtils.clearTimeout(this._fetchStatusTimeout);
+            this._fetchStatusTimeout = mailUtils.setTimeout(function () {
                 self._fetchMissingImStatus();
             }, 500);
         }
@@ -68,15 +69,6 @@ MailManager.include({
     //--------------------------------------------------------------------------
 
     /**
-     * A simple clearTimeout, useful for test
-     *
-     * @private
-     * @param {integer} ids
-     */
-    _clearStatusServiceTimeout: function (id) {
-        clearTimeout(id);
-    },
-    /**
      * Fetch the list of im_status for partner with id in ids list and triggers
      * an update.
      *
@@ -169,17 +161,6 @@ MailManager.include({
         });
     },
     /**
-     * A simple setTimeout, useful for test
-     *
-     * @private
-     * @param {function} func
-     * @param {integer} duration
-     * @return {integer}
-     */
-    _setStatusServiceTimeout: function (func, duration) {
-        return setTimeout(func, duration);
-    },
-    /**
      * Once initialised, this loop will update the im_status of registered
      * users.
      *
@@ -191,7 +172,7 @@ MailManager.include({
         if (!_.isNumber(counter)) {
             counter = 0;
         }
-        this._setStatusServiceTimeout(function () {
+        mailUtils.setTimeout(function () {
             if (counter >= self._UPDATE_INTERVAL && self._isTabFocused) {
                 self._fetchImStatus({ partnerIDs: self._getImStatusToUpdate() });
                 counter = 0;
diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js
index 1f31a6ead2f..14ac97def76 100644
--- a/addons/mail/static/src/js/utils.js
+++ b/addons/mail/static/src/js/utils.js
@@ -91,6 +91,14 @@ function timeFromNow(date) {
     return date.fromNow();
 }
 
+function o_clearTimeout(id) {
+    return clearTimeout(id);
+}
+
+function o_setTimeout(func, delay) {
+    return setTimeout(func, delay);
+}
+
 return {
     addLink: addLink,
     getTextToHTML: getTextToHTML,
@@ -100,6 +108,8 @@ return {
     parseEmail: parseEmail,
     stripHTML: stripHTML,
     timeFromNow: timeFromNow,
+    clearTimeout: o_clearTimeout,
+    setTimeout: o_setTimeout,
 };
 
 });