Fix: vars could be undefined

eight04 · Sep 25, 2018 · 29b8f51 · 29b8f51
1 parent a7cfeb2
commit 29b8f51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/edit/codemirror-default.js b/edit/codemirror-default.js
@@ -371,8 +371,11 @@ CodeMirror.hint && (() => {
     }
 
     // USO vars in usercss mode editor
-    const list = Object.keys(editor.getStyle().usercssData.vars)
-      .filter(name => name.startsWith(leftPart));
+    const vars = editor.getStyle().usercssData.vars;
+    const list = vars ?
+      Object.keys(editor.getStyle().usercssData.vars)
+        .filter(name => name.startsWith(leftPart)) :
+      [];
     return {
       list,
       from: {line, ch: prev},

diff --git a/manage/manage.js b/manage/manage.js
@@ -195,7 +195,7 @@ function createStyleElement({style, name}) {
     };
   }
   const parts = createStyleElement.parts;
-  const configurable = style.usercssData && Object.keys(style.usercssData.vars).length > 0;
+  const configurable = style.usercssData && style.usercssData.vars && Object.keys(style.usercssData.vars).length > 0;
   parts.checker.checked = style.enabled;
   parts.nameLink.textContent = tWordBreak(style.name);
   parts.nameLink.href = parts.editLink.href = parts.editHrefBase + style.id;