From e530aa057045ed42fabbf48667949707efc7e901 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 27 Aug 2014 18:26:57 +0200
Subject: [PATCH] Fixed clicks on smilies triggering inserts on all active
 instances

---
 com.woltlab.wcf/templates/messageFormTabs.tpl   |  2 +-
 .../templates/messageFormTabsInline.tpl         |  2 +-
 wcfsetup/install/files/js/WCF.Message.js        | 17 +++++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/com.woltlab.wcf/templates/messageFormTabs.tpl b/com.woltlab.wcf/templates/messageFormTabs.tpl
index c77c8ff767..13e6964cbc 100644
--- a/com.woltlab.wcf/templates/messageFormTabs.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabs.tpl
@@ -1,4 +1,4 @@
-<div class="messageTabMenu" data-preselect="{if $preselectTabMenu|isset}{$preselectTabMenu}{else}true{/if}">
+<div class="messageTabMenu" data-preselect="{if $preselectTabMenu|isset}{$preselectTabMenu}{else}true{/if}" data-wysiwyg-container-id="{$wysiwygContainerID}">
 	<nav class="messageTabMenuNavigation jsOnly">
 		<ul>
 			{if MODULE_SMILEY && $__wcf->getSession()->getPermission($permissionCanUseSmilies) && $smileyCategories|count}<li data-name="smilies"><a>{lang}wcf.message.smilies{/lang}</a></li>{/if}
diff --git a/com.woltlab.wcf/templates/messageFormTabsInline.tpl b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
index 0b25d9ef30..2e6e365247 100644
--- a/com.woltlab.wcf/templates/messageFormTabsInline.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabsInline.tpl
@@ -5,7 +5,7 @@
 {capture assign='__messageFormSettingsInlineContent'}{include file='messageFormSettingsInline'}{/capture}
 {assign var='__messageFormSettingsInlineContent' value=$__messageFormSettingsInlineContent|trim}
 
-<div class="messageTabMenu"{if $preselectTabMenu|isset} data-preselect="{$preselectTabMenu}"{/if}>
+<div class="messageTabMenu"{if $preselectTabMenu|isset} data-preselect="{$preselectTabMenu}"{/if} data-wysiwyg-container-id="{$wysiwygContainerID}">
 	<nav class="messageTabMenuNavigation jsOnly">
 		<ul>
 			{if MODULE_SMILEY && $__wcf->getSession()->getPermission($permissionCanUseSmilies) && $smileyCategories|count}<li data-name="smilies"><a>{lang}wcf.message.smilies{/lang}</a></li>{/if}
diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index cf930528bd..e109d281e6 100644
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -622,14 +622,6 @@ WCF.Message.SmileyCategories = Class.extend({
 		this._wysiwygSelector = wysiwygSelector;
 		
 		$('#smilies-' + this._wysiwygSelector).on('messagetabmenushow', $.proxy(this._click, this));
-		
-		// handle onload
-		/*var self = this;
-		new WCF.PeriodicalExecuter(function(pe) {
-			pe.stop();
-			
-			self._click({ }, { newTab: $('#smilies > .menu li.ui-state-active') });
-		}, 100);*/
 	},
 	
 	/**
@@ -682,6 +674,8 @@ WCF.Message.SmileyCategories = Class.extend({
 
 /**
  * Handles smiley clicks.
+ * 
+ * @param	string		wysiwygSelector
  */
 WCF.Message.Smilies = Class.extend({
 	/**
@@ -690,6 +684,10 @@ WCF.Message.Smilies = Class.extend({
 	 */
 	_redactor: null,
 	
+	/**
+	 * wysiwyg container id
+	 * @var	string
+	 */
 	_wysiwygSelector: '',
 	
 	/**
@@ -703,8 +701,7 @@ WCF.Message.Smilies = Class.extend({
 		WCF.System.Dependency.Manager.register('Redactor_' + this._wysiwygSelector, $.proxy(function() {
 			this._redactor = $('#' + this._wysiwygSelector).redactor('getObject');
 			
-			// add smiley click handler
-			$(document).on('click', '.jsSmiley', $.proxy(this._smileyClick, this));
+			$('.messageTabMenu[data-wysiwyg-container-id=' + this._wysiwygSelector + ']').on('click', '.jsSmiley', $.proxy(this._smileyClick, this));
 		}, this));
 	},
 	
-- 
2.20.1