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 1/3] 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'}

From eec725e687c06963cabaa57b24c3ac7c3de0e55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
Date: Wed, 25 Feb 2015 22:33:33 +0100
Subject: [PATCH 2/3] Bump version number

---
 package.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.xml b/package.xml
index 248f7d8..26980db 100644
--- a/package.xml
+++ b/package.xml
@@ -6,8 +6,8 @@
 		<packagedescription><![CDATA[Tim’s Chat is a capable chat software for your community. It convices by a seamless integration into your community, advanced permissions, it is feature rich and easily customized via the templates!]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Tims Chat ist ein leistungsfähiges Chatsystem für Ihre Community. Er überzeugt durch eine nahtlose Integration in das Design Ihrer Community, ein umfangreiches Rechtesystem, Funktionsreichtum und ist über die Templates kinderleicht zu verändern!]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>3.0.2</version><!-- Codename: Codenames are overrated -->
-		<date>2014-10-18</date>
+		<version>3.0.3</version><!-- Codename: Codenames are overrated -->
+		<date>2015-02-25</date>
 		<license><![CDATA[Creative Commons Attribution-NonCommercial-ShareAlike <https://github.com/wbbaddons/Tims-Chat/blob/master/LICENSE>]]></license>
 	</packageinformation>
 	
@@ -40,15 +40,24 @@
 		<instruction type="script" run="standalone">acp/be.bastelstu.chat.install.php</instruction>
 	</instructions>
 	
+	<instructions type="update" fromversion="3.0.2">
+		<instruction type="language">language/*.xml</instruction>
+		<instruction type="file">file.tar</instruction>
+		<instruction type="template">template.tar</instruction>
+		<instruction type="script" run="standalone">acp/be.bastelstu.chat.update.php</instruction>
+	</instructions>
+	
 	<instructions type="update" fromversion="3.0.1">
 		<instruction type="language">language/*.xml</instruction>
 		<instruction type="file">file.tar</instruction>
+		<instruction type="template">template.tar</instruction>
 		<instruction type="script" run="standalone">acp/be.bastelstu.chat.update.php</instruction>
 	</instructions>
 	
 	<instructions type="update" fromversion="3.0.0">
 		<instruction type="language">language/*.xml</instruction>
 		<instruction type="file">file.tar</instruction>
+		<instruction type="template">template.tar</instruction>
 		<instruction type="script" run="standalone">acp/be.bastelstu.chat.update.php</instruction>
 	</instructions>
 </package>

From 689177a8bb9dbea321fbbb87942fda7781986ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
Date: Wed, 1 Apr 2015 23:10:23 +0200
Subject: [PATCH 3/3] Fix WCF 2.1 compatibility of RoomEditor::deleteAll()

---
 file/lib/data/room/RoomEditor.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/file/lib/data/room/RoomEditor.class.php b/file/lib/data/room/RoomEditor.class.php
index b85701a..9eb996c 100644
--- a/file/lib/data/room/RoomEditor.class.php
+++ b/file/lib/data/room/RoomEditor.class.php
@@ -47,7 +47,9 @@ public static function deleteAll(array $objectIDs = array()) {
 		
 		foreach ($objectIDs as $objectID) {
 			$select->execute(array($objectID));
-			$update->execute(array($select->fetchColumn()));
+			$showOrder = $select->fetchColumn();
+			$select->closeCursor();
+			$update->execute(array($showOrder));
 		}
 		
 		$return = parent::deleteAll($objectIDs);