[MERGE] Merged with web/trunk.

bzr revid: tde@openerp.com-20120803071501-dtfx1gw6hi5zmmxv

1 files changed, 16 insertions, 17 deletions

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 24441dc509f..2f2fb4f7832 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -19,15 +19,14 @@ instance.web.OldWidget = instance.web.Widget.extend({
         this._super(parent);
         this.element_id = element_id;
         this.element_id = this.element_id || _.uniqueId('widget-');
+
         var tmp = document.getElementById(this.element_id);
-        this.$element = tmp ? $(tmp) : $(document.createElement(this.tagName));
+        this.setElement(tmp || this._make_descriptive());
     },
     renderElement: function() {
         var rendered = this.render();
         if (rendered) {
-            var elem = $(rendered);
-            this.$element.replaceWith(elem);
-            this.$element = elem;
+            this.replaceElement($(rendered));
         }
         return this;
     },
@@ -394,13 +393,13 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         timer = setTimeout(waitLoop, CHECK_INTERVAL);
     },
     synchronized_mode: function(to_execute) {
-    	var synch = this.synch;
-    	this.synch = true;
-    	try {
-    		return to_execute();
-    	} finally {
-    		this.synch = synch;
-    	}
+        var synch = this.synch;
+        this.synch = true;
+        try {
+            return to_execute();
+        } finally {
+            this.synch = synch;
+        }
     }
 });
 
@@ -416,12 +415,12 @@ instance.web.Bus = instance.web.Class.extend(instance.web.EventDispatcherMixin,
         //           check gtk bindings
         // http://unixpapa.com/js/key.html
         _.each('click,dblclick,keydown,keypress,keyup'.split(','), function(evtype) {
-            $('html').on(evtype, self, function(ev) {
+            $('html').on(evtype, function(ev) {
                 self.trigger(evtype, ev);
             });
         });
         _.each('resize,scroll'.split(','), function(evtype) {
-            $(window).on(evtype, self, function(ev) {
+            $(window).on(evtype, function(ev) {
                 self.trigger(evtype, ev);
             });
         });
@@ -541,10 +540,10 @@ $.async_when = function() {
 // special tweak for the web client
 var old_async_when = $.async_when;
 $.async_when = function() {
-	if (instance.connection.synch)
-		return $.when.apply(this, arguments);
-	else
-		return old_async_when.apply(this, arguments);
+    if (instance.connection.synch)
+        return $.when.apply(this, arguments);
+    else
+        return old_async_when.apply(this, arguments);
 };
 
 /** Setup blockui */