firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

gitignore merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-03-31 17:06:47 +09:00
parent 4ae1d1a345 55408ece40
commit fa4a67f337
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,7 +6,7 @@ sirgle/
test.php
*.key
*.sh
cheditor5/
log
g5_tree
cheditor*/
ckeditor43/

8
js/autosave.js
View File

@ -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);