fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

remove x-functions

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9934 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-12-09 05:33:00 +00:00
parent f54df77554
commit 5331cf74f1
2 changed files with 40 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

45
modules/widget/tpl/js/widget.js
View file

@ -18,13 +18,10 @@ function getStyle(obj) {
// float: 값을 구하는게 IE랑 그외가 다름 // float: 값을 구하는게 IE랑 그외가 다름
function getFloat(obj) { function getFloat(obj) {
var cssFloat = xIE4Up?obj.style.styleFloat:obj.style.cssFloat; return jQuery(obj).css('float');
if(!cssFloat) cssFloat = 'left';
return cssFloat;
} }
function setFloat(obj, fl) { function setFloat(obj, fl) {
if(xIE4Up) obj.style.styleFloat = fl; jQuery(obj).css('float', fl);
else obj.style.cssFloat = fl;
} }
// padding값을 구하는 함수 (없을 경우 0으로 세팅), zbxe의 위젯에서만 사용 // padding값을 구하는 함수 (없을 경우 0으로 세팅), zbxe의 위젯에서만 사용
@ -39,7 +36,7 @@ function getPadding(obj, direct) {
var zonePageObj = null; var zonePageObj = null;
var zoneModuleSrl = 0; var zoneModuleSrl = 0;
function doStartPageModify(zoneID, module_srl) { function doStartPageModify(zoneID, module_srl) {
zonePageObj = xGetElementById(zoneID); zonePageObj = get_by_id(zoneID);
zoneModuleSrl = module_srl; zoneModuleSrl = module_srl;
// 위젯 크기/여백 조절 레이어를 가장 밖으로 뺌 // 위젯 크기/여백 조절 레이어를 가장 밖으로 뺌
@ -100,9 +97,9 @@ function getContentWidgetCode(childObj, widget) {
var cobj = childObj.firstChild; var cobj = childObj.firstChild;
var widgetContent = jQuery('div.widgetContent',childObj); var widgetContent = jQuery('div.widgetContent',childObj);
var body = ''; var body = '', attrs = '', code = '';
var document_srl = 0; var document_srl = 0;
var attrs =''; var toIgnore = 'contenteditable,id,style,src,widget,body,class,widget_width,widget_width_type,xdpx,xdpy,height,document_srl,widget_padding_left,widget_padding_right,widget_padding_top,widget_padding_bottom,hascontent';
if(widgetContent.size() > 0){ if(widgetContent.size() > 0){
document_srl = jQuery(childObj).attr('document_srl'); document_srl = jQuery(childObj).attr('document_srl');
@ -112,6 +109,7 @@ function getContentWidgetCode(childObj, widget) {
body = widgetContent.html(); body = widgetContent.html();
} }
var reIgnore = new RegExp('^('+toIgnore.replace(/,/g, '|')+')$','i');
for(var i=0;i<childObj.attributes.length;i++) { for(var i=0;i<childObj.attributes.length;i++) {
if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue) continue; if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue) continue;
@ -138,10 +136,13 @@ function getContentWidgetCode(childObj, widget) {
if(!value) continue; if(!value) continue;
attrs += name+'="'+escape(value)+'" '; attrs += name+'="'+escape(value)+'" ';
} }
return '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />'; return '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />';
}else{ }else{
return ''; return '';
} }
return code;
} }
// 위젯 박스 코드 구함 // 위젯 박스 코드 구함
@ -207,7 +208,7 @@ function doAddContent(mid) {
function doSyncPageContent() { function doSyncPageContent() {
if(opener && opener.selectedWidget) { if(opener && opener.selectedWidget) {
var fo_obj = xGetElementById("content_fo"); var fo_obj = get_by_id("content_fo");
var sel_obj = opener.selectedWidget; var sel_obj = opener.selectedWidget;
fo_obj.style.value = getStyle(opener.selectedWidget); fo_obj.style.value = getStyle(opener.selectedWidget);
fo_obj.widget_padding_left.value = getPadding(sel_obj, 'left'); fo_obj.widget_padding_left.value = getPadding(sel_obj, 'left');
@ -222,7 +223,7 @@ function doSyncPageContent() {
try { try {
var content = Base64.decode(xInnerHtml(obj)); var content = Base64.decode(xInnerHtml(obj));
content = editorReplacePath(content); content = editorReplacePath(content);
xGetElementById("content_fo").content.value = content; get_by_id("content_fo").content.value = content;
xe.Editors["1"].exec("SET_IR", [content]); xe.Editors["1"].exec("SET_IR", [content]);
} }
catch(e) catch(e)
@ -323,7 +324,7 @@ function doAddWidget(fo) {
// widgetBorder에 height를 widgetOutput와 맞춰줌 // widgetBorder에 height를 widgetOutput와 맞춰줌
function doFitBorderSize() { function doFitBorderSize() {
var obj_list = xGetElementsByClassName('widgetBorder', zonePageObj); var obj_list = jQuery('.widgetBorer', zonePageObj).get();
for(var i=0;i<obj_list.length;i++) { for(var i=0;i<obj_list.length;i++) {
var obj = obj_list[i]; var obj = obj_list[i];
var height = xHeight(obj.parentNode); var height = xHeight(obj.parentNode);
@ -331,7 +332,7 @@ function doFitBorderSize() {
xHeight(obj, height); xHeight(obj, height);
obj.parentNode.style.clear = ''; obj.parentNode.style.clear = '';
} }
var obj_list = xGetElementsByClassName('widgetBoxBorder', zonePageObj); var obj_list = jQuery('.widgetBoxBorder', zonePageObj).get();
for(var i=0;i<obj_list.length;i++) { for(var i=0;i<obj_list.length;i++) {
var obj = obj_list[i]; var obj = obj_list[i];
xHeight(obj, xHeight(obj.parentNode)); xHeight(obj, xHeight(obj.parentNode));
@ -436,7 +437,7 @@ function doAddWidgetCode(widget_code) {
selectedWidget.parentNode.insertBefore(obj, selectedWidget); selectedWidget.parentNode.insertBefore(obj, selectedWidget);
selectedWidget.parentNode.removeChild(selectedWidget); selectedWidget.parentNode.removeChild(selectedWidget);
} else { } else {
xGetElementById('zonePageContent').appendChild(obj); get_by_id('zonePageContent').appendChild(obj);
} }
checkDocumentWrite = false; checkDocumentWrite = false;
selectedWidget = null; selectedWidget = null;
@ -449,7 +450,7 @@ function doAddWidgetCode(widget_code) {
// 위젯 추가후 페이지 리로딩 // 위젯 추가후 페이지 리로딩
var tpl = getWidgetContent(); var tpl = getWidgetContent();
var fo_obj = xGetElementById('pageFo'); var fo_obj = get_by_id('pageFo');
fo_obj.content.value = tpl; fo_obj.content.value = tpl;
fo_obj.mid.value = current_mid; fo_obj.mid.value = current_mid;
fo_obj.submit(); fo_obj.submit();
@ -704,7 +705,7 @@ function doShowWidgetSizeSetup(px, py, obj) {
function doHideWidgetSizeSetup() { function doHideWidgetSizeSetup() {
jQuery('#pageSizeLayer').hide(); jQuery('#pageSizeLayer').hide();
//var layer = xGetElementById("pageSizeLayer"); //var layer = get_by_id("pageSizeLayer");
//layer.style.visibility = "hidden"; //layer.style.visibility = "hidden";
//layer.style.display = "none"; //layer.style.display = "none";
} }
@ -855,7 +856,7 @@ function doApplyWidgetSize(fo_obj) {
} }
params["style"] = getStyle(selectedWidget); params["style"] = getStyle(selectedWidget);
params["selected_widget"] = widget; params["selected_widget"] = widget;
params["module_srl"] = xGetElementById("pageFo").module_srl.value; params["module_srl"] = get_by_id("pageFo").module_srl.value;
exec_xml('widget','procWidgetGenerateCodeInPage',params,function(ret_obj) { doAddWidgetCode(ret_obj["widget_code"]); },new Array('error','message','widget_code','tpl','css_header')); exec_xml('widget','procWidgetGenerateCodeInPage',params,function(ret_obj) { doAddWidgetCode(ret_obj["widget_code"]); },new Array('error','message','widget_code','tpl','css_header'));
} }
@ -864,14 +865,14 @@ function doApplyWidgetSize(fo_obj) {
var hideElements = new Array(); var hideElements = new Array();
function restoreWidgetButtons() { function restoreWidgetButtons() {
var widgetButton = xGetElementById('widgetButton'); var widgetButton = get_by_id('widgetButton');
var boxWidgetButton = xGetElementById('widgetBoxButton'); var boxWidgetButton = get_by_id('widgetBoxButton');
if(!widgetButton || !boxWidgetButton) return; if(!widgetButton || !boxWidgetButton) return;
widgetButton.style.visibility = 'hidden'; widgetButton.style.visibility = 'hidden';
xGetElementById("zonePageContent").parentNode.appendChild(widgetButton); get_by_id("zonePageContent").parentNode.appendChild(widgetButton);
boxWidgetButton.style.visibility = 'hidden'; boxWidgetButton.style.visibility = 'hidden';
xGetElementById("zonePageContent").parentNode.appendChild(boxWidgetButton); get_by_id("zonePageContent").parentNode.appendChild(boxWidgetButton);
for(var i=0;i<hideElements.length;i++) { for(var i=0;i<hideElements.length;i++) {
var obj = hideElements[0]; var obj = hideElements[0];
@ -881,7 +882,7 @@ function restoreWidgetButtons() {
} }
function showWidgetButton(name, obj) { function showWidgetButton(name, obj) {
var widgetButton = xGetElementById(name); var widgetButton = get_by_id(name);
if(!widgetButton) return; if(!widgetButton) return;
widgetButton.style.visibility = 'visible'; widgetButton.style.visibility = 'visible';
obj.insertBefore(widgetButton, obj.firstChild); obj.insertBefore(widgetButton, obj.firstChild);
@ -1308,7 +1309,7 @@ function widgetDragMouseMove(e) {
// 해당 object 에 더 이상 drag가 되지 않도록 설정 // 해당 object 에 더 이상 drag가 되지 않도록 설정
function widgetDragDisable(id) { function widgetDragDisable(id) {
if (!widgetDragManager) return; if (!widgetDragManager) return;
var obj = xGetElementById(id); var obj = get_by_id(id);
obj.draggable = false; obj.draggable = false;
obj.dragStart = null; obj.dragStart = null;
obj.drag = null; obj.drag = null;

34
modules/widget/tpl/js/widget_admin.js
View file

@ -9,7 +9,7 @@ function completeGenerateCode(ret_obj) {
var widget_code = ret_obj["widget_code"]; var widget_code = ret_obj["widget_code"];
widget_code = widget_code.replace(/&/g, "&amp;"); widget_code = widget_code.replace(/&/g, "&amp;");
widget_code = widget_code.replace(/\'/g, "&apos;"); widget_code = widget_code.replace(/\'/g, "&apos;");
var zone = xGetElementById("widget_code"); var zone = get_by_id("widget_code");
zone.value = widget_code; zone.value = widget_code;
} }
@ -29,13 +29,13 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
function doDisplaySkinColorset(sel, colorset) { function doDisplaySkinColorset(sel, colorset) {
var skin = sel.options[sel.selectedIndex].value; var skin = sel.options[sel.selectedIndex].value;
if(!skin) { if(!skin) {
xGetElementById("colorset_area").style.display = "none"; get_by_id("colorset_area").style.display = "none";
setFixedPopupSize(); setFixedPopupSize();
return; return;
} }
var params = new Array(); var params = new Array();
params["selected_widget"] = xGetElementById("fo_widget").selected_widget.value; params["selected_widget"] = get_by_id("fo_widget").selected_widget.value;
params["skin"] = skin; params["skin"] = skin;
params["colorset"] = colorset; params["colorset"] = colorset;
@ -75,8 +75,8 @@ function getWidgetVars() {
if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return; if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
selected_node = opener.selectedWidget; selected_node = opener.selectedWidget;
if(!xGetElementById('fo_widget').widgetstyle.value) { if(!get_by_id('fo_widget').widgetstyle.value) {
xGetElementById('fo_widget').widgetstyle.value = selected_node.getAttribute('widgetstyle'); get_by_id('fo_widget').widgetstyle.value = selected_node.getAttribute('widgetstyle');
} }
doFillWidgetVars(); doFillWidgetVars();
@ -93,7 +93,7 @@ function doFillWidgetVars() {
var widget_sequence = parseInt(selected_node.getAttribute("widget_sequence"),10); var widget_sequence = parseInt(selected_node.getAttribute("widget_sequence"),10);
var fo_widget = jQuery("#fo_widget"); var fo_widget = jQuery("#fo_widget");
var fo_obj = xGetElementById("fo_widget"); var fo_obj = get_by_id("fo_widget");
jQuery('#widget_skin').val(skin); jQuery('#widget_skin').val(skin);
// 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장 // 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장
@ -177,8 +177,8 @@ function doFillWidgetVars() {
// 컬러셋 설정 // 컬러셋 설정
if(skin && xGetElementById("widget_colorset") && xGetElementById("widget_colorset").options.length<1 && colorset) { if(skin && get_by_id("widget_colorset") && get_by_id("widget_colorset").options.length<1 && colorset) {
doDisplaySkinColorset(xGetElementById("widget_skin"), colorset); doDisplaySkinColorset(get_by_id("widget_skin"), colorset);
} }
// widget sequence 설정 // widget sequence 설정
@ -188,7 +188,7 @@ function doFillWidgetVars() {
function checkFixType(obj) { function checkFixType(obj) {
var val = obj.options[obj.selectedIndex].value; var val = obj.options[obj.selectedIndex].value;
if(val != "px") { if(val != "px") {
var fo_obj = xGetElementById("fo_widget"); var fo_obj = get_by_id("fo_widget");
var width = fo_obj.widget_width.value; var width = fo_obj.widget_width.value;
if(width>100) fo_obj.widget_width.value = 100; if(width>100) fo_obj.widget_width.value = 100;
} }
@ -196,8 +196,8 @@ function checkFixType(obj) {
// 위젯의 대상 모듈 입력기 (단일 선택) // 위젯의 대상 모듈 입력기 (단일 선택)
function insertSelectedModule(id, module_srl, mid, browser_title) { function insertSelectedModule(id, module_srl, mid, browser_title) {
var obj= xGetElementById('_'+id); var obj= get_by_id('_'+id);
var sObj = xGetElementById(id); var sObj = get_by_id(id);
sObj.value = module_srl; sObj.value = module_srl;
obj.value = browser_title+' ('+mid+')'; obj.value = browser_title+' ('+mid+')';
@ -215,7 +215,7 @@ function insertSelectedModules(id, module_srl, mid, browser_title) {
} }
function midMoveUp(id) { function midMoveUp(id) {
var sel_obj = xGetElementById('_'+id); var sel_obj = get_by_id('_'+id);
if(sel_obj.selectedIndex<0) return; if(sel_obj.selectedIndex<0) return;
var idx = sel_obj.selectedIndex; var idx = sel_obj.selectedIndex;
@ -235,7 +235,7 @@ function midMoveUp(id) {
} }
function midMoveDown(id) { function midMoveDown(id) {
var sel_obj = xGetElementById('_'+id); var sel_obj = get_by_id('_'+id);
if(sel_obj.selectedIndex<0) return; if(sel_obj.selectedIndex<0) return;
var idx = sel_obj.selectedIndex; var idx = sel_obj.selectedIndex;
@ -255,7 +255,7 @@ function midMoveDown(id) {
} }
function midRemove(id) { function midRemove(id) {
var sel_obj = xGetElementById('_'+id); var sel_obj = get_by_id('_'+id);
if(sel_obj.selectedIndex<0) return; if(sel_obj.selectedIndex<0) return;
var idx = sel_obj.selectedIndex; var idx = sel_obj.selectedIndex;
sel_obj.remove(idx); sel_obj.remove(idx);
@ -305,7 +305,7 @@ function completeGetModuleSrlList(ret_obj, response_tags) {
} }
function getModuleSrl(id) { function getModuleSrl(id) {
var obj = xGetElementById(id); var obj = get_by_id(id);
if(!obj.value) return; if(!obj.value) return;
var value = obj.value; var value = obj.value;
var params = new Array(); var params = new Array();
@ -318,8 +318,8 @@ function getModuleSrl(id) {
function completeGetModuleSrl(ret_obj, response_tags) { function completeGetModuleSrl(ret_obj, response_tags) {
var id = ret_obj['id']; var id = ret_obj['id'];
var obj = xGetElementById('_'+id); var obj = get_by_id('_'+id);
var sObj = xGetElementById(id); var sObj = get_by_id(id);
if(!sObj || !obj) return; if(!sObj || !obj) return;
var module_list = ret_obj['module_list']; var module_list = ret_obj['module_list'];