From 3580ebfd5cdee1d4fb00de66fb0df1b1a0da7376 Mon Sep 17 00:00:00 2001
From: Maximilian Mader <maximilian.mader@gmx.de>
Date: Fri, 12 Jul 2013 20:52:54 +0200
Subject: [PATCH] Simplify code a bit

---
 file/js/be.bastelstu.Chat.litcoffee   | 42 +++++++++------------------
 file/style/be.bastelstu.wcf.chat.less | 40 ++++++++++++++++++-------
 template/chat.tpl                     |  9 +++++-
 3 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee
index 06a9399..3ab3f6d 100644
--- a/file/js/be.bastelstu.Chat.litcoffee
+++ b/file/js/be.bastelstu.Chat.litcoffee
@@ -710,12 +710,12 @@ Joins a room.
 					showError WCF.Language.get 'chat.error.join'
 
 Open private channel
-	
+
 		openPrivateChannel = (userID) ->
 			userID = parseInt userID
 			
 			console.log "Opening private channel #{userID}"
-
+			
 			unless $.wcfIsset "timsChatMessageContainer#{userID}"
 				return unless userList.allTime[userID]?
 				
@@ -726,42 +726,28 @@ Open private channel
 				div.addClass 'container'
 				div.wrapInner '<ul>'
 				$('#timsChatMessageContainer0').after div
-
-			channels = $ '#privateChannelsMenu li'
-			channels.removeClass 'active'
-			channels.each (key, channel) ->
-				channel = $ channel;
-				privateChannelID = channel.data 'privateChannelID'
-
-				if privateChannelID isnt 0
-					channel.find('.userAvatar > *').replaceWith userList.allTime[privateChannelID].avatar[16]
-				else
-					channel.find('.icon').removeClass('icon32').addClass 'icon16'
-
+			
+			$('.privateChannel').removeClass 'active'
 			if userID isnt 0
-				if $.wcfIsset "privateChannel#{userID}"
-					$("#privateChannel#{userID} > .userAvatar > img").replaceWith userList.allTime[userID].avatar[32]
-				else
+				unless $.wcfIsset "privateChannel#{userID}"
 					li = $ '<li>'
 					li.attr 'id', "privateChannel#{userID}"
 					li.data 'privateChannelID', userID
 					li.addClass 'privateChannel'
-					li.addClass 'active'
-					li.append userList.allTime[userID].avatar[32]
-
+					
 					span = $ '<span class="userAvatar framed" />'
 					span.addClass 'jsTooltip'
 					span.attr 'title', userList.allTime[userID].username
 					
-					li.wrapInner span
+					li.append $(userList.allTime[userID].avatar[16]).wrap(span).parent().addClass 'small'
+					li.append $(userList.allTime[userID].avatar[32]).wrap(span).parent().addClass 'large'
+					
 					$('#privateChannelsMenu ul').append li
-
+					
 					do WCF.DOMNodeInsertedHandler.execute
-
+					
 				$('#privateChannelsMenu').addClass 'shown'
-			else
-				$("#privateChannel0 > .userAvatar > .icon").removeClass('icon16').addClass 'icon32'
-			
+				
 			$('.timsChatMessageContainer').removeClass 'active'
 			$("#timsChatMessageContainer#{userID}").addClass 'active'
 			$("#privateChannel#{userID}").addClass 'active'
@@ -773,7 +759,7 @@ Close private channel
 			unless userID is 0
 				do $("#privateChannel#{userID}").remove
 				do $("#timsChatMessageContainer#{userID}").remove
-
+				
 			if $('#privateChannelsMenu li').length <= 1
 				$('#privateChannelsMenu').removeClass 'shown'
 			
@@ -809,7 +795,7 @@ And finally export the public methods and variables.
 			listener:
 				add: addListener
 				remove: removeListener
-		
+				
 		window.be ?= {}
 		be.bastelstu ?= {}
 		window.be.bastelstu.Chat = Chat
diff --git a/file/style/be.bastelstu.wcf.chat.less b/file/style/be.bastelstu.wcf.chat.less
index 68c9462..167d87e 100644
--- a/file/style/be.bastelstu.wcf.chat.less
+++ b/file/style/be.bastelstu.wcf.chat.less
@@ -102,20 +102,40 @@
 					cursor: pointer;
 				}
 
-				> .userAvatar.framed {
-					> .icon {
-						background-color: @wcfContentBackgroundColor;
-						border: 1px solid @wcfContainerBorderColor;
-						padding: 1px;
+				> .userAvatar {
+					&.large {
+						display: none;
+					}
+					
+					&.small {
+						display: block;
+					}
+					
+					&.framed {
+						> .icon {
+							background-color: @wcfContentBackgroundColor;
+							border: 1px solid @wcfContainerBorderColor;
+							padding: 1px;
+						}
 					}
 				}
 
 				&.active {
-					> .userAvatar.framed {
-						> img, > canvas, > .icon {
-							border-right-color: @wcfContentBackgroundColor;
-
-							border-radius: @wcfContainerBorderRadius 0 0 @wcfContainerBorderRadius;
+					> .userAvatar {
+						&.large {
+							display: block;
+						}
+						
+						&.small {
+							display: none;
+						}
+						
+						&.framed {
+							> img, > canvas, > .icon {
+								border-right-color: @wcfContentBackgroundColor;
+								
+								border-radius: @wcfContainerBorderRadius 0 0 @wcfContainerBorderRadius;
+							}
 						}
 					}
 				}
diff --git a/template/chat.tpl b/template/chat.tpl
index 423a9b7..9efa291 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -77,7 +77,14 @@
 	
 	<div id="privateChannelsMenu">
 		<ul>
-			<li id="privateChannel0" class="privateChannel active" data-private-channel-id="0"><span class="userAvatar framed jsTooltip" title="{lang}chat.general.room{/lang}"><span class="icon icon32 icon-comment-alt"></span></span></li>
+			<li id="privateChannel0" class="privateChannel active" data-private-channel-id="0">
+				<span class="userAvatar framed jsTooltip small" title="{lang}chat.general.room{/lang}">
+					<span class="icon icon16 icon-comment-alt"></span>
+				</span>
+				<span class="userAvatar framed jsTooltip large" title="{lang}chat.general.room{/lang}">
+					<span class="icon icon32 icon-comment-alt"></span>
+				</span>
+			</li>
 		</ul>
 	</div>