diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index 5dc1efd1a..4467791ca 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -156,14 +156,8 @@ $editor_config->comment_editor_height = (int)Context::get('comment_editor_height'); - $editor_config->enable_height_resizable = Context::get('enable_height_resizable'); - - $editor_config->enable_comment_height_resizable = Context::get('enable_comment_height_resizable'); - $editor_config->enable_autosave = Context::get('enable_autosave'); - if($editor_config->enable_height_resizable != 'Y') $editor_config->enable_height_resizable = 'N'; - if($editor_config->enable_comment_height_resizable != 'Y') $editor_config->enable_comment_height_resizable = 'N'; if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N'; $oModuleController = &getController('module'); diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 9a480e85d..412e720a1 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -44,8 +44,6 @@ if(!$editor_config->editor_height) $editor_config->editor_height = 500; if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 120; - if($editor_config->enable_height_resizable!='N') $editor_config->enable_height_resizable= "Y"; - if($editor_config->enable_comment_height_resizable!='Y') $editor_config->enable_comment_height_resizable= "N"; if($editor_config->enable_autosave!='N') $editor_config->enable_autosave = "Y"; if(!$editor_config->editor_skin) $editor_config->editor_skin = 'default'; @@ -83,10 +81,6 @@ if($option->disable_html) $html_mode = false; else $html_mode = true; - // 크기 조절 옵션 설정 - if(!$option->resizable) $resizable = false; - else $resizable = true; - // 높이 설정 if(!$option->height) $editor_height = 400; else $editor_height = $option->height; @@ -178,11 +172,6 @@ **/ Context::set('html_mode', $html_mode); - /** - * resizable 가능한지 변수 설정 - **/ - Context::set('enable_resizable', $resizable); - /** * 에디터 세로 크기 설정 **/ @@ -228,7 +217,6 @@ $config->enable_component_grant = $editor_config->enable_component_grant; $config->enable_html_grant = $editor_config->enable_html_grant; $config->editor_height = $editor_config->editor_height; - $config->enable_height_resizable = $editor_config->enable_height_resizable; $config->enable_autosave = $editor_config->enable_autosave; } else { $config->editor_skin = $editor_config->comment_editor_skin; @@ -238,7 +226,6 @@ $config->enable_component_grant = $editor_config->enable_comment_component_grant; $config->enable_html_grant = $editor_config->enable_comment_html_grant; $config->editor_height = $editor_config->comment_editor_height; - $config->enable_height_resizable = $editor_config->enable_comment_height_resizable; $config->enable_autosave = 'N'; } @@ -304,9 +291,6 @@ // 높이 설정 $option->height = $config->editor_height; - // 높이 조절 옵션 설정 - $option->resizable = $config->enable_height_resizable=='Y'?true:false; - // 자동 저장 유무 옵션 설정 $option->enable_autosave = $config->enable_autosave=='Y'?true:false; diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html index a94713a68..a37d0181d 100644 --- a/modules/editor/skins/default/editor.html +++ b/modules/editor/skins/default/editor.html @@ -186,9 +186,7 @@
-
- diff --git a/modules/editor/skins/xquared/editor.html b/modules/editor/skins/xquared/editor.html index fc9ed7e43..89615bf8d 100644 --- a/modules/editor/skins/xquared/editor.html +++ b/modules/editor/skins/xquared/editor.html @@ -44,9 +44,7 @@ -
- diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html index 5df56ab43..df600602d 100644 --- a/modules/editor/tpl/editor_module_config.html +++ b/modules/editor/tpl/editor_module_config.html @@ -120,18 +120,6 @@

{$lang->about_editor_height}

- -
{$lang->height_resizable}
- - enable_height_resizable=='Y')-->checked="checked"/> - - - enable_comment_height_resizable=='Y')-->checked="checked"/> - - - -

{$lang->about_editor_height_resizable}

-
{$lang->enable_autosave}
enable_autosave=='Y')-->checked="checked"/>