scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed frontend crashing when database is empty

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-10 18:13:46 +02:00
parent d2695e635c
commit 0811968718
23 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public_html/js/Api.js
View File

@ -1,6 +1,6 @@
var App = App || {};
App.API = function(jQuery, promise, appState) {
App.API = function(_, jQuery, promise, appState) {
var baseUrl = '/api/';
@ -32,13 +32,13 @@ App.API = function(jQuery, promise, appState) {
success: function(data, textStatus, xhr) {
resolve({
status: xhr.status,
json: data});
json: stripMeta(data)});
},
error: function(xhr, textStatus, errorThrown) {
reject({
status: xhr.status,
json: xhr.responseJSON ?
xhr.responseJSON :
stripMeta(xhr.responseJSON) :
{error: errorThrown}});
},
type: method,
@ -48,6 +48,16 @@ App.API = function(jQuery, promise, appState) {
});
}
function stripMeta(data) {
var result = {};
_.each(data, function(v, k) {
if (!k.match(/^__/)) {
result[k] = v;
}
});
return result;
}
return {
get: get,
post: post,
@ -57,4 +67,4 @@ App.API = function(jQuery, promise, appState) {
};
App.DI.registerSingleton('api', ['jQuery', 'promise', 'appState'], App.API);
App.DI.registerSingleton('api', ['_', 'jQuery', 'promise', 'appState'], App.API);