Commit 6da12dbe authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 64967fa5 9b80bee7
......@@ -122,7 +122,9 @@ var getDecks = function(callback) {
_done();
}, done)
}]
}, callback);
}, (err) => {
callback(err, decks);
});
}
......@@ -334,8 +336,6 @@ function requestListener(req, res) {
res.writeHead(200);
res.end(u.query.callback+'("'+result+'");');
});
res.writeHead(200);
res.end(u.query.callback+'("已删除全部卡组。");');
}
else if (u.pathname === '/api/upload_to_challonge') {
if (!auth.auth(u.query.username, u.query.password, "deck_dashboard_write", "upload_to_challonge")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment