diff options
| author | Alexandre Kühn <aku@odoo.com> | 2019-08-20 08:48:15 +0000 |
|---|---|---|
| committer | Alexandre Kühn <aku@odoo.com> | 2019-08-28 08:50:56 +0000 |
| commit | 6f6445be8cdd52dbd99b958bfd9c1a54540484f9 (patch) | |
| tree | 527e1c94b71bf2c9b7ba91245c8543593e17b665 | |
| parent | d431f94c759f9811c640d81a274e90301276d001 (diff) | |
[FIX] gamification, web: Edge does not support obj spread operator
As of August 20 2019, Microsoft Edge partially supports ECMA2018.
For instance, `Promise.prototype.finally()` can be used, but the
spread operator does not work on objects.
Task-ID 2056070
| -rw-r--r-- | addons/gamification/static/src/js/crash_manager.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/public/public_crash_manager.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/services/crash_manager.js | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/addons/gamification/static/src/js/crash_manager.js b/addons/gamification/static/src/js/crash_manager.js index f655f06dec0..806132bc4cd 100644 --- a/addons/gamification/static/src/js/crash_manager.js +++ b/addons/gamification/static/src/js/crash_manager.js @@ -11,10 +11,9 @@ CrashManager.include({ * @override */ getMapTitle() { - return { - ...this._super(...arguments), + return Object.assign({}, this._super(...arguments), { karma_error: _lt("Karma Error"), - }; + }); }, }); }); diff --git a/addons/web/static/src/js/public/public_crash_manager.js b/addons/web/static/src/js/public/public_crash_manager.js index a352340db7a..8eae270f23a 100644 --- a/addons/web/static/src/js/public/public_crash_manager.js +++ b/addons/web/static/src/js/public/public_crash_manager.js @@ -14,12 +14,11 @@ const PublicCrashManager = CrashManager.extend({ * @override */ _displayWarning(message, title, options) { - this.displayNotification({ - ...options, + this.displayNotification(Object.assign({}, options, { title, message, sticky: true, - }); + })); }, }); diff --git a/addons/web/static/src/js/services/crash_manager.js b/addons/web/static/src/js/services/crash_manager.js index e08f87c8fcb..a430dfa8ef3 100644 --- a/addons/web/static/src/js/services/crash_manager.js +++ b/addons/web/static/src/js/services/crash_manager.js @@ -317,10 +317,9 @@ var CrashManager = AbstractService.extend({ * @param {Object} options */ _displayWarning: function (message, title, options) { - return new WarningDialog(this, { - ...options, + return new WarningDialog(this, Object.assign({}, options, { title, - }, { + }), { message, }).open(); }, |