diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-01 16:01:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-01 16:01:54 +0200 |
| commit | 43b63a04656276926dfecd65d3058d6464ee8ac5 (patch) | |
| tree | d0f7c5b4a66540fa8422de2be928a30167e45eed /addons/web/static/src | |
| parent | b2870ae1ebc4d198c69142a2399827848d7d30b4 (diff) | |
| parent | 57e387b645200756c29423af463afe001707f2ac (diff) | |
[MERGE] forward port branch saas-11.4 up to 57e387b6452
Diffstat (limited to 'addons/web/static/src')
3 files changed, 11 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js index 2eacf6caa0d..d121ec929f0 100644 --- a/addons/web/static/src/js/chrome/action_manager_act_window.js +++ b/addons/web/static/src/js/chrome/action_manager_act_window.js @@ -340,7 +340,9 @@ ActionManager.include({ action.controllerID = controller.jsID; return self._executeAction(action, options).done(function () { if (lazyLoadedController) { - self.controllerStack.unshift(lazyLoadedController.jsID); + // controller should be placed just before the current one + var index = self.controllerStack.length - 1; + self.controllerStack.splice(index, 0, lazyLoadedController.jsID); self.controlPanel.update({ breadcrumbs: self._getBreadcrumbs(), }, {clear: false}); diff --git a/addons/web/static/src/js/chrome/keyboard_navigation_mixin.js b/addons/web/static/src/js/chrome/keyboard_navigation_mixin.js index a8d95d57a79..dc65d2ea610 100644 --- a/addons/web/static/src/js/chrome/keyboard_navigation_mixin.js +++ b/addons/web/static/src/js/chrome/keyboard_navigation_mixin.js @@ -144,6 +144,13 @@ odoo.define('web.KeyboardNavigationMixin', function (require) { }); this._addAccessKeyOverlays(); } + // on mac, there are a number of keys that are only accessible though the usage of + // the ALT key (like the @ sign in most keyboards) + // for them we do not facilitate the access keys, so they will need to be activated classically + // though Control + Alt + key (case sensitive), see https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey + if (this.BrowserDetection.isOsMac()) + return; + if (keyDownEvent.altKey && !keyDownEvent.ctrlKey && keyDownEvent.key.length === 1) { // we don't want to catch the Alt key down, only the characters A to Z and number keys var elementWithAccessKey = []; if (keyDownEvent.keyCode >= 65 && keyDownEvent.keyCode <= 90 || keyDownEvent.keyCode >= 97 && keyDownEvent.keyCode <= 122) { diff --git a/addons/web/static/src/js/tools/debug_manager.js b/addons/web/static/src/js/tools/debug_manager.js index 6f6022b021f..391d8613aac 100644 --- a/addons/web/static/src/js/tools/debug_manager.js +++ b/addons/web/static/src/js/tools/debug_manager.js @@ -504,7 +504,7 @@ DebugManager.include({ model: 'ir.default', method: 'set', args: [ - self._controller.fields_view.model, + self._action.res_model, fieldToSet, value, selfUser, |