[MERGE] last forward port of branch saas-4 up to a65a95f

This commit is contained in:
Christophe Simonis 2014-08-28 15:22:29 +02:00
commit cf4cbd5d3b
1 changed files with 2 additions and 2 deletions

View File

@ -3676,10 +3676,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
focusout: anyoneLoosesFocus,
focus: function () { self.trigger('focused'); },
autocompleteopen: function () { ignore_blur = true; },
autocompleteclose: function () { ignore_blur = false; },
autocompleteclose: function () { setTimeout(function() {ignore_blur = false;},0); },
blur: function () {
// autocomplete open
if (ignore_blur) { return; }
if (ignore_blur) { $(this).focus(); return; }
if (_(self.getChildren()).any(function (child) {
return child instanceof instance.web.form.AbstractFormPopup;
})) { return; }