Merge lp:~openerp-dev/openerp-web/mck-opw-579147-cbi into lp:~openerp-dev/openerp-web/6.1-web-custo-tfr

[Chris Biersbach (OpenERP)]

The issue: When clicking on the button next to o2m fields, an error message appeared. A first fix by mva caused this to disappear, but the first click still wouldn't open the context menu (only present in IE8)

The cause: a bug in jquery

This branch, along with an addons branch of the same name, fix this issue. The context menu is now correctly opened.

Unmerged revisions

2391. By Chris Biersbach (OpenERP) on 2013-01-15

[FIX] This, along with an addons patch, fixes the issue that the context menu is not opened in Internet Explorer 8 (shows an error)

=== modified file 'addons/web/static/lib/jquery/jquery-1.6.4.js'
--- addons/web/static/lib/jquery/jquery-1.6.4.js	2012-12-19 09:52:56 +0000
+++ addons/web/static/lib/jquery/jquery-1.6.4.js	2013-01-15 10:58:22 +0000
@@ -1015,11 +1015,9 @@
 							while( callbacks[ 0 ] ) {
 								callbacks.shift().apply( context, args );
 							}
+						} catch(err) {
+							//ie8 need a catch clause
 						}
-						catch(err)
-						 {
-						  //empty for ie8 need a catch
-						 }
 						finally {
 							fired = [ context, args ];
 							firing = 0;
 
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-01-14 10:35:27 +0000
+++ addons/web/static/src/js/view_form.js	2013-01-15 10:58:22 +0000
@@ -2126,7 +2126,7 @@
             });
         });
         this.$menu_btn.bind({
-            click: function(e) { init_context_menu_def.resolve(e); e.preventDefault() },
+            click: function(e) { $.when(init_context_menu_def.resolve(e)).then(function(){ e.preventDefault(); }); },
             focus: function () { $self.trigger('widget-focus'); },
             blur: function () {
                 if (cm_ignore_blur) { return; }