Merge branch 'master' of http://git.wheeparam.com/wheeparam/WheeparamBoard

# Conflicts:
#	public_html/assets/css/admin.min.css.map
#	public_html/assets/css/desktop.min.css.map
#	public_html/assets/css/mobile.min.css.map

_src/admin/js/admin.js

@@ -3,7 +3,6 @@
  ***********************************************************************************/
 APP.init = function(){
     APP.initMenu();
-    APP.initAx5();
     APP.initPlugins();
     APP.initFitHeight();
     APP.initSortableList();
@@ -121,26 +120,6 @@ APP.initSortableList = function() {
     });
 };
 
-/**********************************************************************************************************************
- * MODAL 관련
- *********************************************************************************************************************/
-APP.initAx5 = function(){
-    APP.MASK = new ax5.ui.mask({
-        zIndex: 1000}
-        );
-    APP.MASK2 = new ax5.ui.mask({
-        zIndex: 2000
-    });
-    APP.modal = new ax5.ui.modal({
-        absolute: true,
-        iframeLoadingMsg: '<i class="far fa-spinner"></i>'
-    });
-    APP.modal2 = new ax5.ui.modal({
-        absolute: true,
-        iframeLoadingMsg: '<i class="far fa-spinner"></i>'
-    });
-};
-
 APP.initFitHeight = function() {
     $(window).resize(function() {
         if($('[data-fit-content]').length> 0 )

_src/common/js/modules/modal.js

@@ -1,3 +1,17 @@
+APP.MASK = new ax5.ui.mask({
+    zIndex: 1000}
+);
+APP.MASK2 = new ax5.ui.mask({
+    zIndex: 2000
+});
+APP.modal = new ax5.ui.modal({
+    absolute: true,
+    iframeLoadingMsg: '<i class="fal fa-spinner"></i>'
+});
+APP.modal2 = new ax5.ui.modal({
+    absolute: true,
+    iframeLoadingMsg: '<i class="fal fa-spinner"></i>'
+});
 APP.MODAL = function() {
     var modalCallback = {};