Merge branch 'master' of github.com:standardnotes/web into 004

This commit is contained in:
Mo Bitar
2020-02-08 20:37:09 -06:00
2 changed files with 4 additions and 2 deletions

View File

@@ -102,7 +102,8 @@ function stringIsUuid(text) {
const matches = text.match(
/\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b/
);
return !!matches;
// eslint-disable-next-line no-unneeded-ternary
return matches ? true : false;
}
export function sortNotes({

View File

@@ -193,7 +193,8 @@ class ComponentViewCtrl {
const avoidFlickerTimeout = 7;
this.$timeout(() => {
this.loading = false;
this.issueLoading = !!desktopError;
// eslint-disable-next-line no-unneeded-ternary
this.issueLoading = desktopError ? true : false;
this.onLoad && this.onLoad(this.component);
}, avoidFlickerTimeout);
}