Changeset 5105

Show
Ignore:
Timestamp:
01/21/08 23:38:56 (10 months ago)
Author:
inureyes
Message:

#806, #808

  • 기본 위지윅 에디터가 markdown, textile formatter와 돌아갈 때는 html 모드를 사용하지 않도록 수정
  • 지켜보고 나서 미리보기 버튼으로 만들 수도 있을듯. (편집은 안되고, 현재 상태를 번역해서 보여주는?)
Location:
trunk/plugins/FM_Modern
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/plugins/FM_Modern/editor.js

    r5096 r5105  
    24072407                '<a id="__ID__indicatorMoreLessBlock" class="inactive-class button moderneditor-indicatorMoreLessBlock" href="#void" onclick="__EDITOR__.command(\'MoreLessBlock\'); return false" title="' + _t('More/Less') + '"><span class="text">' + _t('More/Less') + '</span></a>' + 
    24082408            '</dd>' + 
    2409         '</dl>' + 
     2409        '</dl>'; 
     2410    if(this.restrictEditorMode != true) { 
     2411        html += //// 
    24102412        '<dl class="mode">' + 
    24112413            '<dt class="title">' + 
     
    24162418            '</dd>' + 
    24172419        '</dl>'; 
    2418  
     2420    } 
    24192421    html = html.replace(new RegExp('__EDITOR__', 'g'), 'TTModernEditor.editors.' + this.name); 
    24202422    html = html.replace(new RegExp('__ID__', 'g'), this.id); 
  • trunk/plugins/FM_Modern/index.php

    r5067 r5105  
    1010function FM_Modern_editorinit(&$editor) { 
    1111    global $service, $configVal; 
     12    requireComponent('Textcube.Function.misc'); 
     13    requireComponent('Textcube.Function.Setting'); 
     14    $config['restrictEditorMode'] = false; 
    1215    $blogid = getBlogId(); 
    1316    if (is_null($configVal)) { 
     
    1518            'defaultmode' => 'WYSIWYG'); 
    1619    } else { 
    17         requireComponent('Textcube.Function.misc'); 
    1820        $config = setting::fetchConfigVal($configVal); 
    1921    } 
    20     if (!isset($config['defaultmode'])) { 
     22    if ((setting::getBlogSettingGlobal('defaultFormatter','html') == 'markdown') || 
     23        (setting::getBlogSettingGlobal('defaultFormatter','html') == 'textile')) { 
     24        $config['restrictEditorMode'] = true; 
     25        $config['defaultmode'] = 'TEXTAREA'; 
     26    } else if (!isset($config['defaultmode'])) { 
    2127        $config['defaultmode'] = (getBlogSetting('editorMode', 1) == 1 ? 'WYSIWYG' : 'TEXTAREA'); 
    2228    } 
     
    3137            editor.editMode = "<?php echo $config['defaultmode'];?>"; 
    3238            editor.newLineToParagraph = <?php echo ($config['paragraphdelim'] == 'P' ? 'true' : 'false');?>; 
     39            editor.restrictEditorMode = <?php echo ($config['restrictEditorMode'] == true ? 'true' : 'false');?>; 
    3340            return editor; 
    3441<?php