From e5115b430e3ca0a238c9dce0f899ed862a26d91c Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 10 Oct 2014 15:06:04 +0000
Subject: [PATCH] Give widget color dialog unique class in order to identify it
 later for binding click handler to picker span. -Fix the bug, color picker
 opens other colorpickers dialog which are in the same template.

---
 etemplate/js/et2_widget_color.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_widget_color.js b/etemplate/js/et2_widget_color.js
index fdfc9814ae..9f815ff4ba 100644
--- a/etemplate/js/et2_widget_color.js
+++ b/etemplate/js/et2_widget_color.js
@@ -138,13 +138,21 @@ var et2_color = et2_inputWidget.extend(
 				resizable: false,
 				width: "auto"
 			});
-
+			jQuery('table.jPicker').each(function(){
+				if (!this.getAttribute('class').match(/jPickerColorIden/))
+				{
+					//Add an identifier to dialog for later on to bind a click handler to it
+					//as jquery dialog has already an unique id, we make a unique class identifier with help of the widget id
+					jQuery(this).addClass('jPickerColorIden-'+self.id);
+					return false;
+				}
+			});
 			// Hide original move bar
 			jQuery('table.jPicker .Move').hide();
 
 			// Trigger dialog opening
 			jQuery('.Image',self.$node.next()).click(function() {
-				jQuery("table.jPicker").dialog("open");
+				jQuery("table.jPickerColorIden-"+self.id).dialog("open");
 			});
 		},500);
 		return true;