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

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/editor/skins/xpresseditor/js/xpresseditor.js
View file

@ -3192,7 +3192,6 @@ xe.XE_EditingAreaVerticalResizer = $.Class({
_assignHTMLObjects : function(oAppContainer){
oAppContainer = $.$(oAppContainer) || document;
this.oResizeGrip = $(".xpress_xeditor_editingArea_verticalResizer", oAppContainer).get(0);
},
@ -4986,7 +4985,7 @@ xe.XE_Table = $.Class({
}
}
var sTable = '<table style="background:'+sBorderColorCode+'" cellspacing="'+iBorderWidth+'">';
var sTable = '<table style="background:'+sBorderColorCode+';border-spacing:1px" cellspacing="'+iBorderWidth+'">';
var sRow = '<tr style="background:'+sBGColorCode+'">';
var iColumns = this.oColumnInput.value;
for(var i=0; i<iColumns; i++){
@ -5083,7 +5082,10 @@ xe.XE_Editorresize = $.Class({
}
},
$ON_XE_EDITOR_RESIZE : function(){
this.inputArea.style.height = this.oIframe.style.height = this.oIframeBody[0].scrollHeight + 'px';
var t = this;
setTimeout(function(){
t.inputArea.style.height = t.oIframe.style.height = t.oIframeBody[0].scrollHeight + 'px';
}, 0);
}
});
//}
@ -5122,7 +5124,8 @@ var
var
allow_tags = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style'.split(','),
lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
no_closing_tags = 'base,meta,link,hr,br,basefont,param,img,area,input,isindex,col'.split(',');
var
replace_tags = {
@ -5203,10 +5206,10 @@ xe.XE_XHTMLFormatter = $.Class({
attrs = $.trim(attrs || '');
if (!closing) {
if ($.inArray(tag,lonely_tags) >= 0) {
if ($.inArray(tag,no_closing_tags) >= 0) {
var len = attrs.length;
if (tag == 'br') attrs = '';
if (!attrs || attrs.substring(len-1,len) != '/') attrs += '/';
if (!attrs || attrs.substring(len-1,len) != '/') attrs += ' /';
return '<'+tag+' '+$.trim(attrs)+'>';
} else {
@ -5216,7 +5219,7 @@ xe.XE_XHTMLFormatter = $.Class({
var tags = [], t = '';
// if the tag does not require a closing tag, simply remove the closing tag
if ($.inArray(tag,lonely_tags) >= 0) {
if ($.inArray(tag,no_closing_tags) >= 0) {
return '';
}
@ -5813,17 +5816,6 @@ xe.XE_Table = $.Class({
}
}).extend(xe.XE_Table);
// Auto Resize Checkbox Toggle Class
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
});
})(jQuery);
if (!window.xe) xe = {};
@ -6105,4 +6097,4 @@ xe.XE_Preview = jQuery.Class({
$ON_EVENT_PREVIEW : function() {
// TODO : 버튼이 눌렸을 때의 동작 정의
}
});
});