Merge lp:~openerp-dev/openerp-web/6.1-opw-579519-msh into lp:openerp-web/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of blur and focus event binded on many2one menu button, here when you open context menu in editable one2many and click any option of the context will call save for current row.

Reason :- We bind the focus and blur of menu button of context menu, so when we click inside context menu will call blur for the menu button, and focus is not set to other widget of current row hence it will call form-blur and form-blur in turn call save for current row.

Hence manually bind the focus and blur for menu button of context menu instead of setupFocus, and ignore the blur when context menu clicked.

Thanks.

[lp:~openerp-dev/openerp-web/6.1-opw-579519-msh]

2462. By Xavier ALT on 2012-11-30

[IMP] many2one: better handle blur flag - has to be independant of autocomplete + correctly resetted on hide

[Xavier ALT (dex-phx)]

Hi Mohammed,

I've rework thing a little here to better handle the blur flag, as pn r2461 the flag was never resetted to "false".
I have also improved handling of that blur thing when both "contextmneu" and "autocomplete" is visible (that why we need to distinct flag) and when clicking on "menu_btn" from different many2one consecutively.

Cheers,
Xavier

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2012-10-23 07:30:10 +0000
+++ addons/web/static/src/js/view_form.js	2012-11-30 11:46:26 +0000
@@ -2036,6 +2036,7 @@
         this.$input = this.$element.find("input");
         this.$drop_down = this.$element.find(".oe-m2o-drop-down-button");
         this.$menu_btn = this.$element.find(".oe-m2o-cm-button");
+        var $self = $(self), ignore_blur = false, cm_ignore_blur = false;
 
         // context menu
         var init_context_menu_def = $.Deferred().then(function(e) {
@@ -2084,6 +2085,24 @@
                 });
                 var cmenu = self.$menu_btn.contextMenu(self.cm_id, {'noRightClick': true,
                     bindings: bindings, itemStyle: {"color": ""},
+                    onShowMenu: function(ev, menu) {
+                        if (menu.attr('openerp_cm_id') && menu.attr('openerp_cm_id') != self.cm_id) {
+                            // if contextMenu still visible but for a different
+                            // m2o, force it to hide to ensure 'cm_ignore_blur'
+                            // is correctly resetted.
+                            menu.hide();
+                        }
+                        menu.attr('openerp_cm_id', self.cm_id);
+                        cm_ignore_blur = true;
+                        menu.hide = function() {
+                            if ($(this).attr('openerp_cm_id')) {
+                                $(this).attr('openerp_cm_id', null);
+                                cm_ignore_blur = false;
+                            }
+                            $(this).hide();
+                        }
+                        return menu;
+                    },
                     onContextMenu: function() {
                         if(self.value) {
                             $("#" + self.cm_id + " .oe_m2o_menu_item_mandatory").removeClass("oe-m2o-disabled-cm");
@@ -2101,9 +2120,14 @@
                 $.async_when().then(function() {self.$menu_btn.trigger(e);});
             });
         });
-        var ctx_callback = function(e) {init_context_menu_def.resolve(e); e.preventDefault()};
-        this.$menu_btn.click(ctx_callback);
-
+        this.$menu_btn.bind({
+            click: function(e) { init_context_menu_def.resolve(e); e.preventDefault() },
+            focus: function () { $self.trigger('widget-focus'); },
+            blur: function () {
+                if (cm_ignore_blur) { return; }
+                $self.trigger('widget-blur');
+            }
+        });
         // some behavior for input
         this.$input.keyup(function() {
             if (self.$input.val() === "") {
@@ -2143,7 +2167,6 @@
                 }
             }
         };
-        var $self = $(self), ignore_blur = false;
         this.$input.bind({
             focusout: anyoneLoosesFocus,
             focus: function () { $self.trigger('widget-focus'); },
@@ -2151,7 +2174,7 @@
             autocompleteclose: function () { ignore_blur = false; },
             blur: function () {
                 // autocomplete open
-                if (ignore_blur) { return; }
+                if (ignore_blur || cm_ignore_blur) { return; }
                 var child_popup_open = _(self.widget_children).any(function (child) {
                     return child instanceof openerp.web.form.SelectCreatePopup
                         || child instanceof openerp.web.form.FormOpenPopup;
@@ -2194,7 +2217,6 @@
             }
         });
 
-        this.setupFocus(this.$menu_btn);
     },
     // autocomplete component content handling
     get_search_result: function(request, response) {