merge sandbox to trunk for 1.4.4

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-28 07:24:47 +00:00
parent 200d63636c
commit b8299c8a65
683 changed files with 70982 additions and 69716 deletions

View file

@ -1,4 +1,5 @@
@charset "utf-8";
/* NHN (developers@xpressengine.com) */
/* TextEditor */
.xeTextEditor {overflow:hidden;}

View file

@ -2986,8 +2986,7 @@ var TextRange = function(oEl) {
/**
* Selection for textfield
*
* @author hooriza
* @author NHN (developer@xpressengine.com)
*/
TextRange.prototype.getSelection = function() {
var obj = this._o;
@ -5425,7 +5424,7 @@ var oMessageMap = {
xe.XpressCore.oMessageMap = oMessageMap;
/**
* XHTML Formatter
* @author gony
* @author NHN (developer@xpressengine.com)
*/
var
regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig,
@ -5661,7 +5660,7 @@ xe.XE_XHTMLFormatter = $.Class({
/**
* Support XE extensions
* @author gony
* @author NHN (developer@xpressengine.com)
*/
xe.XE_Extension = $.Class({
name : "XE_Extension",
@ -5748,7 +5747,7 @@ xe.XE_Extension = $.Class({
});
/**
* Auto saving
* @author gony
* @author NHN (developer@xpressengine.com)
*/
xe.XE_AutoSave = $.Class({
name : "XE_AutoSave",
@ -5795,7 +5794,7 @@ xe.XE_AutoSave = $.Class({
});
/**
* Format Block plugin
* @author gony
* @author NHN (developer@xpressengine.com)
*/
xe.XE_FormatWithSelectUI = $.Class({
name : "XE_FormatWithSelectUI",
@ -5835,7 +5834,7 @@ xe.XE_FormatWithSelectUI = $.Class({
});
/**
* Enhanced Table Fetures
* @author gony
* @author NHN (developer@xpressengine.com)
*/
// 표 편집 확장 기능

View file

@ -8,36 +8,36 @@
<title xml:lang="zh-CN">XpressEditor皮肤</title>
<title xml:lang="zh-TW">XpressEditor面板</title>
<description xml:lang="ko">
XpressEditor based on SmartEditor Basic by 행복한고니
XpressEditor based on SmartEditor Basic by NHN
</description>
<description xml:lang="en">
XpressEditor based on SmartEditor Basic by gony
XpressEditor based on SmartEditor Basic by NHN
</description>
<description xml:lang="vi">
XpressEditor dựa trên SmartEditor cơ bản, được tạo bởi gony
XpressEditor dựa trên SmartEditor cơ bản, được tạo bởi NHN
</description>
<description xml:lang="es">
XpressEditor based on SmartEditor Basic by gony
XpressEditor based on SmartEditor Basic by NHN
</description>
<description xml:lang="jp">
XpressEditor based on SmartEditor Basic by gony
XpressEditor based on SmartEditor Basic by NHN
</description>
<description xml:lang="zh-CN">
XpressEditor based on SmartEditor Basic by gony
XpressEditor based on SmartEditor Basic by NHN
</description>
<description xml:lang="zh-TW">
XpressEditor based on SmartEditor Basic by gony
XpressEditor based on SmartEditor Basic by NHN
</description>
<version>0.3.16</version>
<date>2009-03-22</date>
<author email_address="gonom9@gmail.com" link="http://mygony.com">
<name xml:lang="ko">행복한고니</name>
<name xml:lang="es">gony</name>
<name xml:lang="en">gony</name>
<name xml:lang="vi">gony</name>
<name xml:lang="jp">gony</name>
<name xml:lang="zh-CN">gony</name>
<name xml:lang="zh-TW">gony</name>
<author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
<name xml:lang="ko">NHN</name>
<name xml:lang="es">NHN</name>
<name xml:lang="en">NHN</name>
<name xml:lang="vi">NHN</name>
<name xml:lang="jp">NHN</name>
<name xml:lang="zh-CN">NHN</name>
<name xml:lang="zh-TW">NHN</name>
</author>
<colorset>
<color name="white">