From c50dd4839683292e306ea3c83f1a80377246fef7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 12:32:20 +0100
Subject: [PATCH] [FIX] reflow on window resize

bzr revid: fme@openerp.com-20121213113220-y6smha0sjp7bagk3
---
 addons/web/static/src/js/chrome.js | 35 +++++++++++-------------------
 addons/web/static/src/xml/base.xml |  5 +----
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2481b3821e8..3bf5d6fb846 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -812,6 +812,15 @@ instance.web.Menu =  instance.web.Widget.extend({
                 });
             }
         });
+        var resizing_timer = null;
+        instance.web.bus.on('resize', this, function() {
+            if (resizing_timer) {
+                clearTimeout(resizing_timer);
+            }
+            resizing_timer = setTimeout(function() {
+                self.reflow();
+            }, 500);
+        });
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -857,12 +866,12 @@ instance.web.Menu =  instance.web.Widget.extend({
     },
     reflow: function() {
         var self = this;
-        var $more_container = $('.oe_menu_more_container');
+        var $more_container = $('.oe_menu_more_container').hide();
         var $more = $('.oe_menu_more');
-        $more.find('li').before($more_container);
+        $more.find('> li').insertBefore($more_container);
         var $li = this.$el.find('> li').not($more_container).hide();
         $li.each(function() {
-            var remaining_space = self.$el.parent().width();
+            var remaining_space = self.$el.parent().width() - $more_container.outerWidth();
             self.$el.parent().children(':visible').each(function() {
                 remaining_space -= $(this).outerWidth();
             });
@@ -871,27 +880,9 @@ instance.web.Menu =  instance.web.Widget.extend({
             }
             $(this).show();
         });
-        $li.filter(':hidden').appendTo($more);
+        $more.append($li.filter(':hidden').show());
         $more_container.toggle(!!$more.children().length);
     },
-    limit_entries: function() {
-        var maximum_visible_links = this.maximum_visible_links;
-        if (maximum_visible_links === 'auto') {
-            maximum_visible_links = this.auto_limit_entries();
-        }
-        if (maximum_visible_links < this.data.data.children.length) {
-            var $more = $(QWeb.render('Menu.more')),
-                $index = this.$el.find('li').eq(maximum_visible_links - 1);
-            $index.after($more);
-            //$('.oe_topbar').append($more);
-            $more.find('.oe_menu_more').append($index.next().nextAll());
-        }
-    },
-    auto_limit_entries: function() {
-        // TODO: auto detect overflow and bind window on resize
-        var width = $(window).width();
-        return Math.floor(width / 125);
-    },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand
      * except does not trigger any event on the way
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cfaf2a2dc4f..1897eed3292 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -348,10 +348,7 @@
         <li t-foreach="widget.data.data.children" t-as="menu">
             <t t-call="Menu.link"/>
         </li>
-        <li t-foreach="widget.data.data.children" t-as="menu">
-            <t t-call="Menu.link"/>
-        </li>
-        <li class="oe_menu_more_container">
+        <li class="oe_menu_more_container" style="display: none;">
             <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow">
                 More
                 <ul class="oe_menu_more oe_dropdown_menu"/>