[REF] report,web(_editor): services extracted in their own files

session_instance.js moved from framework/ to services/ and renamed into
session.js, which required to change the bundles in report and web_editor
addons.

3 files changed, 6 insertions, 60 deletions

diff --git a/addons/web/static/src/js/framework/crash_manager.js b/addons/web/static/src/js/framework/crash_manager.js
index 99d949ac311..df21e87047c 100644
--- a/addons/web/static/src/js/framework/crash_manager.js
+++ b/addons/web/static/src/js/framework/crash_manager.js
@@ -1,15 +1,9 @@
-odoo.define('web.crash_manager', function (require) {
-    var CrashManager = require('web.CrashManager');
-    return new CrashManager();
-});
-
 odoo.define('web.CrashManager', function (require) {
 "use strict";
 
 var ajax = require('web.ajax');
 var core = require('web.core');
 var Dialog = require('web.Dialog');
-var session = require('web.session');
 
 var QWeb = core.qweb;
 var _t = core._t;
@@ -122,7 +116,7 @@ var CrashManager = core.Class.extend({
         }
         new Dialog(this, {
             title: "Odoo " + _.str.capitalize(error.type),
-            $content: QWeb.render('CrashManager.error', {session: session, error: error})
+            $content: QWeb.render('CrashManager.error', {error: error})
         }).open();
     },
     show_message: function(exception) {
@@ -176,7 +170,7 @@ var RedirectWarningHandler = Dialog.extend(ExceptionHandler, {
                 }},
                 {text: _t("Cancel"), click: function() { self.destroy(); }, close: true}
             ],
-            $content: QWeb.render('CrashManager.warning', {error: error})
+            $content: QWeb.render('CrashManager.warning', {error: error}),
         }).open();
     }
 });
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js
index 2e643637052..d848fd4c511 100644
--- a/addons/web/static/src/js/framework/session.js
+++ b/addons/web/static/src/js/framework/session.js
@@ -9,6 +9,10 @@ var _t = core._t;
 var qweb = core.qweb;
 var mixins = core.mixins;
 
+// To do: refactor session. Session accomplishes several concerns (rpc,
+// configuration, currencies (wtf?), user permissions...). They should be
+// clarified and separated.
+
 var Session = core.Class.extend(mixins.EventDispatcherMixin, {
     /**
 
@@ -419,50 +423,3 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
 return Session;
 
 });
-
-
-odoo.define('web.config', function (require) {
-"use strict";
-
-var bus = require('web.core').bus;
-// Configuration module.
-// To do: refactor session, and this module in a sane way.  Session accomplish
-// several concerns (rpc, configuration, currencies (wtf?), user permissions, ...)
-// they should be clarified and separated.
-
-var medias = [
-    window.matchMedia('(max-width: 767px)'),
-    window.matchMedia('(min-width: 768px) and (max-width: 991px)'),
-    window.matchMedia('(min-width: 992px) and (max-width: 1199px)'),
-    window.matchMedia('(min-width: 1200px)')
-];
-_.each(medias, function(m) {
-    m.addListener(set_size_class);
-});
-
-var config = {
-    debug: ($.deparam($.param.querystring()).debug !== undefined),
-    device: {
-        touch: 'ontouchstart' in window || 'onmsgesturechange' in window,
-        size_class: size_class(),
-        SIZES: { XS: 0, SM: 1, MD: 2, LG: 3 },
-    },
-};
-
-function size_class() {
-    for(var i = 0 ; i < medias.length ; i++) {
-        if(medias[i].matches) {
-            return i;
-        }
-    }
-}
-function set_size_class() {
-    var sc = size_class();
-    if (sc !== config.device.size_class) {
-        config.device.size_class = sc;
-        bus.trigger('size_class', sc);
-    }
-}
-
-return config;
-});
diff --git a/addons/web/static/src/js/framework/session_instance.js b/addons/web/static/src/js/framework/session_instance.js
deleted file mode 100644
index 50424de9718..00000000000
--- a/addons/web/static/src/js/framework/session_instance.js
+++ /dev/null
@@ -1,5 +0,0 @@
-odoo.define('web.session', function (require) {
-    var Session = require('web.Session');
-    var modules = odoo._modules;
-    return new Session(undefined, undefined, {modules:modules, use_cors: false});
-});