Index: arms/js/pdService.js =================================================================== diff -u -r238a8ae1927bfcecc89f783b24b99e9679798992 -r6eeaaa80eda53fc2e65eb122e30fb5a39e422c60 --- arms/js/pdService.js (.../pdService.js) (revision 238a8ae1927bfcecc89f783b24b99e9679798992) +++ arms/js/pdService.js (.../pdService.js) (revision 6eeaaa80eda53fc2e65eb122e30fb5a39e422c60) @@ -22,22 +22,26 @@ dataTableLoad(); // --- 에디터 설정 --- // - window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; - $.getScript("../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js").done(function (script, textStatus) { - var waitCKEDITOR = setInterval(function () { - try { - if (window.CKEDITOR) { - CKEDITOR.replace("input_pdservice_editor"); - CKEDITOR.replace("extend_modal_editor"); - CKEDITOR.replace("modal_editor"); - clearInterval(waitCKEDITOR); - } - } catch (err) { - console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); - } - }, 313 /*milli*/); - }); + // window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; + // $.getScript("../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js").done(function (script, textStatus) { + // var waitCKEDITOR = setInterval(function () { + // try { + // if (window.CKEDITOR) { + // CKEDITOR.replace("input_pdservice_editor"); + // CKEDITOR.replace("extend_modal_editor"); + // CKEDITOR.replace("modal_editor"); + // clearInterval(waitCKEDITOR); + // } + // } catch (err) { + // console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); + // } + // }, 313 /*milli*/); + // }); + CKEDITOR.replace("input_pdservice_editor"); + CKEDITOR.replace("extend_modal_editor"); + CKEDITOR.replace("modal_editor"); + $("#popup_editview_pdservice_name").tooltip(); tab_click_event(); Index: arms/js/pdServiceVersion.js =================================================================== diff -u -r238a8ae1927bfcecc89f783b24b99e9679798992 -r6eeaaa80eda53fc2e65eb122e30fb5a39e422c60 --- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 238a8ae1927bfcecc89f783b24b99e9679798992) +++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 6eeaaa80eda53fc2e65eb122e30fb5a39e422c60) @@ -21,21 +21,24 @@ }); // --- 에디터 설정 --- // - window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; - $.getScript("../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js").done(function (script, textStatus) { - var waitCKEDITOR = setInterval(function () { - try { - if (window.CKEDITOR) { - CKEDITOR.replace("input_pdservice_editor"); - CKEDITOR.replace("extend_modal_editor"); - clearInterval(waitCKEDITOR); - } - } catch (err) { - console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); - } - }, 313 /*milli*/); - }); + // window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; + // $.getScript("../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js").done(function (script, textStatus) { + // var waitCKEDITOR = setInterval(function () { + // try { + // if (window.CKEDITOR) { + // CKEDITOR.replace("input_pdservice_editor"); + // CKEDITOR.replace("extend_modal_editor"); + // clearInterval(waitCKEDITOR); + // } + // } catch (err) { + // console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); + // } + // }, 313 /*milli*/); + // }); + CKEDITOR.replace("input_pdservice_editor"); + CKEDITOR.replace("extend_modal_editor"); + $("#input_pdservice_start_date").datetimepicker({ allowTimes: ["09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00"] }); Index: arms/js/reqAdd.js =================================================================== diff -u -r6ddd85e72af13f78e9e586b404e189bba0e3811e -r6eeaaa80eda53fc2e65eb122e30fb5a39e422c60 --- arms/js/reqAdd.js (.../reqAdd.js) (revision 6ddd85e72af13f78e9e586b404e189bba0e3811e) +++ arms/js/reqAdd.js (.../reqAdd.js) (revision 6eeaaa80eda53fc2e65eb122e30fb5a39e422c60) @@ -18,21 +18,24 @@ makeVersionMultiSelectBox(); // --- 에디터 설정 --- // - window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; - $.getScript("../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js").done(function (script, textStatus) { - var waitCKEDITOR = setInterval(function () { - try { - if (window.CKEDITOR) { - CKEDITOR.replace("modal_editor"); - CKEDITOR.replace("edit_tabmodal_editor"); - clearInterval(waitCKEDITOR); - } - } catch (err) { - console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); - } - }, 313 /*milli*/); - }); + // window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; + // $.getScript("../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js").done(function (script, textStatus) { + // var waitCKEDITOR = setInterval(function () { + // try { + // if (window.CKEDITOR) { + // CKEDITOR.replace("modal_editor"); + // CKEDITOR.replace("edit_tabmodal_editor"); + // clearInterval(waitCKEDITOR); + // } + // } catch (err) { + // console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중..."); + // } + // }, 313 /*milli*/); + // }); + CKEDITOR.replace("modal_editor"); + CKEDITOR.replace("edit_tabmodal_editor"); + makeDatePicker($("#btn_start_calendar_popup")); makeDatePicker($("#btn_end_calendar_popup")); } Index: arms/template.html =================================================================== diff -u -r84acfe1bba899b8de46fac409ae7425d280dd899 -r6eeaaa80eda53fc2e65eb122e30fb5a39e422c60 --- arms/template.html (.../template.html) (revision 84acfe1bba899b8de46fac409ae7425d280dd899) +++ arms/template.html (.../template.html) (revision 6eeaaa80eda53fc2e65eb122e30fb5a39e422c60) @@ -505,10 +505,10 @@ - - - - + - - - +