[REF] web: add ajax.rpc and change some dependencies

4 files changed, 15 insertions, 9 deletions

diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js
index 71c742b026c..50e0e2f0c59 100644
--- a/addons/web/static/src/js/framework/ajax.js
+++ b/addons/web/static/src/js/framework/ajax.js
@@ -119,6 +119,11 @@ function jsonpRpc(url, fct_name, params, settings) {
     });
 }
 
+// helper function to make a rpc with a function name hardcoded to 'call' 
+function rpc(url, params, settings) {
+    return jsonRpc(url, 'call', params, settings);
+}
+
 // helper
 function realSetTimeout (fct, millis) {
     var finished = new Date().getTime() + millis;
@@ -363,6 +368,7 @@ var loadXML = (function () {
 return {
     jsonRpc: jsonRpc,
     jsonpRpc: jsonpRpc,
+    rpc: rpc,
     loadCSS: loadCSS,
     loadJS: loadJS,
     loadXML: loadXML,
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index 98c9aacc82a..92c85de3c16 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -1,15 +1,15 @@
 odoo.define('web.data', function (require) {
 "use strict";
 
-var core = require('web.core');
+var Class = require('web.Class');
+var mixins = require('web.mixins');
 var Model = require('web.Model');
 var session = require('web.session');
+var translation = require('web.translation');
 var pyeval = require('web.pyeval');
 var utils = require('web.utils');
 
-var Class = core.Class;
-var mixins = core.mixins;
-var _t = core._t;
+var _t = translation._t;
 
 /**
  * Serializes the sort criterion array of a dataset into a form which can be
diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js
index 52a2fa5b0b0..24358a7361b 100644
--- a/addons/web/static/src/js/framework/formats.js
+++ b/addons/web/static/src/js/framework/formats.js
@@ -1,11 +1,11 @@
 odoo.define('web.formats', function (require) {
 "use strict";
 
-var core = require('web.core');
+var translation = require('web.translation');
 var time = require('web.time');
 var utils = require('web.utils');
 
-var _t = core._t;
+var _t = translation._t;
 
 /**
  * Formats a single atomic value based on a field descriptor
diff --git a/addons/web/static/src/js/framework/misc.js b/addons/web/static/src/js/framework/misc.js
index a3ce73eddf8..22bbace458c 100644
--- a/addons/web/static/src/js/framework/misc.js
+++ b/addons/web/static/src/js/framework/misc.js
@@ -3,7 +3,7 @@ odoo.define('web.framework', function (require) {
 
 var core = require('web.core');
 var crash_manager = require('web.crash_manager');
-var session = require('web.session');
+var ajax = require('web.ajax');
 var Widget = require('web.Widget');
 
 var _t = core._t;
@@ -89,7 +89,7 @@ function redirect (url, wait) {
     };
 
     var wait_server = function() {
-        session.rpc("/web/webclient/version_info", {}).done(load).fail(function() {
+        ajax.rpc("/web/webclient/version_info", {}).done(load).fail(function() {
             setTimeout(wait_server, 250);
         });
     };
@@ -165,7 +165,7 @@ core.action_registry.add("logout", logout);
  */
 function ReloadContext (parent, action) {
     // side-effect of get_session_info is to refresh the session context
-    session.rpc("/web/session/get_session_info", {}).then(function() {
+    ajax.rpc("/web/session/get_session_info", {}).then(function() {
         Reload(parent, action);
     });
 }