Fix breakage up to Firefox 28 with autocomplete

stylish-userstyles · Feb 4, 2014 · b51e30b · b51e30b
1 parent 6159874
commit b51e30b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/content/edit.js b/content/edit.js
@@ -164,9 +164,13 @@ function init2() {
 		wrapLinesE.checked = wrapLines;
 		wrapLinesE.style.display = "";
 	}
-	if (sourceEditorType == "sourceeditor" && autocompleter != null) {
-		sourceEditor.extend(autocompleter);
-		sourceEditor.setupAutoCompletion(null);
+	if (sourceEditorType == "sourceeditor") {
+		// Up to Firefox 28, sometimes "require" will return an object when something is not available instead of throwing.
+		// Rather than trying to detect if autocompleter is available, let's just try to use it.
+		try {
+			sourceEditor.extend(autocompleter);
+			sourceEditor.setupAutoCompletion(null);
+		} catch (ex) { }
 	}
 
 	initStyle();