From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 9 Jan 2013 16:46:26 +0000 (+0100)
Subject: [FIX] html widget: fix cleditor width when the field was invisible before becoming... 
X-Git-Tag: 7.0-server~47
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=ca454bcf943050dc11ccbc9d617644985340ac1d;p=odoo%2Fodoo.git

[FIX] html widget: fix cleditor width when the field was invisible before becoming editable

lp bug: https://launchpad.net/bugs/1097638 fixed

bzr revid: odo@openerp.com-20130109164626-1a16vqmwc366n0xf
---

diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.js b/addons/web/static/lib/cleditor/jquery.cleditor.js
index f70cc8b..e344699 100644
--- a/addons/web/static/lib/cleditor/jquery.cleditor.js
+++ b/addons/web/static/lib/cleditor/jquery.cleditor.js
@@ -894,7 +894,7 @@
 
       var $toolbar = editor.$toolbar,
           $group = $toolbar.children("div:last"),
-          wid = $main.width();
+          wid = /%/.test("" + options.width) ? options.width : $main.width();
 
       // Resize the toolbar
       var hgt = $group.offset().top + $group.outerHeight() - $toolbar.offset().top + 1;