merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/editor/tpl/js/editor_common.js

@@ -253,7 +253,7 @@ function editorSearchComponent(evt) {
     // editor_component를 찾지 못했을 경우에 이미지/텍스트/링크의 경우 기본 컴포넌트와 연결
     if(!editor_component) {
         // 이미지일 경우
-        if(obj.nodeName == "IMG") {
+        if(obj.nodeName == "IMG" && !obj.getAttribute("widget")) {
             editor_component = "image_link";
             editorPrevNode = obj;
         }

modules/editor/tpl/js/editor_module_config.js

@@ -9,22 +9,25 @@ function getEditorSkinColorList(skin_name,selected_colorset,type,testid){
 function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
     var selectbox = null;
 	jQuery(function($){
-		selectbox = jQuery("#"+params.testid).next('label').next('select');
+		if(params.testid){
+			selectbox = $("#"+params.testid).next('label').next('select');
+		}else{
+			selectbox = (params.type == 'document') ? $('select[name=sel_editor_colorset]') : $('select[name=sel_comment_editor_colorset]');
+		}
 		selectbox.html('');
-		
+
 		if(params.type == 'document'){
-			$("select[name=sel_editor_colorset]").css('display','none');				
-			$("select[name=sel_editor_colorset]").removeAttr('name');			
+			$("select[name=sel_editor_colorset]").hide()
+				.removeAttr('name');
 			selectbox.attr('name','sel_editor_colorset');			
 		}else{
-			$("select[name=sel_comment_editor_colorset]").css('display','none');				
-			$("select[name=sel_comment_editor_colorset]").removeAttr('name');			
+			$("select[name=sel_comment_editor_colorset]").hide()
+				.removeAttr('name');			
 			selectbox.attr('name','sel_comment_editor_colorset');			
 		}	
 
 		if(ret_obj['error'] == 0 && ret_obj.colorset){	
 			var it = new Array();
-			
 			var items = ret_obj['colorset']['item'];	
 			if(typeof(items[0]) == 'undefined'){
 				it[0] = items;
@@ -35,10 +38,10 @@ function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
 			for(var i=0;i<it.length;i++){
 				selectbox.append($('<option value="'+it[i].name+'" >'+it[i].title+'</option>'));				
 			}
-			selectbox.css('display','');
+			selectbox.show();
 		}else{
-			selectbox.css('display','none');
-			selectbox.innerHTML="";
+			selectbox.hide();
+			selectbox.html('');
 		}
 	});
 }

modules/editor/tpl/js/uploader.js

@@ -71,7 +71,7 @@ function start(cfg) {
 
 		// Button settings
 		button_window_mode : 'transparent',
-		button_placeholder : $span.get(0),
+		button_placeholder_id : $span.attr('id'),
 		button_text : null,
 		button_image_url : request_uri+'common/img/blank.gif',
 		button_width  : width,