diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-18 14:26:33 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-18 14:26:33 +0100 |
| commit | a337b9ec92943017089ff24ea35ca592557121aa (patch) | |
| tree | d8b111991257d17aa7d9325ef15bf11730b988e6 /addons/web/static/src/js/chrome | |
| parent | f8e37d6a808a302cda973bc0c6f2b275355ef74c (diff) | |
| parent | f854e01a983334e214357b4e05083b9a96a61be7 (diff) | |
[MERGE] forward port branch 12.0 up to f854e01a983
Diffstat (limited to 'addons/web/static/src/js/chrome')
| -rw-r--r-- | addons/web/static/src/js/chrome/abstract_web_client.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome/apps_menu.js | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js index ea8fdc24a18..7082f26e69d 100644 --- a/addons/web/static/src/js/chrome/abstract_web_client.js +++ b/addons/web/static/src/js/chrome/abstract_web_client.js @@ -205,6 +205,10 @@ var AbstractWebClient = Widget.extend(ServiceProviderMixin, KeyboardNavigationMi }); } } else { + // ignore Chrome video internal error: https://crbug.com/809574 + if (!error && message === 'ResizeObserver loop limit exceeded') { + return; + } var traceback = error ? error.stack : ''; crash_manager.show_error({ type: _t("Odoo Client Error"), diff --git a/addons/web/static/src/js/chrome/apps_menu.js b/addons/web/static/src/js/chrome/apps_menu.js index f6535ed764c..eb7faaa971b 100644 --- a/addons/web/static/src/js/chrome/apps_menu.js +++ b/addons/web/static/src/js/chrome/apps_menu.js @@ -41,6 +41,9 @@ var AppsMenu = Widget.extend({ * Open the first app in the list of apps */ openFirstApp: function () { + if (!this._apps.length) { + return + } var firstApp = this._apps[0]; this._openApp(firstApp); }, |