Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -r3e2515513ac661ef0f2e4a52a77a1bbd6b515b73 -re3f43ef982921b65b10c255301f97851cb9766d5 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 3e2515513ac661ef0f2e4a52a77a1bbd6b515b73) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision e3f43ef982921b65b10c255301f97851cb9766d5) @@ -1022,11 +1022,10 @@ } }) .ajaxComplete(function (event, jqXHR, ajaxOptions) { - //$(".loader").addClass("hide"); + Ladda.stopAll(); }) .ajaxStop(function () { $(".loader").addClass("hide"); - Ladda.stopAll(); }); return true; @@ -1156,16 +1155,7 @@ function getTourGuideMode() { let settingsState = JSON.parse(localStorage.getItem("settings-state")); - if(settingsState === null) { // 최초세팅 - let tourGuideSettings = { tourGuideState: 'on' } - localStorage.setItem("settings-state",JSON.stringify(tourGuideSettings)); - let getSettingsState = JSON.parse(localStorage.getItem("settings-state")); - - return getSettingsState['tourGuideState']; - } else { - return settingsState['tourGuideState']; - } - + return settingsState['tourGuideState']; } function tourGuideStart() { @@ -1181,10 +1171,10 @@ console.log("tourGuideMode is Off"); } else { //mode 가 없거나 on 일때 console.log("tourGuideMode is On"); - var tgm = setInterval(function(){ + let tgm = setInterval(function(){ tourGuideStart(); clearInterval(tgm); - }, 1000); + }, 1200); } } @@ -1200,15 +1190,11 @@ // 헤더 :: 톱니바퀴 대응함수 //////////////////////////////////////////////////////////////////////////////////////// function 톱니바퀴_초기설정() { + //settings var $settings = $("#settings"), $sidebarSettings = $("#sidebar-settings"), - settingsState = JSON.parse(localStorage.getItem("settings-state")) || { - sidebar: 'left', - sidebarState: 'auto', - displaySidebar: true, - tourGuideState: 'on' - }, + settingsState = JSON.parse(localStorage.getItem("settings-state")), $pageHeader = $(".page-header"), $body = $("body"), popoverReallyHide = function(){ @@ -1270,6 +1256,17 @@ } }; + if (settingsState === null) { + settingsState = { + sidebar: 'left', + sidebarState: 'auto', + displaySidebar: true, + tourGuideState: 'on' + }; + + localStorage.setItem('settings-state', JSON.stringify(settingsState)); + } + sidebarSide(settingsState.sidebar); sidebarState(settingsState.sidebarState, false); displaySidebar(settingsState.displaySidebar, false); @@ -1317,7 +1314,6 @@ tourGuideState(mode); settingsState.tourGuideState = mode; localStorage.setItem("settings-state", JSON.stringify(settingsState)); - console.log() }); //sidevar left/right