odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

fix rename bind into setup to avoid collision with events 

bzr revid: al@openerp.com-20120426222928-vmzv2jcmaiic3ll4
This commit is contained in:
Antony Lesuisse 2012-04-27 00:29:28 +02:00
parent fb83a403c4
commit f7e3de5483
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/corelib.js
View File

@ -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;