diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php index c31d7bf35..6c86b0b90 100644 --- a/modules/board/board.admin.view.php +++ b/modules/board/board.admin.view.php @@ -305,7 +305,7 @@ class BoardAdminView extends Board { * @brief board module message **/ function alertMessage($message) { - $script = sprintf('', lang($message)); - Context::addHtmlHeader( $script ); + $script = sprintf('', json_encode(strval(lang($message)))); + Context::addHtmlHeader($script); } } diff --git a/modules/editor/tpl/js/editor_common.js b/modules/editor/tpl/js/editor_common.js index e6251ec35..d31b39b5a 100644 --- a/modules/editor/tpl/js/editor_common.js +++ b/modules/editor/tpl/js/editor_common.js @@ -227,7 +227,7 @@ function editorSearchComponent(evt) { if(obj.getAttribute("widget")) { // editor_sequence을 찾음 while(tobj && tobj.nodeName != "BODY") { - tobj = xParent(tobj); + tobj = tobj.parentElement || tobj.parentNode; } if(!tobj || tobj.nodeName != "BODY" || !tobj.getAttribute("editor_sequence")) { editorPrevNode = null; @@ -245,8 +245,7 @@ function editorSearchComponent(evt) { // 선택되어진 object부터 상단으로 이동하면서 editor_component attribute가 있는지 검사 if(!obj.getAttribute("editor_component")) { while(obj && !obj.getAttribute("editor_component")) { - if(obj.parentElement) obj = obj.parentElement; - else obj = xParent(obj); + obj = obj.parentElement || obj.parentNode; } } @@ -274,7 +273,7 @@ function editorSearchComponent(evt) { // editor_sequence을 찾음 tobj = obj; while(tobj && tobj.nodeName != "BODY") { - tobj = xParent(tobj); + tobj = tobj.parentElement || tobj.parentNode; } if(!tobj || tobj.nodeName != "BODY" || !tobj.getAttribute("editor_sequence")) { editorPrevNode = null; diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index f9f99c332..8f22ac1be 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -43,7 +43,10 @@ diff --git a/modules/page/tpl/page_mobile_content_modify.html b/modules/page/tpl/page_mobile_content_modify.html index fea1ad669..967f61fd0 100644 --- a/modules/page/tpl/page_mobile_content_modify.html +++ b/modules/page/tpl/page_mobile_content_modify.html @@ -44,7 +44,10 @@ diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html index ac8093ecd..6662411f2 100644 --- a/modules/widget/tpl/add_content_widget.html +++ b/modules/widget/tpl/add_content_widget.html @@ -16,7 +16,7 @@
{$editor|noescape}
- +