From 2ca0749fd5508ade6a754738e82debe8b2dd868a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 25 Aug 2011 16:37:45 +0200 Subject: [PATCH] [imp] made m2o context menu even more lazy loading bzr revid: nicolas.vanhoren@openerp.com-20110825143745-lqii7wov08s5ipbp --- addons/base/static/src/js/form.js | 10 ++++------ addons/base/static/src/xml/base.xml | 14 +++++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index dd9c8f0a3f0..903e7d9f23b 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1307,8 +1307,10 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ this.$drop_down = this.$element.find(".oe-m2o-drop-down-button"); this.$menu_btn = this.$element.find(".oe-m2o-cm-button"); + // context menu var init_context_menu_def = $.Deferred().then(function(e) { - // context menu + var $cmenu = $("#" + self.cm_id); + $cmenu.append(QWeb.render("FieldMany2One.context_menu", {widget: self})); var bindings = {}; bindings[self.cm_id + "_search"] = function() { self._search_create_popup("search"); @@ -1337,13 +1339,9 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ return true; } }); - setTimeout(function() { - self.$menu_btn.trigger(e); - }, 0); + setTimeout(function() {self.$menu_btn.trigger(e);}, 0); }); - var ctx_callback = function(e) {init_context_menu_def.resolve(e); e.preventDefault()}; - this.$menu_btn.bind('contextmenu', ctx_callback); this.$menu_btn.click(ctx_callback); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 69aac831386..cf3299c9c8f 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -805,13 +805,17 @@ - + + + +