数種の変更・改善

* Instanceにtokenプロパティ追加
* changeVisibilitiesメソッド追加
* blur時のインスタンスチェッカー実装

Author: GenbuHase

views/lib/Instance.js

@@ -48,11 +48,12 @@ class Instance {
 	constructor (url) {
 		if (!url) throw new URIError("An argument, 'url' is required.");
 
-		//Throws error if provided url isn't absolutely
+		//Throws error if provided url isn't absolutely one
 		new URL(url);
 
 		this.url = url;
 		Instance.detectType(url).then(type => this.type = type);
+		chrome.storage.local.get("token", items => Object.assign(this, items));
 	}
 
 	/**
@@ -68,7 +69,7 @@ class Instance {
 
 			case "init":
 				const detector = setInterval(() => {
-					if ([this.type].every(prop => prop)) {
+					if ([this.type, this.token].every(prop => prop !== undefined)) {
 						clearInterval(detector);
 						callback(this);
 					}

views/settings/settings.js

@@ -1,7 +1,7 @@
+const enabledSwitch = document.getElementById("enabled");
 const instanceInputter = document.getElementById("instance");
 const tokenInputter = document.getElementById("token");
 const visibilitySelector = document.getElementById("visibility");
-const enabledSwitch = document.getElementById("enabled");
 const saveBtn = document.getElementById("btns_save");
 const closeBtn = document.getElementById("btns_close");
 
@@ -16,43 +16,67 @@ const throwError = errorKey => {
 	throw definedMessages[errorKey].message;
 };
 
+/**
+ * Changes a collection of visibilities by provided instance's type
+ * @param {String} type
+ */
+const changeVisibilities = type => {
+	if (Instance.Type[type]) {
+		while (visibilitySelector.options.length > 0) visibilitySelector.options.remove(0);
+
+		for (let name of Instance.Visibility[type]) {
+			const option = new Option(definedMessages[`setting_visibility_${type}_${name}`].message, name);
+			option.setAttribute("Name", `visibility.${name}`);
+			option.setAttribute("Locale-Message", `setting_visibility_${type}_${name}`);
+
+			visibilitySelector.add(option);
+		}
+
+		chrome.storage.local.get("visibility", items => {
+			const { visibility } = items;
+			
+			if (visibility && Instance.Visibility[type].includes(visibility)) visibilitySelector.namedItem(`visibility.${visibility}`).selected = true;
+			M.FormSelect.init(visibilitySelector);
+		});
+	}
+};
+
 
 
 window.addEventListener("DOMContentLoaded", () => {
 	document.querySelectorAll("Select").forEach(select => M.FormSelect.init(select));
-});
 
-window.addEventListener("DOMContentLoaded", () => {
-	chrome.storage.local.get(["enabled", "type", "instance", "token", "visibility"], items => {
-		const { enabled, type, instance, token, visibility } = items;
+	chrome.storage.local.get(["enabled", "type", "instance", "token"], items => {
+		const { enabled, type, instance, token } = items;
 
 		if (enabled) enabledSwitch.checked = enabled;
 		if (instance) instanceInputter.value = instance;
 		if (token) tokenInputter.value = token;
 
-		if (type && type !== Instance.Type.None) {
-			for (let visibility of Instance.Visibility[type]) {
-				const option = new Option(definedMessages[`setting_visibility_${type}_${visibility}`].message, visibility);
-				option.setAttribute("Name", `visibility.${visibility}`);
-				option.setAttribute("Locale-Message", `setting_visibility_${type}_${visibility}`);
-
-				visibilitySelector.add(option);
-			}
-		}
-		
-		if (visibility && Instance.Visibility[type].includes(visibility)) visibilitySelector.namedItem(`visibility.${visibility}`).selected = true;
-		
+		changeVisibilities(type);
 		M.updateTextFields();
-		M.FormSelect.init(visibilitySelector);
 	});
+});
 
-	enabledSwitch.addEventListener("change", event => {
-		const enabled = event.target.checked;
+window.addEventListener("DOMContentLoaded", () => {
+	enabledSwitch.addEventListener("change", function () {
+		const enabled = this.checked;
 
 		chrome.storage.local.set({ enabled });
 		chrome.browserAction.setBadgeText({ text: enabled ? "ON" : "OFF" });
 	});
 
+	instanceInputter.addEventListener("blur", function () {
+		const instance = new Instance(this.value);
+
+		instance.on("init", () => {
+			const { type } = instance;
+
+			changeVisibilities(type);
+			M.FormSelect.init(visibilitySelector);
+		});
+	});
+
 	saveBtn.addEventListener("click", () => {
 		const instance = new Instance(instanceInputter.value);