diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index abc67a81..f42700e1 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -1,4 +1,5 @@ let files = []; +let CrossEditor; function contentFade(action){ if(action === "in"){ @@ -184,6 +185,19 @@ function setFileDiv(file, idx){ uploadDiv.append(fileInfo); } +function setEditor(divId, editorHeight){ + CrossEditor = new NamoSE(divId); + CrossEditor.params.ParentEditor = document.getElementById(divId); + CrossEditor.params.Width = "100%"; + CrossEditor.params.Height = editorHeight; + CrossEditor.params.UserLang = "auto"; + CrossEditor.params.NewToolbar = true; + CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg"; + CrossEditor.params.FullScreen = false; + $("#editor").show(); + CrossEditor.EditorStart(); +} + function fileCheck(flag, files){ let totalSize = 0; for(const file of files) { @@ -288,4 +302,8 @@ function getToday(){ var day = ("0" + date.getDate()).slice(-2); return year + "-" + month + "-" + day; +} + +function OnInitCompleted(e){ + e.editorTarget.SetBodyValue(document.getElementById("content").value); } \ No newline at end of file diff --git a/src/main/resources/static/js/faRpt/faRpt.js b/src/main/resources/static/js/faRpt/faRpt.js index ef0bd847..7217ea03 100644 --- a/src/main/resources/static/js/faRpt/faRpt.js +++ b/src/main/resources/static/js/faRpt/faRpt.js @@ -116,25 +116,9 @@ function getFaRptEditModal(faRpt){ dataType:"html", success: function(html){ $("#faRptEditModalContent").empty().append(html) - $("#faRptEditModal").modal('show'); - $("#faRptDt").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - $("#content").summernote({ - lang:'ko-KR', - height: 300, - disableDragAndDrop: true, - toolbar: [ - ['style', ['style']], - ['font', ['bold', 'underline', 'clear']], - ['color', ['color']], - ['para', ['ul', 'ol', 'paragraph']], - ['table', ['table']] - ] - }); setUploadDiv(); + setEditor('editor', '500'); + $("#faRptEditModal").modal('show'); }, error:function(){ @@ -161,6 +145,7 @@ function saveFaRpt(faRptState){ $(".text-decoration-line-through").each(function (idx, el){ formData.append('fileSeq', $(el).attr("data-fileseq")); }) + formData.append('content', CrossEditor.GetBodyValue()); $.ajax({ type : 'POST', data : formData, diff --git a/src/main/resources/static/js/publicBoard/publicBoard.js b/src/main/resources/static/js/publicBoard/publicBoard.js index be216632..7a6d7b75 100644 --- a/src/main/resources/static/js/publicBoard/publicBoard.js +++ b/src/main/resources/static/js/publicBoard/publicBoard.js @@ -1,4 +1,3 @@ -var CrossEditor $(function(){ $("#dateSelectorDiv").datepicker({ @@ -89,16 +88,7 @@ function getEditModal(publicKey, publicType){ success: function(html){ $("#editContent").empty().append(html) setUploadDiv(); - CrossEditor = new NamoSE('editor'); - CrossEditor.params.ParentEditor = document.getElementById("editor"); - CrossEditor.params.Width = "100%"; - CrossEditor.params.Height = "570"; - CrossEditor.params.UserLang = "auto"; - CrossEditor.params.NewToolbar = true; - CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg"; - CrossEditor.params.FullScreen = false; - $("#editor").show(); - CrossEditor.EditorStart(); + setEditor('editor', '570'); $("#editModal").modal('show'); }, error:function(){ @@ -181,7 +171,3 @@ function commentFormReset(){ $("#parentComment").val(''); $("#commentFormHome").append(commentForm) } - -function OnInitCompleted(e){ - e.editorTarget.SetBodyValue(document.getElementById("content").value); -} \ No newline at end of file diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html index d5115b16..b6dc094b 100644 --- a/src/main/resources/templates/faRpt/faRptEditModal.html +++ b/src/main/resources/templates/faRpt/faRptEditModal.html @@ -47,7 +47,8 @@