Merge branch 'master' into master

This commit is contained in:
Mohamed-Ismail Mejri
2022-04-25 13:33:53 +01:00
committed by GitHub
24 changed files with 389 additions and 417 deletions

View File

@@ -56,19 +56,25 @@ export default {
let element = event.target;
let formWrapper = element.closest("form");
let formData = helper.getData(formWrapper);
let inputValue = formData["text-input-value"];
let inputValue = formData["text-input-value"].trim();
let message;
if (formData.type === "youtube-dl") {
formData["extension"] = "";
if (formData["select-value-extension"] !== "defaultext") {
formData["extension"] = formData["select-value-extension"];
}
message = helper.t("Download task started!");
}
if (!helper.isURL(inputValue) && !helper.isMagnetURI(inputValue)) {
helper.error(t("ncdownloader", inputValue + " is Invalid"));
return;
}
if (formData.type === "youtube-dl") {
formData["extension"] = "";
if (formData["select-value-extension"] !== "defaultext") {
formData["extension"] = formData["select-value-extension"];
}
message = helper.t("Download task started!");
helper.pollingYoutube();
helper.setContentTableType("youtube-dl-downloads");
} else {
helper.polling();
helper.setContentTableType("active-downloads");
}
if (message) {
helper.info(message);
}
@@ -90,7 +96,7 @@ export default {
vm.$data.loading = 0;
return;
}
helper.enabledPolling = 0;
helper.disablePolling();
contentTable.getInstance().loading();
let url = formWrapper.getAttribute("action");