From f7e3de54834f7f83c5f6690608ecf01bbccf0337 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 27 Apr 2012 00:29:28 +0200
Subject: [PATCH] fix rename bind into setup to avoid collision with events

bzr revid: al@openerp.com-20120426222928-vmzv2jcmaiic3ll4
---
 addons/web/static/src/js/corelib.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 94aa82d6ddb..4dea72bfc9c 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -878,7 +878,7 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
         this.server = null;
         this.debug = ($.deparam($.param.querystring()).debug != undefined);
     },
-    bind: function(origin) {
+    setup: function(origin) {
         var window_origin = location.protocol+"//"+location.host, self=this;
         this.origin = origin ? _.str.rtrim(origin,'/') : window_origin;
         this.prefix = this.origin;
@@ -1357,7 +1357,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
      */
     session_bind: function(origin) {
         var self = this;
-        this.bind(origin);
+        this.setup(origin);
         instance.web.qweb.default_dict['_s'] = this.origin;
         this.session_id = false;
         this.uid = false;