fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-23 05:09:56 +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

8
modules/editor/tpl/js/editor.js
View file

@ -128,10 +128,10 @@ function editorStart(editor_sequence, primary_key, content_key, editor_height, f
// content 생성
editor_path = editor_path.replace(/^\.\//ig, '');
var contentHtml = ''+
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'+
'<html xmlns="http://www.w3.org/1999/xhtml><head><meta http-equiv="content-type" content="text/html; charset=utf-8"/>'+
'<style type="text/css">'+
'body {font-size:.75em; line-height:1.6; font-family:Sans-serif; height:'+editor_height+'px; padding:0; margin:0; background-color:transparent; color:'+font_color+';}'+
'<!DOCTYPE html>'+
'<html><head><meta charset="utf-8"/>'+
'<style>'+
'body{font-size:.75em;line-height:1.6;font-family:Sans-serif;height:'+editor_height+'px;padding:0;margin:0;background-color:transparent;color:'+font_color+';}'+
'</style>'+
'</head><body editor_sequence="'+editor_sequence+'">'+
content+

10
modules/editor/tpl/js/editor_module_config.js
View file

@ -10,7 +10,7 @@ function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
var selectbox = null;
jQuery(function($){
if(params.testid){
selectbox = $("#"+params.testid).next('label').next('select');
selectbox = $("#"+params.testid).next('label').children('select');
}else{
selectbox = (params.type == 'document') ? $('select[name=sel_editor_colorset]') : $('select[name=sel_comment_editor_colorset]');
}
@ -36,7 +36,13 @@ function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
}
var selectAttr = "";
for(var i=0;i<it.length;i++){
selectbox.append($('<option value="'+it[i].name+'" >'+it[i].title+'</option>'));
var $options = $('<option value="'+it[i].name+'" >'+it[i].title+'</option>');
if(params.selected_colorset == it[i].name){
$options.attr('selected', 'selected');
}
selectbox.append($options);
}
selectbox.show();
}else{

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{