[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120116110631-lrzp6uxsjki7by22

1 files changed, 5 insertions, 3 deletions

diff --git a/addons/web/static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js b/addons/web/static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js
index 2356f3b606b..47f542e5d39 100644
--- a/addons/web/static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js
+++ b/addons/web/static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js
@@ -65,8 +65,10 @@
                 display(index,this,e,options);
             return false;
         };
-        $(this).bind('contextmenu', callback);
-        if(options.leftClickToo) {
+        if (!options.noRightClick) {
+            $(this).bind('contextmenu', callback);
+        }
+        if (options.leftClickToo || options.noRightClick) {
             $(this).click(callback);
         }
         return this
@@ -123,4 +125,4 @@
 })(jQuery);
 $( function() {
     $('div.contextMenu').hide()
-});
\ No newline at end of file
+});