From 12dd915ea288fd50f2fccec82fed8a5131a729ca Mon Sep 17 00:00:00 2001
From: Maximilian Mader <max@bastelstu.be>
Date: Fri, 9 Jan 2015 20:16:47 +0100
Subject: [PATCH] Backport: Make smiley selection compatible with WCF 2.0 and
 2.1

This backports 0e7d4d9c075b296d24ad158252112d2170a27db8

Conflicts:
	file/js/be.bastelstu.Chat.litcoffee
---
 file/js/be.bastelstu.Chat.litcoffee | 8 ++++----
 template/chat.tpl                   | 8 +++++++-
 template/javascriptInclude.tpl      | 4 +++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee
index b73dbbf..d983f44 100644
--- a/file/js/be.bastelstu.Chat.litcoffee
+++ b/file/js/be.bastelstu.Chat.litcoffee
@@ -156,11 +156,11 @@ Make the user leave the chat when **Tims Chat** is about to be unloaded.
 				
 Insert the appropriate smiley code into the input when a smiley is clicked.
 
-			$('#smilies').on 'click', 'img', -> insertText " #{$(@).attr('alt')} "
+			$('#timsChatSmileyContainer').on 'click', 'img', -> insertText " #{$(@).attr('alt')} "
 
 Copy the first loaded category of smilies so it won't get detached by wcfDialog
 
-			overlaySmileyList = $('<ul class="smileyList">').append $('#smilies .smileyList').clone().children()
+			overlaySmileyList = $('<ul class="smileyList">').append $('#timsChatSmileyContainer .smileyList').clone().children()
 
 Add click event to smilies in the overlay
 
@@ -322,9 +322,9 @@ Mark smilies as disabled when they are disabled.
 
 			$('#timsChatSmilies').click (event) ->
 				if $(@).data 'status'
-					$('#smilies').removeClass 'invisible'
+					$('#timsChatSmileyContainer').removeClass 'invisible'
 				else
-					$('#smilies').addClass 'invisible'
+					$('#timsChatSmileyContainer').addClass 'invisible'
 
 Toggle fullscreen mode.
 
diff --git a/template/chat.tpl b/template/chat.tpl
index ed4f731..c3544c7 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -46,6 +46,10 @@
 						
 						{if MODULE_SMILEY}
 							new WCF.Message.Smilies();
+							
+							if (typeof $.fn.messageTabMenu === 'function') {
+								$('.messageTabMenu > .messageTabMenu').messageTabMenu().show();
+							}
 						{/if}
 						
 						{capture assign='messageTemplate'}{include application='chat' file='message'}{/capture}
@@ -134,7 +138,9 @@
 			</form>
 			
 			{if MODULE_SMILEY && $smileyCategories|count}
-				{include file='messageFormSmilies' wysiwygSelector=''}
+				<div id="timsChatSmileyContainer" class="messageTabMenu marginTop">
+					{include file='messageFormSmilies' wysiwygSelector=''}
+				</div>
 			{/if}
 			
 			<div id="timsChatOptions" class="marginTop">
diff --git a/template/javascriptInclude.tpl b/template/javascriptInclude.tpl
index 1fdc331..7d0555b 100644
--- a/template/javascriptInclude.tpl
+++ b/template/javascriptInclude.tpl
@@ -1,3 +1,5 @@
-{if MODULE_ATTACHMENT && $__wcf->session->getPermission('user.chat.canUploadAttachment')}<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>{/if}
+{if !'LAST_UPDATE_TIME'|defined}
+	{if MODULE_ATTACHMENT && $__wcf->session->getPermission('user.chat.canUploadAttachment')}<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>{/if}
+{/if}
 <script data-relocate="true" src="{$__wcf->getPath('chat')}js/be.bastelstu.Chat{if !ENABLE_DEBUG_MODE}.min{/if}.js?version={PACKAGE_VERSION|rawurlencode}"></script>
 {event name='javascript'}