From 685c4f4d4ca68f30d6278e319a33cb7531123486 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 18 Oct 2013 11:33:07 +0200
Subject: [FIX] dropdown menu: compute document width *before* showing the
 dropdown menu

bzr revid: chs@openerp.com-20131018093307-plgk3y4qugv4o784
---
 addons/web/static/src/js/chrome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 11a2e58ae5b..3727b011943 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1247,6 +1247,7 @@ instance.web.Client = instance.web.Widget.extend({
         this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
             ev.preventDefault();
             var $toggle = $(this);
+            var doc_width = $(document).width();
             var $menu = $toggle.siblings('.oe_dropdown_menu');
             $menu = $menu.size() >= 1 ? $menu : $toggle.find('.oe_dropdown_menu');
             var state = $menu.is('.oe_opened');
@@ -1255,7 +1256,6 @@ instance.web.Client = instance.web.Widget.extend({
                 $toggle.add($menu).toggleClass('oe_opened', !state);
                 if (!state) {
                     // Move $menu if outside window's edge
-                    var doc_width = $(document).width();
                     var offset = $menu.offset();
                     var menu_width = $menu.width();
                     var x = doc_width - offset.left - menu_width - 2;
-- 
cgit v1.2.3


From 3853f642ff327f886086c7a766cdf76da7a2b906 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 18 Oct 2013 11:43:36 +0200
Subject: [FIX] web: correct StatusField widget to use dropdown menu

bzr revid: chs@openerp.com-20131018094336-3s8s3uggs60jwkl0
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/js')

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 324896112cc..bcea1bf5bbe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5475,7 +5475,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         });
         this.get_selection();
         if (this.options.clickable) {
-            this.$el.on('click','li:not(.oe_folded)',this.on_click_stage);
+            this.$el.on('click','li[data-id]',this.on_click_stage);
         }
         if (this.$el.parent().is('header')) {
             this.$el.after('<div class="oe_clear"/>');
-- 
cgit v1.2.3