[FIX] correct criss-cross merge

bzr revid: chs@openerp.com-20111108155633-8lymglmg46sfv0ko

diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index fef9b51..5fba5f4 100644 (file)
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -21,16 +21,7 @@
          *
          * @param {Array} modules list of modules to initialize
          */
-        init: function(modules, connection, callback) {
-    
-            if (/^(function|undefined)$/.test(typeof connection)) {
-                callback = connection;
-                connection = {
-                    host: document.location.protocol + '//' + document.location.host,
-                };
-            }
-
-
+        init: function(modules) {
             var new_instance = {
                 // links to the global openerp
                 _openerp: openerp,
@@ -48,20 +39,6 @@
             for(var i=0; i < modules.length; i++) {
                 openerp[modules[i]](new_instance);
             }
-
-            new_instance.connector = new new_instance.web.Connection(connection.host);
-            if (connection.login) {
-                new_instance.connector.login(connection.database, connection.login, connection.password, function() {
-                    if (callback) {
-                        callback(new_instance);
-                    }
-                });
-            } else {
-                if (callback) {
-                    callback(new_instance);
-                }
-            }
-
             return new_instance;
         }
     };