public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:45:56 +00:00
Code Issues Releases Wiki Activity

migrate xhrJson invocations to the new helper

Browse Source
This commit is contained in:
Andrew Dolgov
2021-02-19 10:22:00 +03:00
parent dba6dce3b3
commit 6b43b788d9
15 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
js/common.js
View File

@@ -143,7 +143,7 @@ String.prototype.stripTags = function() {
const xhr = {
post: function(url, params = {}, complete = undefined) {
console.log("xhr.post:", params);
console.log('xhr.post', '>>>', params);
return new Promise((resolve, reject) => {
if (typeof __csrf_token != "undefined")
@@ -156,6 +156,8 @@ const xhr = {
reject(error);
},
load: function(data, ioargs) {
//console.log('xhr.post', '<<<', data, ioargs);
if (complete != undefined)
complete(data, ioargs.xhr);
@@ -176,6 +178,8 @@ const xhr = {
reject(e);
}
console.log('xhr.json', '<<<', obj);
if (complete != undefined) complete(obj);
resolve(obj);
@@ -209,21 +213,7 @@ function xhrPost(url, params = {}, complete = undefined) {
/* exported xhrJson */
function xhrJson(url, params = {}, complete = undefined) {
return new Promise((resolve, reject) =>
xhrPost(url, params).then((reply) => {
let obj = null;
try {
obj = JSON.parse(reply.responseText);
} catch (e) {
console.error("xhrJson", e, reply);
reject(e);
}
if (complete != undefined) complete(obj);
resolve(obj);
}));
return xhr.json(url, params, complete);
}
/* common helpers not worthy of separate Dojo modules */