@@ -287,6 +318,7 @@
-
+
diff --git a/client/js/options.js b/client/js/options.js
index edd3df8b..8bfe5408 100644
--- a/client/js/options.js
+++ b/client/js/options.js
@@ -116,8 +116,6 @@ function applySetting(name, value) {
if (("Notification" in window) && value && Notification.permission !== "granted") {
Notification.requestPermission(updateDesktopNotificationStatus);
}
- } else if (name === "advanced") {
- $("#settings [data-advanced]").toggle(settings[name]);
}
}
@@ -219,6 +217,7 @@ function initialize() {
vueApp.desktopNotificationState = "unsupported";
}
+ /*
$settings.on("change", "input, select, textarea", function(e) {
// We only want to trigger on human triggered changes.
if (e.originalEvent) {
@@ -238,27 +237,10 @@ function initialize() {
}
}
});
+ */
// Local init is done, let's sync
// We always ask for synced settings even if it is disabled.
// Settings can be mandatory to sync and it is used to determine sync base state.
socket.emit("setting:get");
-
- // Protocol handler
- const defaultClientButton = $("#make-default-client");
-
- if (window.navigator.registerProtocolHandler) {
- defaultClientButton.on("click", function() {
- const uri = document.location.origin + document.location.pathname + "?uri=%s";
-
- window.navigator.registerProtocolHandler("irc", uri, "The Lounge");
- window.navigator.registerProtocolHandler("ircs", uri, "The Lounge");
-
- return false;
- });
-
- $("#native-app").prop("hidden", false);
- } else {
- defaultClientButton.hide();
- }
}
diff --git a/client/js/socket-events/change_password.js b/client/js/socket-events/change_password.js
deleted file mode 100644
index 09bb144e..00000000
--- a/client/js/socket-events/change_password.js
+++ /dev/null
@@ -1,31 +0,0 @@
-"use strict";
-
-const $ = require("jquery");
-const socket = require("../socket");
-
-socket.on("change-password", function(data) {
- const passwordForm = $("#change-password");
-
- if (data.error || data.success) {
- const message = data.success ? data.success : data.error;
- const feedback = passwordForm.find(".feedback");
-
- if (data.success) {
- feedback.addClass("success").removeClass("error");
- } else {
- feedback.addClass("error").removeClass("success");
- }
-
- feedback.text(message).show();
- feedback.closest("form").one("submit", function() {
- feedback.hide();
- });
- }
-
- passwordForm
- .find("input")
- .val("")
- .end()
- .find(".btn")
- .prop("disabled", false);
-});
diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.js
index 8fef5fcc..5fba3be6 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.js
@@ -39,12 +39,6 @@ socket.on("configuration", function(data) {
socket.emit("sessions:get");
});
- $("#play").on("click", () => {
- const pop = new Audio();
- pop.src = "audio/pop.wav";
- pop.play();
- });
-
if (data.fileUpload) {
upload.initialize(data.fileUploadMaxFileSize);
}
@@ -62,6 +56,7 @@ socket.on("configuration", function(data) {
document.querySelector('meta[name="theme-color"]').content = currentTheme.themeColor;
}
+ /*
function handleFormSubmit() {
const form = $(this);
const event = form.data("event");
@@ -79,10 +74,9 @@ socket.on("configuration", function(data) {
return false;
}
+ */
- $("#change-password form").on("submit", handleFormSubmit);
- connect.on("submit", "form", handleFormSubmit);
-
+ // TODO: move to component (this mirrors the nick to the username field if the username is empty)
connect.on("show", function() {
connect
.html(templates.windows.connect(data))
diff --git a/src/server.js b/src/server.js
index bf7191ea..6e49bc1a 100644
--- a/src/server.js
+++ b/src/server.js
@@ -423,16 +423,9 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
const p1 = data.new_password;
const p2 = data.verify_password;
- if (typeof p1 === "undefined" || p1 === "") {
+ if (typeof p1 === "undefined" || p1 === "" || p1 !== p2) {
socket.emit("change-password", {
- error: "Please enter a new password",
- });
- return;
- }
-
- if (p1 !== p2) {
- socket.emit("change-password", {
- error: "Both new password fields must match",
+ error: "",
});
return;
}
@@ -442,8 +435,7 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
.then((matching) => {
if (!matching) {
socket.emit("change-password", {
- error:
- "The current password field does not match your account password",
+ error: "password_incorrect",
});
return;
}
@@ -454,9 +446,9 @@ function initializeClient(socket, client, token, lastMessage, openChannel) {
const obj = {};
if (success) {
- obj.success = "Successfully updated your password";
+ obj.success = true;
} else {
- obj.error = "Failed to update your password";
+ obj.error = "update_failed";
}
socket.emit("change-password", obj);