Merge branch 'master' of git.raylu.net:pathery

Conflicts:
	db updates.sql

1 files changed, 14 insertions, 4 deletions

diff --git a/pages/chat.php b/pages/chat.php
index c04f7b6..5be6689 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -90,7 +90,12 @@ function getChatDone(data) {
 			chat.message = chat.message.substring(9);

 			isSpoiler = true;

 		}

-

+		

+		if (!isSpoiler) {

+			document.title = chat.displayName+': '+chat.message.substring(0, 20)+' | Pathery Chat';

+		} else {

+			document.title = chat.displayName+': ~Spoiler~ | Pathery Chat';

+		}

 		

 		//console.log("INSIDE BUILD START");

 		p = '';

@@ -140,7 +145,6 @@ function getChatDone(data) {
 			$("#chatContainer").scrollTop($("#chatContainer")[0].scrollHeight);

 			firstGetChat = false;

 		}

-		document.title = lastDisplay+': '+lastMessage.substring(0, 10)+'... Pathery Chat';

 		if (chatIsMuted == 'false') {

 			soundManager.setVolume('charm', 20);

 			soundManager.setPan('charm', -60)

@@ -244,8 +248,14 @@ function setChatMute() {
 	var value = chatIsMuted;

 	

 	$('#chatMute').removeClass("chatMute_"+value);

-	if (value == 'true')	value = 'false';

-	else value = 'true';

+	if (value == 'true')	{

+		value = 'false';

+		soundManager.setVolume('pit', 20);

+		soundManager.setPan('pit', -60)

+		soundManager.play('pit');

+	} else { 

+		value = 'true';

+	}

 	chatIsMuted = value;

 	$('#chatMute').addClass("chatMute_"+value);

 	savePref('chatMute', value);