aboutsummaryrefslogtreecommitdiffhomepage
path: root/main
diff options
context:
space:
mode:
authorMarvin Borner2018-05-19 20:20:27 +0200
committerMarvin Borner2018-05-19 20:20:27 +0200
commit2cc863c595c9077a7fddfd2613580669a43c8f8a (patch)
tree76bdc4f3177eb9deb408d33d9ff35da19bd07393 /main
parent083c3778b81f22fb4982f6d5b09b1524340efd6a (diff)
Little beautifying.
Diffstat (limited to 'main')
-rw-r--r--main/app/sprinkles/core/assets/SiteAssets/js/chat.js36
1 files changed, 18 insertions, 18 deletions
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
index 115d5fa..5df6b46 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
@@ -86,7 +86,7 @@ function InitializeChatServer() {
});
}
- if (ServerMessage === false) { // NO SERVER MESSAGE -> SENT BY USER
+ if (!ServerMessage) { // NO SERVER MESSAGE -> SENT BY USER
// DECRYPT MESSAGE
options = {
message: openpgp.message.readArmored("-----BEGIN PGP MESSAGE-----\r\nVersion: OpenPGP.js v3.0.9\r\nComment: https://openpgpjs.org\r\n\r\n" + Message + "\r\n\-----END PGP MESSAGE-----\r\n"),
@@ -96,9 +96,9 @@ function InitializeChatServer() {
openpgp.decrypt(options).then(function (plaintext) {
plaintext ? console.log("%c[ENCRYPTION LOGGER] Decrypting succeeded!", "font-family: monospace; white-space: pre; display: inline-block; border-radius: 10px; padding: 2px; color: #20c20e; background-color: black;") : console.log("%c[ENCRYPTION LOGGER] Decrypting failed!", "font-family: monospace; white-space: pre; display: inline-block; border-radius: 10px; padding: 2px; color: red; background-color: black;");
DecryptedMessage = plaintext.data;
- if (WasHimself === true) { // -> MESSAGE WAS FROM HIMSELF -> Don't write to chat, as its done directly (on enter function at the bottom, for performance)
+ if (WasHimself) { // -> MESSAGE WAS FROM HIMSELF -> Don't write to chat, as its done directly (on enter function at the bottom, for performance)
console.log("%c[CHATSOCKET LOGGER] Message sending succeeded!", "color: darkorange");
- } else if (WasHimself === false) { // -> MESSAGE WAS FROM OTHER USER
+ } else if (!WasHimself) { // -> MESSAGE WAS FROM OTHER USER
console.log("%c[CHATSOCKET LOGGER] You received a message!", "color: darkorange");
NotifySound.play();
Push.create(Fullname, { // CREATE NOTIFICATION
@@ -129,14 +129,14 @@ function InitializeChatServer() {
$('.ChatMessage').linkify({
target: "_blank"
});
- } else if (ServerMessage === true) { // SERVER MESSAGE
+ } else if (ServerMessage) { // SERVER MESSAGE
if (ServerMessageType === "GroupJoin") { // TYPE: USER JOINED A GROUP
- if (WasHimself === true) { // HIMSELF JOINED A GROUP -> NOTIFY
+ if (WasHimself) { // HIMSELF JOINED A GROUP -> NOTIFY
ChatMessages.empty(); // -> EMPTY MESSAGES ON NEW GROUP JOIN
ChatMessages.append("<br><div class='MessageWrapper'><div class='ServerChatMessage'>" + GroupName + "</span></div></div><br>");
ReplaceServerMessage("YouGroupJoin"); // FOR TRANSLATION
console.log("%c[CHATSOCKET LOGGER] You joined the group " + GroupName + "!", "color: darkorange");
- } else if (WasHimself === false) { // OTHER USER JOINED A GROUP -> NOTIFY
+ } else if (!WasHimself) { // OTHER USER JOINED A GROUP -> NOTIFY
ChatMessages.append("<br><div class='MessageWrapper'><div class='ServerChatMessage'>" + Username + "</span></div></div><br>");
ReplaceServerMessage("UserGroupJoin"); // FOR TRANSLATION
console.log("%c[CHATSOCKET LOGGER] " + Username + " joined the group!", "color: darkorange");
@@ -146,33 +146,33 @@ function InitializeChatServer() {
ReplaceServerMessage("UserDisconnect"); // FOR TRANSLATION
console.log("%c[CHATSOCKET LOGGER] " + Username + " disconnected from server!", "color: darkorange");
} else if (ServerMessageType === "TypingState") { // TYPE: SOMEBODY'S TYPING STATE CHANGED!
- if (State === true) { // IF 'SOMEBODY' STARTED TYPING
- if (WasHimself === true) { // IDENTIFY 'SOMEBODY' -> WAS HIMSELF -> NOT THAT IMPORTANT (USER KNOWS WHEN HE STARTS TYPING?)
+ if (State) { // IF 'SOMEBODY' STARTED TYPING
+ if (WasHimself) { // IDENTIFY 'SOMEBODY' -> WAS HIMSELF -> NOT THAT IMPORTANT (USER KNOWS WHEN HE STARTS TYPING?)
console.log("%c[CHAT TYPING LOGGER] You started typing!", "color: grey");
- } else if (WasHimself === false) { // IDENTIFY 'SOMEBODY' -> WAS OTHER USER -> SHOW TYPING ANIMATION ON RECEIVER'S SIDE
+ } else if (!WasHimself) { // IDENTIFY 'SOMEBODY' -> WAS OTHER USER -> SHOW TYPING ANIMATION ON RECEIVER'S SIDE
ChatMessages.append("<div class='MessageWrapper'><div class='ChatMessage TypingIndicatorMessage AloneMessage'>" + TypingIndicatorAnimationElement + "</div></div>");
console.log("%c[CHAT TYPING LOGGER] " + Username + " started typing!", "color: grey");
}
- } else if (State === false) { // IF 'SOMEBODY' STOPPED TYPING
- if (WasHimself === true) { // IDENTIFY 'SOMEBODY' -> WAS HIMSELF -> NOT THAT IMPORTANT (USER KNOWS WHEN HE STOPS TYPING?)
+ } else if (!State) { // IF 'SOMEBODY' STOPPED TYPING
+ if (WasHimself) { // IDENTIFY 'SOMEBODY' -> WAS HIMSELF -> NOT THAT IMPORTANT (USER KNOWS WHEN HE STOPS TYPING?)
console.log("%c[CHAT TYPING LOGGER] You stopped typing!", "color: grey");
- } else if (WasHimself === false) { // IDENTIFY 'SOMEBODY' -> WAS OTHER USER -> REMOVE TYPING ANIMATION
+ } else if (!WasHimself) { // IDENTIFY 'SOMEBODY' -> WAS OTHER USER -> REMOVE TYPING ANIMATION
//TypingIndicatorMessage.fadeOut("fast");
TypingIndicatorMessage.remove();
console.log("%c[CHAT TYPING LOGGER] " + Username + " stopped typing!", "color: grey");
}
}
} else if (ServerMessageType === "Verify") { // TYPE: SERVER CHECKED ACCESS -- MOSTLY HANDLED IN BACKEND
- if (Granted === true) {
+ if (Granted) {
console.log("%c[CHATSOCKET LOGGER] Chat access granted!", "color: green");
- } else if (Granted === false) {
+ } else if (!Granted) {
console.log("%c[CHATSOCKET LOGGER] Chat access denied!", "color: red");
}
} else if (ServerMessageType === "SetReceiver") { // TYPE: SERVER CHECKED ACCESS -- MOSTLY HANDLED IN BACKEND
- if (Success === true) {
+ if (Success) {
console.log("%c[CHATSOCKET LOGGER] Setting receiver succeeded!", "color: green");
$(".SelectedReceiver").show();
- } else if (Success === false) {
+ } else if (!Success) {
console.log("%c[CHATSOCKET LOGGER] Setting receiver failed!", "color: red");
}
}
@@ -201,14 +201,14 @@ function InitializeChatServer() {
});
function sendStartTyping() {
- if (isTyping === false) {
+ if (!isTyping) {
sendTypingState(true);
isTyping = true;
}
}
function sendStopTyping() {
- if (isTyping === true) {
+ if (isTyping) {
sendTypingState(false);
isTyping = false;
}