Index: arms/js/pdService.js
===================================================================
diff -u -r6622451c264949d6e1be2b3f8f8b41410fecfcf3 -r6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e
--- arms/js/pdService.js (.../pdService.js) (revision 6622451c264949d6e1be2b3f8f8b41410fecfcf3)
+++ arms/js/pdService.js (.../pdService.js) (revision 6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e)
@@ -43,6 +43,7 @@
$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/js/dataTables.responsive.min.js"),
$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/js/dataTables.select.min.js"),
$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js")
+
).done(function() {
// 사이드 메뉴 색상 설정
@@ -55,9 +56,20 @@
dataTableLoad();
// --- 에디터 설정 --- //
- CKEDITOR.replace("input_pdservice_editor",{ skin: "office2013" });
- CKEDITOR.replace("extend_modal_editor",{ skin: "office2013" });
- CKEDITOR.replace("modal_editor",{ skin: "office2013" });
+ var waitCKEDITOR = setInterval(function () {
+ try {
+ if (window.CKEDITOR) {
+ if(window.CKEDITOR.status == "loaded"){
+ CKEDITOR.replace("input_pdservice_editor",{ skin: "office2013" });
+ CKEDITOR.replace("extend_modal_editor",{ skin: "office2013" });
+ CKEDITOR.replace("modal_editor",{ skin: "office2013" });
+ clearInterval(waitCKEDITOR);
+ }
+ }
+ } catch (err) {
+ console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중...");
+ }
+ }, 313 /*milli*/);
$("#popup_editview_pdservice_name").tooltip();
Index: arms/js/pdServiceVersion.js
===================================================================
diff -u -r6622451c264949d6e1be2b3f8f8b41410fecfcf3 -r6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e
--- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 6622451c264949d6e1be2b3f8f8b41410fecfcf3)
+++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e)
@@ -44,8 +44,19 @@
});
// --- 에디터 설정 --- //
- CKEDITOR.replace("input_pdservice_editor");
- CKEDITOR.replace("extend_modal_editor");
+ var waitCKEDITOR = setInterval(function () {
+ try {
+ if (window.CKEDITOR) {
+ if(window.CKEDITOR.status == "loaded") {
+ CKEDITOR.replace("input_pdservice_editor", {skin: "office2013"});
+ CKEDITOR.replace("extend_modal_editor", {skin: "office2013"});
+ clearInterval(waitCKEDITOR);
+ }
+ }
+ } catch (err) {
+ console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중...");
+ }
+ }, 313 /*milli*/);
$("#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 -r6622451c264949d6e1be2b3f8f8b41410fecfcf3 -r6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e
--- arms/js/reqAdd.js (.../reqAdd.js) (revision 6622451c264949d6e1be2b3f8f8b41410fecfcf3)
+++ arms/js/reqAdd.js (.../reqAdd.js) (revision 6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e)
@@ -61,8 +61,20 @@
//버전 멀티 셀렉트 박스 이니시에이터
makeVersionMultiSelectBox();
- CKEDITOR.replace("modal_editor");
- CKEDITOR.replace("edit_tabmodal_editor");
+ // --- 에디터 설정 --- //
+ var waitCKEDITOR = setInterval(function () {
+ try {
+ if (window.CKEDITOR) {
+ if(window.CKEDITOR.status == "loaded") {
+ CKEDITOR.replace("modal_editor", {skin: "office2013"});
+ CKEDITOR.replace("edit_tabmodal_editor", {skin: "office2013"});
+ clearInterval(waitCKEDITOR);
+ }
+ }
+ } catch (err) {
+ console.log("CKEDITOR 로드가 완료되지 않아서 초기화 재시도 중...");
+ }
+ }, 313 /*milli*/);
makeDatePicker($("#btn_start_calendar_popup"));
makeDatePicker($("#btn_end_calendar_popup"));
Index: arms/template.html
===================================================================
diff -u -r8b0982878d351d2f59a78124d063a96a66b7c3fa -r6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e
--- arms/template.html (.../template.html) (revision 8b0982878d351d2f59a78124d063a96a66b7c3fa)
+++ arms/template.html (.../template.html) (revision 6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e)
@@ -130,46 +130,26 @@
content="Atlassian RMS" />
-
-
+
+
-
-
-
+
+
-
-
-
-
+
+
+
-
Index: community/template.html
===================================================================
diff -u -r79ccd412d8b7c4ae0785593d95f0624e4161db4c -r6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e
--- community/template.html (.../template.html) (revision 79ccd412d8b7c4ae0785593d95f0624e4161db4c)
+++ community/template.html (.../template.html) (revision 6be9564bc0ba06dcb0cd5b16a2432cbad9a4b47e)
@@ -103,13 +103,6 @@
href="./img/313_logo.ico"
type="image/x-icon" />
-
-
-
-