From afa0d3af63f96c6e6770b4827d5f19d488fc9286 Mon Sep 17 00:00:00 2001 From: Jonathan Labreuille Date: Tue, 2 Aug 2016 18:08:12 +0200 Subject: [PATCH] Updated Ajax.js to avoid promise workaround - Removed get method in ajax.js as it's useless --- assets/js/src/ajax.js | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/assets/js/src/ajax.js b/assets/js/src/ajax.js index 76fcdffca3..3878a3582a 100644 --- a/assets/js/src/ajax.js +++ b/assets/js/src/ajax.js @@ -10,9 +10,6 @@ define('ajax', ['mailpoet', 'jquery', 'underscore'], function(MailPoet, jQuery, token: null, data: {} }, - get: function(options) { - return this.request('get', options); - }, post: function(options) { return this.request('post', options); }, @@ -54,26 +51,17 @@ define('ajax', ['mailpoet', 'jquery', 'underscore'], function(MailPoet, jQuery, }) } - // make ajax request depending on method - if(method === 'get') { - jQuery.get( - this.options.url, - params, - null, - 'json' - ); - } else { - jQuery.post( - this.options.url, - params, - null, - 'json' - ).then(function(data) { - deferred.resolve(data); - }, function(xhr) { - deferred.reject(xhr.responseJSON); - }); - } + // ajax request + deferred = jQuery.post( + this.options.url, + params, + null, + 'json' + ).then(function(data) { + return data; + }, function(xhr) { + return xhr.responseJSON; + }); // clear options this.options = {};