Browse Source

Something new, resources order make some sense (TODO: debug)

Vova Tkach 5 years ago
parent
commit
e9256be14d
2 changed files with 24 additions and 7 deletions
  1. 20 7
      assets/assets.go
  2. 4 0
      main.go

+ 20 - 7
assets/assets.go

@@ -7,17 +7,30 @@ import (
 )
 
 func PopulateResources(res *resource.Resource) {
-	res.Add(consts.AssetsCpCodeMirrorCss, "text/css", CpCodeMirrorCss)
-	res.Add(consts.AssetsCpCodeMirrorJs, "application/javascript; charset=utf-8", CpCodeMirrorJs)
+	// res.Add(consts.AssetsCpCodeMirrorCss, "text/css", CpCodeMirrorCss)
+	// res.Add(consts.AssetsCpCodeMirrorJs, "application/javascript; charset=utf-8", CpCodeMirrorJs)
+	// res.Add(consts.AssetsCpStylesCss, "text/css", CpStylesCss)
+	// res.Add(consts.AssetsCpWysiwygPellCss, "text/css", CpWysiwygPellCss)
+	// res.Add(consts.AssetsCpWysiwygPellJs, "application/javascript; charset=utf-8", CpWysiwygPellJs)
+	// res.Add(consts.AssetsLightGalleryCss, "text/css", LightGalleryCss)
+	// res.Add(consts.AssetsLightGalleryJs, "application/javascript; charset=utf-8", LightGalleryJs)
+	// res.Add(consts.AssetsSysBgPng, "image/png", SysBgPng)
+	// res.Add(consts.AssetsSysFaveIco, "image/x-icon", SysFaveIco)
+	// res.Add(consts.AssetsSysLogoPng, "image/png", SysLogoPng)
+	// res.Add(consts.AssetsSysLogoSvg, "image/svg+xml", SysLogoSvg)
+	// res.Add(consts.AssetsSysStylesCss, "text/css", SysStylesCss)
+	// res.Add(consts.AssetsCpScriptsJs, "application/javascript; charset=utf-8", CpScriptsJs)
+	res.Add(consts.AssetsCpScriptsJs, "application/javascript; charset=utf-8", CpScriptsJs)
 	res.Add(consts.AssetsCpStylesCss, "text/css", CpStylesCss)
-	res.Add(consts.AssetsCpWysiwygPellCss, "text/css", CpWysiwygPellCss)
-	res.Add(consts.AssetsCpWysiwygPellJs, "application/javascript; charset=utf-8", CpWysiwygPellJs)
-	res.Add(consts.AssetsLightGalleryCss, "text/css", LightGalleryCss)
-	res.Add(consts.AssetsLightGalleryJs, "application/javascript; charset=utf-8", LightGalleryJs)
 	res.Add(consts.AssetsSysBgPng, "image/png", SysBgPng)
 	res.Add(consts.AssetsSysFaveIco, "image/x-icon", SysFaveIco)
 	res.Add(consts.AssetsSysLogoPng, "image/png", SysLogoPng)
 	res.Add(consts.AssetsSysLogoSvg, "image/svg+xml", SysLogoSvg)
 	res.Add(consts.AssetsSysStylesCss, "text/css", SysStylesCss)
-	res.Add(consts.AssetsCpScriptsJs, "application/javascript; charset=utf-8", CpScriptsJs)
+	res.Add(consts.AssetsCpWysiwygPellJs, "application/javascript; charset=utf-8", CpWysiwygPellJs)
+	res.Add(consts.AssetsCpWysiwygPellCss, "text/css", CpWysiwygPellCss)
+	res.Add(consts.AssetsCpCodeMirrorJs, "application/javascript; charset=utf-8", CpCodeMirrorJs)
+	res.Add(consts.AssetsCpCodeMirrorCss, "text/css", CpCodeMirrorCss)
+	res.Add(consts.AssetsLightGalleryJs, "application/javascript; charset=utf-8", LightGalleryJs)
+	res.Add(consts.AssetsLightGalleryCss, "text/css", LightGalleryCss)
 }

+ 4 - 0
main.go

@@ -106,6 +106,10 @@ func main() {
 
 		// Mounted assets
 		if res.Response(w, r, func(w http.ResponseWriter, r *http.Request, i *resource.OneResource) {
+			// ---
+			// fmt.Printf("%+v\n", i)
+			// fmt.Printf("%s\n", i.Path)
+			// ---
 			w.Header().Set("Cache-Control", "public, max-age=31536000")
 			if consts.ParamDebug && i.Path == "assets/cp/scripts.js" {
 				w.Write([]byte("window.fave_debug=true;"))