Merge lp:~openerp-dev/openerp-web/7.0-opw-587544-cpa into lp:openerp-web/7.0

[Chirag Patel (OpenERP)]

Hello,

M2m field wrong height count when field in nonactive notebook page at load time.

Demo: Sales > Sales orders
1) Create new sales order
2) Open notebook page "Other Information"

Observed: "Categories" field overlappping "Source Document".

m2m field in second page and page is nonactive so field is hidden.
jQuery always gives 0 when we try to find height of hidden element.
so find the actual height of element actual.js added.

Thanks

[Christophe Matthieu (OpenERP) (chm-openerp)]

Hi,
No need lib.
Already fixed with "min-height: 22px"
Thanks

review: Disapprove

Unmerged revisions

3855. By Chirag Patel (OpenERP) on 2013-03-21

[FIX] Fixed m2m field wrong height count when field in nonactive notebook page.

=== modified file 'addons/web/__openerp__.py'
--- addons/web/__openerp__.py	2013-03-20 14:36:52 +0000
+++ addons/web/__openerp__.py	2013-03-22 12:16:24 +0000
@@ -58,6 +58,7 @@
         "static/src/js/view_list.js",
         "static/src/js/view_list_editable.js",
         "static/src/js/view_tree.js",
+        "static/lib/jquery.actual/jquery.actual.js",
     ],
     'css' : [
         "static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css",

=== added directory 'addons/web/static/lib/jquery.actual'
=== added file 'addons/web/static/lib/jquery.actual/jquery.actual.js'
--- addons/web/static/lib/jquery.actual/jquery.actual.js	1970-01-01 00:00:00 +0000
+++ addons/web/static/lib/jquery.actual/jquery.actual.js	2013-03-22 12:16:24 +0000
@@ -0,0 +1,97 @@
+/*! Copyright 2012, Ben Lin (http://dreamerslab.com/)
+* Licensed under the MIT License (LICENSE.txt).
+*
+* Version: 1.0.14
+*
+* Requires: jQuery 1.2.3 ~ 1.9.0
+*/
+;( function ( $ ){
+  $.fn.extend({
+    actual : function ( method, options ){
+      // check if the jQuery method exist
+      if( !this[ method ]){
+        throw '$.actual => The jQuery method "' + method + '" you called does not exist';
+      }
+
+      var defaults = {
+        absolute : false,
+        clone : false,
+        includeMargin : false
+      };
+
+      var configs = $.extend( defaults, options );
+
+      var $target = this.eq( 0 );
+      var fix, restore;
+
+      if( configs.clone === true ){
+        fix = function (){
+          var style = 'position: absolute !important; top: -1000 !important; ';
+
+          // this is useful with css3pie
+          $target = $target.
+            clone().
+            attr( 'style', style ).
+            appendTo( 'body' );
+        };
+
+        restore = function (){
+          // remove DOM element after getting the width
+          $target.remove();
+        };
+      }else{
+        var tmp = [];
+        var style = '';
+        var $hidden;
+
+        fix = function (){
+          // get all hidden parents
+          if ($.fn.jquery >= "1.8.0")
+            $hidden = $target.parents().addBack().filter( ':hidden' );
+          else
+            $hidden = $target.parents().andSelf().filter( ':hidden' );
+
+          style += 'visibility: hidden !important; display: block !important; ';
+
+          if( configs.absolute === true ) style += 'position: absolute !important; ';
+
+          // save the origin style props
+          // set the hidden el css to be got the actual value later
+          $hidden.each( function (){
+            var $this = $( this );
+
+            // Save original style. If no style was set, attr() returns undefined
+            tmp.push( $this.attr( 'style' ));
+            $this.attr( 'style', style );
+          });
+        };
+
+        restore = function (){
+          // restore origin style values
+          $hidden.each( function ( i ){
+            var $this = $( this );
+            var _tmp = tmp[ i ];
+
+            if( _tmp === undefined ){
+              $this.removeAttr( 'style' );
+            }else{
+              $this.attr( 'style', _tmp );
+            }
+          });
+        };
+      }
+
+      fix();
+      // get the actual value with user specific methed
+      // it can be 'width', 'height', 'outerWidth', 'innerWidth'... etc
+      // configs.includeMargin only works for 'outerWidth' and 'outerHeight'
+      var actual = /(outer)/g.test( method ) ?
+        $target[ method ]( configs.includeMargin ) :
+        $target[ method ]();
+
+      restore();
+      // IMPORTANT, this plugin only return the value of the first element
+      return actual;
+    }
+  });
+})( jQuery );

=== modified file 'addons/web/static/lib/jquery.textext/jquery.textext.js'
--- addons/web/static/lib/jquery.textext/jquery.textext.js	2012-06-27 14:47:31 +0000
+++ addons/web/static/lib/jquery.textext/jquery.textext.js	2013-03-22 12:16:24 +0000
@@ -976,7 +976,7 @@
 
 		self.trigger(EVENT_PRE_INVALIDATE);
 
-		height = input.outerHeight();
+		height = input.actual('outerHeight');
 
 		input.width(width);
 		wrap.width(width).height(height);