diff --git a/src/options.js b/src/options.js
index f22b9c4..7544be2 100644
--- a/src/options.js
+++ b/src/options.js
@@ -1,6 +1,6 @@
// noinspection JSUnresolvedReference
-const str_keys = ["instance_url", "preset", "template", "folder", "username", "password"]
+const str_keys = ["instance_url", "preset", "username", "password"]
let storedOriginPattern = null;
if (typeof chrome === 'undefined') {
@@ -38,7 +38,7 @@ const ensureOriginPermission = async (originPattern) => {
return true;
}
- return await chrome.permissions.request({origins: [originPattern]});
+ return await chrome.permissions.request({ origins: [originPattern] });
};
const removeOriginPermission = async (originPattern) => {
@@ -46,16 +46,15 @@ const removeOriginPermission = async (originPattern) => {
return;
}
- const hasPermission = await chrome.permissions.contains({origins: [originPattern]});
+ const hasPermission = await chrome.permissions.contains({ origins: [originPattern] });
if (!hasPermission) {
return;
}
- await chrome.permissions.remove({origins: [originPattern]});
+ await chrome.permissions.remove({ origins: [originPattern] });
};
const testConfig = async () => {
-
document.querySelector('#error_msg').innerText = "";
let instance_url = document.querySelector("#instance_url").value.trim();
@@ -133,7 +132,7 @@ document.getElementById("ytptube_options").addEventListener("submit", async e =>
let showContextMenu = document.querySelector("#showContextMenu").checked;
- let data = {presets: {presets: ['default'], last_updated: 0}}
+ let data = { presets: { presets: ['default'], last_updated: 0 } }
str_keys.forEach(key => data[key] = document.querySelector(`#${key}`).value)
data["showContextMenu"] = showContextMenu;
@@ -147,7 +146,7 @@ document.getElementById("ytptube_options").addEventListener("submit", async e =>
storedOriginPattern = newOriginPattern;
chrome.storage.sync.set(data);
- chrome.contextMenus.update("send-to-ytptube", {visible: showContextMenu});
+ chrome.contextMenus.update("send-to-ytptube", { visible: showContextMenu });
notify("Options saved.", true);
diff --git a/src/popup.js b/src/popup.js
index 4fe41ea..1f5c79f 100644
--- a/src/popup.js
+++ b/src/popup.js
@@ -20,7 +20,7 @@ const notify = message => chrome.notifications.create({
const showLoading = (isLoading) => {
const submitBtn = $('#submit-btn')
-
+
if (isLoading) {
submitBtn.disabled = true
submitBtn.classList.add('is-loading')
@@ -35,7 +35,7 @@ const showStatusMessage = (message, isSuccess = true) => {
statusDiv.textContent = message
statusDiv.className = `notification ${isSuccess ? 'is-success' : 'is-danger'}`
statusDiv.classList.remove('is-hidden')
-
+
// Hide the message after 3 seconds
setTimeout(() => {
statusDiv.classList.add('is-hidden')
@@ -52,10 +52,10 @@ $("#ytptube_popup").addEventListener("submit", async (e) => {
}
showLoading(true)
-
+
try {
- const response = await chrome.runtime.sendMessage({command: 'send-to-ytptube', url: url, preset: preset})
-
+ const response = await chrome.runtime.sendMessage({ command: 'send-to-ytptube', url: url, preset: preset })
+
if (response && response.success) {
showStatusMessage('Request sent successfully!', true)
} else {
@@ -69,7 +69,7 @@ $("#ytptube_popup").addEventListener("submit", async (e) => {
}
})
-const getCurrentUrl = async () => (await chrome.tabs.query({currentWindow: true, active: true}))[0].url
+const getCurrentUrl = async () => (await chrome.tabs.query({ currentWindow: true, active: true }))[0].url
addEventListener('DOMContentLoaded', async _ => {
let url = await getCurrentUrl()
@@ -90,7 +90,7 @@ addEventListener('DOMContentLoaded', async _ => {
if (Date.now() - cache.last_updated > 1000 * 60 * 60) {
cache.presets = await getPresets()
cache.last_updated = Date.now()
- await chrome.storage.sync.set({presets: cache})
+ await chrome.storage.sync.set({ presets: cache })
}
const s = $('#preset')
@@ -120,7 +120,7 @@ $('#go-to-options').addEventListener('click', function () {
}
});
-$('#preset').addEventListener('change', async e => await chrome.storage.sync.set({preset: e.target.value}))
+$('#preset').addEventListener('change', async e => await chrome.storage.sync.set({ preset: e.target.value }))
const getPresets = async () => {
let presets = []
@@ -143,13 +143,18 @@ const getPresets = async () => {
url.pathname = '/api/presets';
url.search = 'filter=name';
- const req = await fetch(url, {method: 'GET', headers: {...headers, 'Accept': 'application/json'}});
+ const req = await fetch(url, { method: 'GET', headers: { ...headers, 'Accept': 'application/json' } });
if (200 !== req.status) {
presets.push('Error fetching presets from YTPTube.');
return presets
}
- (await req.json()).forEach(preset => presets.push(preset.name))
+ const data = await req.json()
+ if (data.items && Array.isArray(data.items)) {
+ data.items.forEach(preset => presets.push(preset.name))
+ } else {
+ data.forEach(preset => presets.push(preset.name))
+ }
return presets
};
\ No newline at end of file