summaryrefslogtreecommitdiff
path: root/addons/web_diagram/static/src
diff options
context:
space:
mode:
authorVincent Schippefilt <vsc@odoo.com>2019-03-06 14:02:32 +0100
committerAaron Bohy <aab@odoo.com>2019-03-06 20:07:17 +0100
commita3dfd04ad670b425df4d36ff714a4d4e260ff5a9 (patch)
tree5f307d80442d351693f606fe2ab2f7d62b923a16 /addons/web_diagram/static/src
parentab56e637b7f97ddcdbcc9baea99ae097e342409c (diff)
[REF] web_diagram: adapt code after jQuery update
Part of task 1896658 Co-authored-by: Aaron Bohy <aab@odoo.com> Co-authored-by: Christophe Matthieu <chm@odoo.com> Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com> Co-authored-by: David Monjoie <dmo@odoo.com> Co-authored-by: Martin Geubelle <mge@odoo.com> Co-authored-by: svs-odoo <svs@odoo.com> Co-authored-by: Vincent Schippefilt <vsc@odoo.com>
Diffstat (limited to 'addons/web_diagram/static/src')
-rw-r--r--addons/web_diagram/static/src/js/diagram_model.js4
-rw-r--r--addons/web_diagram/static/src/js/diagram_renderer.js12
-rw-r--r--addons/web_diagram/static/src/js/graph.js4
3 files changed, 10 insertions, 10 deletions
diff --git a/addons/web_diagram/static/src/js/diagram_model.js b/addons/web_diagram/static/src/js/diagram_model.js
index 8ebd5724337..5d83de0d699 100644
--- a/addons/web_diagram/static/src/js/diagram_model.js
+++ b/addons/web_diagram/static/src/js/diagram_model.js
@@ -30,7 +30,7 @@ var DiagramModel = AbstractModel.extend({
/**
* @override
* @param {Object} params
- * @returns {Deferred}
+ * @returns {Promise}
*/
load: function (params) {
this.modelName = params.modelName;
@@ -58,7 +58,7 @@ var DiagramModel = AbstractModel.extend({
/**
* @private
* @param {any} record
- * @returns {Deferred}
+ * @returns {Promise}
*/
_fetchDiagramInfo: function () {
var self = this;
diff --git a/addons/web_diagram/static/src/js/diagram_renderer.js b/addons/web_diagram/static/src/js/diagram_renderer.js
index 7e41bf4817f..02539009790 100644
--- a/addons/web_diagram/static/src/js/diagram_renderer.js
+++ b/addons/web_diagram/static/src/js/diagram_renderer.js
@@ -14,7 +14,7 @@ var DiagramRenderer = AbstractRenderer.extend({
template: 'DiagramView',
/**
* @override
- * @returns {Deferred}
+ * @returns {Promise}
*/
start: function () {
var $header = this.$el.filter('.o_diagram_header');
@@ -32,7 +32,7 @@ var DiagramRenderer = AbstractRenderer.extend({
/**
* @override
- * @returns {Deferred}
+ * @returns {Promise}
*/
_render: function () {
var self = this;
@@ -109,10 +109,10 @@ var DiagramRenderer = AbstractRenderer.extend({
};
CuteNode.destruction_callback = function (cutenode) {
self.trigger_up('remove_node', {id: cutenode.id});
- // return a rejected deferred to prevent the library from removing
+ // return a rejected promise to prevent the library from removing
// the node directly,as the diagram will be redrawn once the node is
// deleted
- return $.Deferred().reject();
+ return Promise.reject();
};
CuteEdge.double_click_callback = function (cuteedge) {
self.trigger_up('edit_edge', {id: cuteedge.id});
@@ -129,10 +129,10 @@ var DiagramRenderer = AbstractRenderer.extend({
};
CuteEdge.destruction_callback = function (cuteedge) {
self.trigger_up('remove_edge', {id: cuteedge.id});
- // return a rejected deferred to prevent the library from removing
+ // return a rejected promise to prevent the library from removing
// the edge directly, as the diagram will be redrawn once the edge
// is deleted
- return $.Deferred().reject();
+ return Promise.reject();
};
return this._super.apply(this, arguments);
},
diff --git a/addons/web_diagram/static/src/js/graph.js b/addons/web_diagram/static/src/js/graph.js
index 57eaff582ee..d7e54389340 100644
--- a/addons/web_diagram/static/src/js/graph.js
+++ b/addons/web_diagram/static/src/js/graph.js
@@ -87,11 +87,11 @@
dummy_circle.animate({'r': close_button_radius }, 400, 'linear');
if(entity_type == "node"){
- $.when(GraphNode.destruction_callback(entity)).done(function () {
+ Promise.resolve(GraphNode.destruction_callback(entity)).then(function () {
entity.remove();
});
}else if(entity_type == "edge"){
- $.when(GraphEdge.destruction_callback(entity)).done(function () {
+ Promise.resolve(GraphEdge.destruction_callback(entity)).then(function () {
entity.remove();
});
}