Fix null errors (#528)

This commit is contained in:
Rob Garrison 2018-10-26 08:08:46 -05:00
parent 100e1dc28d
commit 7489dc2e36
2 changed files with 12 additions and 8 deletions

View File

@ -176,11 +176,13 @@ function getStyles(options) {
cachedStyles.list = event.target.result || []; cachedStyles.list = event.target.result || [];
cachedStyles.byId.clear(); cachedStyles.byId.clear();
for (const style of cachedStyles.list) { for (const style of cachedStyles.list) {
if (style) {
cachedStyles.byId.set(style.id, style); cachedStyles.byId.set(style.id, style);
if (!style.name) { if (!style.name) {
style.name = 'ID: ' + style.id; style.name = 'ID: ' + style.id;
} }
} }
}
cachedStyles.mutex.inProgress = false; cachedStyles.mutex.inProgress = false;
for (const {options, resolve} of cachedStyles.mutex.onDone) { for (const {options, resolve} of cachedStyles.mutex.onDone) {

View File

@ -116,11 +116,13 @@ function initGlobalEvents() {
} }
function showStyles(styles = [], matchUrlIds) { function showStyles(styles = [], matchUrlIds) {
const sorted = sorter.sort({ const sorted = styles.length
? sorter.sort({
styles: styles.map(style => ({ styles: styles.map(style => ({
style, style,
name: style.name.toLocaleLowerCase() + '\n' + style.name, name: style.name.toLocaleLowerCase() + '\n' + style.name,
})), }))
: styles,
}); });
let index = 0; let index = 0;
let firstRun = true; let firstRun = true;