ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/api: let caller disable nprogress

Browse source
This commit is contained in:
rr- 2016-05-22 11:16:25 +02:00
parent fa14bf714c
commit fa4412ef90
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
client/js/api.js
View file

@ -23,37 +23,41 @@ class Api {
]; ];
} }
get(url) { get(url, options) {
if (url in this.cache) { if (url in this.cache) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
resolve(this.cache[url]); resolve(this.cache[url]);
}); });
} }
return this._process(url, request.get).then(response => { return this._process(url, request.get, {}, {}, options)
this.cache[url] = response; .then(response => {
return Promise.resolve(response); this.cache[url] = response;
}); return Promise.resolve(response);
});
} }
post(url, data, files) { post(url, data, files, options) {
this.cache = {}; this.cache = {};
return this._process(url, request.post, data, files); return this._process(url, request.post, data, files, options);
} }
put(url, data, files) { put(url, data, files, options) {
this.cache = {}; this.cache = {};
return this._process(url, request.put, data, files); return this._process(url, request.put, data, files, options);
} }
delete(url) { delete(url, options) {
this.cache = {}; this.cache = {};
return this._process(url, request.delete); return this._process(url, request.delete, {}, {}, options);
} }
_process(url, requestFactory, data, files) { _process(url, requestFactory, data, files, options) {
options = options || {};
const fullUrl = this._getFullUrl(url); const fullUrl = this._getFullUrl(url);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
nprogress.start(); if (!options.noProgress) {
nprogress.start();
}
let req = requestFactory(fullUrl); let req = requestFactory(fullUrl);
if (data) { if (data) {
req.attach('metadata', new Blob([JSON.stringify(data)])); req.attach('metadata', new Blob([JSON.stringify(data)]));