fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-25 14:19:58 +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

7
modules/editor/tpl/js/uploader.js
View file

@ -21,7 +21,7 @@ var defaultHandlers;
function init(cfg, exe) {
var seq = cfg.editorSequence;
if(!is_def(seq)) return;
cfg = $.extend({
@ -437,7 +437,10 @@ function insertUploadedFile(editorSequence) {
// html 모드
if(editorMode[editorSequence]=='html'){
if(text.length>0) get_by_id('editor_textarea_'+editorSequence).value += text.join('');
if(text.length>0 && get_by_id('editor_textarea_'+editorSequence))
{
get_by_id('editor_textarea_'+editorSequence).value += text.join('');
}
// 위지윅 모드
}else{