From 2d175cc3fb75a6601514ecd01241e24e1e1dd708 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Fri, 11 Sep 2015 14:32:44 -0400
Subject: [PATCH] closes #3466

---
 public/src/admin/manage/tags.js | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.js
index 95133f9836..d85df5c266 100644
--- a/public/src/admin/manage/tags.js
+++ b/public/src/admin/manage/tags.js
@@ -10,7 +10,6 @@ define('admin/manage/tags', [
 		timeoutId = 0;
 
 	Tags.init = function() {
-		handleColorPickers();
 		selectable.enable('.tag-management', '.tag-row');
 
 		handleSearch();
@@ -53,7 +52,7 @@ define('admin/manage/tags', [
 			var firstTag = $(tagsToModify[0]),
 				title = tagsToModify.length > 1 ? 'Editing multiple tags' : 'Editing ' + firstTag.find('.tag-item').text() + ' tag';
 
-			bootbox.dialog({
+			var modal = bootbox.dialog({
 				title:  title,
 				message: firstTag.find('.tag-modal').html(),
 				buttons: {
@@ -79,9 +78,7 @@ define('admin/manage/tags', [
 				}
 			});
 
-			setTimeout(function() {
-				handleColorPickers();
-			}, 500);
+			handleColorPickers(modal);
 		});
 	}
 
@@ -110,21 +107,13 @@ define('admin/manage/tags', [
 		});
 	}
 
-	function handleColorPickers() {
+	function handleColorPickers(modal) {
 		function enableColorPicker(idx, inputEl) {
-			var $inputEl = $(inputEl),
-				previewEl = $inputEl.parents('.tag-row').find('.tag-item');
-
-			colorpicker.enable($inputEl, function(hsb, hex) {
-				if ($inputEl.attr('data-name') === 'bgColor') {
-					previewEl.css('background-color', '#' + hex);
-				} else if ($inputEl.attr('data-name') === 'color') {
-					previewEl.css('color', '#' + hex);
-				}
-			});
+			var $inputEl = $(inputEl);
+			colorpicker.enable($inputEl);
 		}
 
-		$('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker);
+		modal.find('[data-name="bgColor"], [data-name="color"]').each(enableColorPicker);
 	}
 
 	function save(tag) {