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

git-svn-id: http://xe-core.googlecode.com/svn/trunk@575 201d5d3c-b55e-5fd7-737f-ddc643e51545

Browse source
This commit is contained in:
zero 2007-03-20 09:29:42 +00:00
parent 47fdc889c3
commit d15a45faa5
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -678,7 +678,7 @@
$content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content); $content = preg_replace_callback('!<(div|img)([^\>]*)editor_component=([^\>]*?)>!is', array($this,'_transEditorComponent'), $content);
// <br> 코드 변환 // <br> 코드 변환
$content = preg_replace('/<br([^>]*)>/i','<br$1/>', $content); $content = preg_replace('/<br([^>\/]*)(\/>|>)/i','<br$1 />', $content);
// <img ...> 코드를 <img ... /> 코드로 변환 // <img ...> 코드를 <img ... /> 코드로 변환
$content = preg_replace('/<img([^>^\/]*)(\/>|>)/i','<img$1 />', $content); $content = preg_replace('/<img([^>^\/]*)(\/>|>)/i','<img$1 />', $content);

7
modules/editor/tpl/editor.html
View file

@ -49,7 +49,7 @@
</div> </div>
<!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) --> <!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) -->
<div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox" style="display:none"> <div id="editor_paragraph_{$upload_target_srl}" class="editor_iconbox">
<img src="./images/align_left.gif" alt="{$lang->edit->help_align_left}" id="component_{$upload_target_srl}_justifyleft" /> <img src="./images/align_left.gif" alt="{$lang->edit->help_align_left}" id="component_{$upload_target_srl}_justifyleft" />
<img src="./images/align_center.gif" alt="{$lang->edit->help_align_center}" id="component_{$upload_target_srl}_justifycenter" /> <img src="./images/align_center.gif" alt="{$lang->edit->help_align_center}" id="component_{$upload_target_srl}_justifycenter" />
<img src="./images/align_right.gif" alt="{$lang->edit->help_align_right}" id="component_{$upload_target_srl}_justifyright" /> <img src="./images/align_right.gif" alt="{$lang->edit->help_align_right}" id="component_{$upload_target_srl}_justifyright" />
@ -59,11 +59,6 @@
<img src="./images/list_bullet.gif" alt="list bullet" id="component_{$upload_target_srl}_insertunorderedlist" /> <img src="./images/list_bullet.gif" alt="list bullet" id="component_{$upload_target_srl}_insertunorderedlist" />
</div> </div>
<!-- IE의 경우 엔터시 p 태그를 쓸지 br 태그로 변경을 할지 체크하는 항목 -->
<div class="editor_parabox" id="editor_use_paragraph_box_{$upload_target_srl}">
<input type="checkbox" name="use_paragraph" id="editor_use_paragraph_{$upload_target_srl}" onclick="editorUseParagraph(this,'{$upload_target_srl}');" />
<label for="editor_use_paragraph_{$upload_target_srl}">{$lang->edit->use_paragraph}</label>
</div>
</div> </div>
<div class="editor_area_2"> <div class="editor_area_2">

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

@ -78,6 +78,7 @@ function editorStart(upload_target_srl) {
xAddEventListener(document,'mousedown',editorHideObject); xAddEventListener(document,'mousedown',editorHideObject);
// 문단작성기능 on/off // 문단작성기능 on/off
/*
if(xIE4Up) { if(xIE4Up) {
xDisplay('editor_paragraph_'+upload_target_srl, 'none'); xDisplay('editor_paragraph_'+upload_target_srl, 'none');
xDisplay('editor_use_paragraph_box_'+upload_target_srl, 'inline'); xDisplay('editor_use_paragraph_box_'+upload_target_srl, 'inline');
@ -85,6 +86,7 @@ function editorStart(upload_target_srl) {
xDisplay('editor_paragraph_'+upload_target_srl, 'block'); xDisplay('editor_paragraph_'+upload_target_srl, 'block');
xDisplay('editor_use_paragraph_box_'+upload_target_srl, 'none'); xDisplay('editor_use_paragraph_box_'+upload_target_srl, 'none');
} }
*/
// 에디터의 내용을 지속적으로 fo_obj.content.value에 입력 // 에디터의 내용을 지속적으로 fo_obj.content.value에 입력
editorSyncContent(fo_obj.content, upload_target_srl); editorSyncContent(fo_obj.content, upload_target_srl);
@ -184,6 +186,7 @@ function editorReplaceHTML(iframe_obj, html) {
// 입력 키에 대한 이벤트 체크 // 입력 키에 대한 이벤트 체크
function editorKeyPress(evt) { function editorKeyPress(evt) {
var e = new xEvent(evt); var e = new xEvent(evt);
/*
if (e.keyCode == 13) { if (e.keyCode == 13) {
if(xIE4Up && e.shiftKey == false && !xGetElementById("use_paragraph").checked ) { if(xIE4Up && e.shiftKey == false && !xGetElementById("use_paragraph").checked ) {
if(e.target.parentElement.document.designMode!="On") return; if(e.target.parentElement.document.designMode!="On") return;
@ -195,6 +198,7 @@ function editorKeyPress(evt) {
return; return;
} }
} }
*/
if (e.ctrlKey) { if (e.ctrlKey) {
switch(e.keyCode) { switch(e.keyCode) {