From 2e80633cd4d6308bec5c82889d5833ddcedc1403 Mon Sep 17 00:00:00 2001 From: Daniel Heath Date: Sat, 28 Apr 2018 12:12:10 +1000 Subject: [PATCH] Kill more globals --- server/handlers.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/handlers.go b/server/handlers.go index b680ff7..3a7d325 100755 --- a/server/handlers.go +++ b/server/handlers.go @@ -25,8 +25,6 @@ import ( const minutesToUnlock = 10.0 var defaultLock string -var debounceTime int -var diaryMode bool var allowFileUploads bool var needSitemapUpdate = true var pathToData string @@ -190,12 +188,6 @@ func (s Site) Router() *gin.Engine { defaultLock = HashPassword(s.DefaultPassword) } - // set the debounce time - debounceTime = s.Debounce - - // set diary mode - diaryMode = s.Diary - // Allow iframe/scripts in markup? allowInsecureHtml = s.AllowInsecure return router @@ -520,8 +512,8 @@ func (s Site) handlePageRequest(c *gin.Context) { "RecentlyEdited": getRecentlyEdited(page, c), "IsPublished": p.IsPublished, "CustomCSS": len(s.Css) > 0, - "Debounce": debounceTime, - "DiaryMode": diaryMode, + "Debounce": s.Debounce, + "DiaryMode": s.Diary, "Date": time.Now().Format("2006-01-02"), "UnixTime": time.Now().Unix(), "ChildPageNames": p.ChildPageNames(),