diff options
| author | Aaron Bohy <aab@odoo.com> | 2017-09-21 16:07:21 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-09-25 13:29:17 +0200 |
| commit | 628c19d8c378e7ca1737a4ddc4f90c1549b08447 (patch) | |
| tree | ad27ceef22ab6be24f686d27d3b343f760071cdd | |
| parent | eece785b704976b394c19fd2b1684129a5108af4 (diff) | |
[REF] web: preliminary work for the mobile Burger Menu
| -rw-r--r-- | addons/web/static/src/js/chrome/menu.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome/user_menu.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/switch_company_menu.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 16 |
4 files changed, 13 insertions, 10 deletions
diff --git a/addons/web/static/src/js/chrome/menu.js b/addons/web/static/src/js/chrome/menu.js index 5fdfec5fb37..c9d58d89c81 100644 --- a/addons/web/static/src/js/chrome/menu.js +++ b/addons/web/static/src/js/chrome/menu.js @@ -5,11 +5,8 @@ var core = require('web.core'); var session = require('web.session'); var Widget = require('web.Widget'); -var QWeb = core.qweb; - var Menu = Widget.extend({ init: function() { - var self = this; this._super.apply(this, arguments); this.is_bound = $.Deferred(); this.data = {data:{children:[]}}; diff --git a/addons/web/static/src/js/chrome/user_menu.js b/addons/web/static/src/js/chrome/user_menu.js index 5e1691c6640..84c16b51f82 100644 --- a/addons/web/static/src/js/chrome/user_menu.js +++ b/addons/web/static/src/js/chrome/user_menu.js @@ -23,7 +23,7 @@ var UserMenu = Widget.extend({ start: function () { var self = this; var session = this.getSession(); - this.$el.on('click', '.dropdown-menu li a[data-menu]', function (ev) { + this.$el.on('click', 'li a[data-menu]', function (ev) { ev.preventDefault(); var menu = $(this).data('menu'); self['_onMenu' + menu.charAt(0).toUpperCase() + menu.slice(1)](); diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js index 872ebb54fdb..ac0b6f50738 100644 --- a/addons/web/static/src/js/widgets/switch_company_menu.js +++ b/addons/web/static/src/js/widgets/switch_company_menu.js @@ -56,4 +56,6 @@ var SwitchCompanyMenu = Widget.extend({ SystrayMenu.Items.push(SwitchCompanyMenu); +return SwitchCompanyMenu; + }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 446ff26c2df..40b94a5a11d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1309,16 +1309,20 @@ <span class="oe_topbar_name"/> </a> <ul class="dropdown-menu" role="menu"> - <li><a href="#" data-menu="documentation">Documentation</a></li> - <li><a href="#" data-menu="support">Support</a></li> - <li class="divider"/> - <li><a href="#" data-menu="settings">Preferences</a></li> - <li><a href="#" data-menu="account">My Odoo.com account</a></li> - <li><a href="#" data-menu="logout">Log out</a></li> + <t t-call="UserMenu.Actions"/> </ul> </li> </t> +<t t-name="UserMenu.Actions"> + <li><a href="#" data-menu="documentation">Documentation</a></li> + <li><a href="#" data-menu="support">Support</a></li> + <li class="divider"/> + <li><a href="#" data-menu="settings">Preferences</a></li> + <li><a href="#" data-menu="account">My Odoo.com account</a></li> + <li><a href="#" data-menu="logout">Log out</a></li> +</t> + <t t-name="SwitchCompanyMenu"> <li class="o_switch_company_menu"> <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" href="#"> |