From 82bf0f7c7222fae092776a715ab65471238e460b Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 4 May 2009 07:51:29 +0000
Subject: [PATCH] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EB=8D=94=EB=B8=94=ED=81=B4=EB=A6=AD?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=83=9D?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6271 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../editor/skins/xpresseditor/js/Xpress_Editor.js | 15 ++++++++-------
 modules/editor/tpl/popup.html                     |  2 ++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
index 3955c63a2..e1d503853 100644
--- a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
+++ b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
@@ -5459,6 +5459,10 @@ xe.XE_XHTMLFormatter = $.Class({
 	
 	TO_IR : function(sContent) {
 		var stack = [];
+
+        // remove xeHandled attrs
+        sContent = sContent.replace(/xeHandled="YES"/ig,'');
+
 		
 		// remove all useless styles
 		sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
@@ -5665,25 +5669,22 @@ xe.XE_Extension = jQuery.Class({
 		
 		var doc = this.oApp.getWYSIWYGDocument();
 		var seq = this.seq;
-        var prevComponent = null;
 		var fn  = function(){
 			var obj  = jQuery(this);
 			var comp = obj.attr('editor_component');
-            if(prevComponent == comp) return false;
-            prevComponent = comp;
-			
 			if (comp && jQuery.isFunction(openComponent)) {
 				editorPrevNode = obj.get(0);
 				openComponent(comp, seq);
 			}
-
-            setTimeout(500, function() { prevComponent = null; });
 		};
 		
 		jQuery('img,div[editor_component]', doc).each(function(){
 			var obj = jQuery(this);
             if(this.nodeName == 'IMG' && !obj.attr('editor_component')) obj.attr('editor_component','image_link')
-            obj.dblclick(fn);
+            if(!obj.attr('xeHandled')) {
+                obj.attr('xeHandled','YES');
+                obj.dblclick(fn);
+            }
 		});
 	},
 	
diff --git a/modules/editor/tpl/popup.html b/modules/editor/tpl/popup.html
index 0354d1709..3d7796a1e 100644
--- a/modules/editor/tpl/popup.html
+++ b/modules/editor/tpl/popup.html
@@ -1 +1,3 @@
+<div style="width:600px;">
 {$popup_content}
+</div>