|
@@ -49,10 +49,7 @@ export default class Crowi {
|
|
|
fetchUsers () {
|
|
fetchUsers () {
|
|
|
const interval = 1000*60*10; // 5min
|
|
const interval = 1000*60*10; // 5min
|
|
|
const currentTime = new Date();
|
|
const currentTime = new Date();
|
|
|
- if (!this.localStorage.lastFetched) {
|
|
|
|
|
- this.localStorage.lastFetched = new Date();
|
|
|
|
|
- }
|
|
|
|
|
- if (interval > currentTime - new Date(this.localStorage.lastFetched)) {
|
|
|
|
|
|
|
+ if (!this.localStorage.lastFetched && interval > currentTime - new Date(this.localStorage.lastFetched)) {
|
|
|
return ;
|
|
return ;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -70,14 +67,14 @@ export default class Crowi {
|
|
|
this.localStorage.userByName = JSON.stringify(userByName);
|
|
this.localStorage.userByName = JSON.stringify(userByName);
|
|
|
|
|
|
|
|
this.localStorage.lastFetched = new Date();
|
|
this.localStorage.lastFetched = new Date();
|
|
|
- //console.log('userByName', this.localStorage.userByName);
|
|
|
|
|
}).catch(err => {
|
|
}).catch(err => {
|
|
|
|
|
+ this.localStorage.removeItem('lastFetched');
|
|
|
// ignore errors
|
|
// ignore errors
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
clearDraft(path) {
|
|
clearDraft(path) {
|
|
|
- this.draft[path] = null;
|
|
|
|
|
|
|
+ delete this.draft[path];
|
|
|
this.localStorage.draft = JSON.stringify(this.draft);
|
|
this.localStorage.draft = JSON.stringify(this.draft);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -118,11 +115,11 @@ export default class Crowi {
|
|
|
resolve(res.data);
|
|
resolve(res.data);
|
|
|
} else {
|
|
} else {
|
|
|
// FIXME?
|
|
// FIXME?
|
|
|
- throw new Error(res.data);
|
|
|
|
|
|
|
+ reject(new Error(res.data));
|
|
|
}
|
|
}
|
|
|
}).catch(res => {
|
|
}).catch(res => {
|
|
|
// FIXME?
|
|
// FIXME?
|
|
|
- throw new Error(res);
|
|
|
|
|
|
|
+ reject(new Error('Error'));
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|