natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into no-ls

This commit is contained in:
syuilo 2017-02-18 10:28:27 +09:00
parent 43f9fcb31b 2651612ea7
commit 10d2530a2b
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/web/app/boot.js
View File

@ -43,7 +43,7 @@ module.exports = callback => {
// Get cached account data // Get cached account data
let cachedMe = JSON.parse(localStorage.getItem('me')); let cachedMe = JSON.parse(localStorage.getItem('me'));
if (cachedMe != null && cachedMe.data != null && cachedMe.data.cache) { if (cachedMe && cachedMe.data && cachedMe.data.cache) {
fetched(cachedMe); fetched(cachedMe);
// 後から新鮮なデータをフェッチ // 後から新鮮なデータをフェッチ
@ -53,7 +53,7 @@ module.exports = callback => {
}); });
} else { } else {
// キャッシュ無効なのにキャッシュが残ってたら掃除 // キャッシュ無効なのにキャッシュが残ってたら掃除
if (cachedMe != null) { if (cachedMe) {
localStorage.removeItem('me'); localStorage.removeItem('me');
} }
@ -64,7 +64,7 @@ module.exports = callback => {
} }
function fetched(me) { function fetched(me) {
if (me != null) { if (me) {
riot.observable(me); riot.observable(me);
me.update = data => { me.update = data => {
@ -109,7 +109,7 @@ function fetchme(token, cb) {
} }
// Fetch user // Fetch user
fetch(CONFIG.api.url + "/i", { fetch(CONFIG.api.url + '/i', {
method: 'POST', method: 'POST',
body: JSON.stringify({ body: JSON.stringify({
i: token i: token
@ -125,15 +125,10 @@ function fetchme(token, cb) {
me.token = token; me.token = token;
// initialize it if user data is empty // initialize it if user data is empty
if (me.data != null) { me.data ? done() : init();
done();
} else {
init();
}
}); });
}, () => { }, () => {
const info = document.body.appendChild(document.createElement('mk-core-error')); riot.mount(document.body.appendChild(document.createElement('mk-core-error')), {
riot.mount(info, {
retry: () => { retry: () => {
fetchme(token, cb); fetchme(token, cb);
} }
@ -141,9 +136,7 @@ function fetchme(token, cb) {
}); });
function done() { function done() {
if (cb != null) { if (cb) cb(me);
cb(me);
}
} }
function init() { function init() {
@ -160,4 +153,5 @@ function fetchme(token, cb) {
function panic(e) { function panic(e) {
console.error(e); console.error(e);
document.body.innerHTML = '<div id="error"><p>致命的な問題が発生しました。</p></div>'; document.body.innerHTML = '<div id="error"><p>致命的な問題が発生しました。</p></div>';
// TODO: Report the bug
} }