From afc4e4536f287d48b454fc1e2bbe3eb767d3b991 Mon Sep 17 00:00:00 2001 From: SIR Date: Mon, 31 Mar 2014 13:47:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=EC=A0=80=EC=9E=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/autosave.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/autosave.js b/js/autosave.js index e1f1815fc..7c867e1a1 100644 --- a/js/autosave.js +++ b/js/autosave.js @@ -7,9 +7,9 @@ var save_wr_content = null; function autosave() { $("form#fwrite").each(function() { - if (g5_editor=="ckeditor4" && typeof(CKEDITOR.instances.wr_content)!="undefined") { + if (g5_editor.indexOf("ckeditor4") != -1 && typeof(CKEDITOR.instances.wr_content)!="undefined") { this.wr_content.value = CKEDITOR.instances.wr_content.getData(); - } else if (g5_editor=="cheditor5" && typeof(ed_wr_content)!="undefined") { + } else if (g5_editor.indexOf("cheditor5") != -1 && typeof(ed_wr_content)!="undefined") { this.wr_content.value = ed_wr_content.outputBodyHTML(); } // 변수에 저장해 놓은 값과 다를 경우에만 임시 저장함 @@ -75,9 +75,9 @@ $(function(){ var subject = $(data).find("item").find("subject").text(); var content = $(data).find("item").find("content").text(); $("#wr_subject").val(subject); - if (g5_editor=="ckeditor4" && typeof(CKEDITOR.instances.wr_content)!="undefined") { + if (g5_editor.indexOf("ckeditor4") != -1 && typeof(CKEDITOR.instances.wr_content)!="undefined") { CKEDITOR.instances.wr_content.setData(content); - } else if (g5_editor=="cheditor5" && typeof(ed_wr_content)!="undefined") { + } else if (g5_editor.indexOf("cheditor5") != -1 && typeof(ed_wr_content)!="undefined") { ed_wr_content.putContents(content); } else { $("#fwrite #wr_content").val(content); From d0391b5f298453a6517884f3fa8ad1c53e62b499 Mon Sep 17 00:00:00 2001 From: SIR Date: Mon, 31 Mar 2014 13:47:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?cheditor=20=EB=B2=84=EC=A0=84=EC=97=90=20?= =?UTF-8?q?=EA=B4=80=EA=B3=84=EC=97=86=EC=9D=B4=20=ED=8F=AC=ED=95=A8?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index df481935e..4183301b2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ sirgle/ test.php *.key *.sh -cheditor5/ +cheditor*/ ckeditor43/