moving assets into a dir

This commit is contained in:
2017-06-24 11:06:57 -07:00
parent d100cebfbe
commit e959b41f2c
20 changed files with 15 additions and 13 deletions
+2
View File
@@ -0,0 +1,2 @@
//go:generate go-bindata -pkg assets simplemde/dist/... simplemde/debug/...
package assets
+10 -10
View File
@@ -8,7 +8,7 @@
// require.js // require.js
// DO NOT EDIT! // DO NOT EDIT!
package caddyhugo package assets
import ( import (
"bytes" "bytes"
@@ -245,12 +245,12 @@ func AssetNames() []string {
// _bindata is a table, holding each asset generator, mapped to its name. // _bindata is a table, holding each asset generator, mapped to its name.
var _bindata = map[string]func() (*asset, error){ var _bindata = map[string]func() (*asset, error){
"simplemde/dist/simplemde.min.css": simplemdeDistSimplemdeMinCss, "simplemde/dist/simplemde.min.css": simplemdeDistSimplemdeMinCss,
"simplemde/dist/simplemde.min.js": simplemdeDistSimplemdeMinJs, "simplemde/dist/simplemde.min.js": simplemdeDistSimplemdeMinJs,
"simplemde/debug/simplemde.css": simplemdeDebugSimplemdeCss, "simplemde/debug/simplemde.css": simplemdeDebugSimplemdeCss,
"simplemde/debug/simplemde.debug.js": simplemdeDebugSimplemdeDebugJs, "simplemde/debug/simplemde.debug.js": simplemdeDebugSimplemdeDebugJs,
"simplemde/debug/simplemde.js": simplemdeDebugSimplemdeJs, "simplemde/debug/simplemde.js": simplemdeDebugSimplemdeJs,
"require.js": requireJs, "require.js": requireJs,
} }
// AssetDir returns the file names below a certain // AssetDir returns the file names below a certain
@@ -292,17 +292,18 @@ type bintree struct {
Func func() (*asset, error) Func func() (*asset, error)
Children map[string]*bintree Children map[string]*bintree
} }
var _bintree = &bintree{nil, map[string]*bintree{ var _bintree = &bintree{nil, map[string]*bintree{
"require.js": &bintree{requireJs, map[string]*bintree{}}, "require.js": &bintree{requireJs, map[string]*bintree{}},
"simplemde": &bintree{nil, map[string]*bintree{ "simplemde": &bintree{nil, map[string]*bintree{
"debug": &bintree{nil, map[string]*bintree{ "debug": &bintree{nil, map[string]*bintree{
"simplemde.css": &bintree{simplemdeDebugSimplemdeCss, map[string]*bintree{}}, "simplemde.css": &bintree{simplemdeDebugSimplemdeCss, map[string]*bintree{}},
"simplemde.debug.js": &bintree{simplemdeDebugSimplemdeDebugJs, map[string]*bintree{}}, "simplemde.debug.js": &bintree{simplemdeDebugSimplemdeDebugJs, map[string]*bintree{}},
"simplemde.js": &bintree{simplemdeDebugSimplemdeJs, map[string]*bintree{}}, "simplemde.js": &bintree{simplemdeDebugSimplemdeJs, map[string]*bintree{}},
}}, }},
"dist": &bintree{nil, map[string]*bintree{ "dist": &bintree{nil, map[string]*bintree{
"simplemde.min.css": &bintree{simplemdeDistSimplemdeMinCss, map[string]*bintree{}}, "simplemde.min.css": &bintree{simplemdeDistSimplemdeMinCss, map[string]*bintree{}},
"simplemde.min.js": &bintree{simplemdeDistSimplemdeMinJs, map[string]*bintree{}}, "simplemde.min.js": &bintree{simplemdeDistSimplemdeMinJs, map[string]*bintree{}},
}}, }},
}}, }},
}} }}
@@ -353,4 +354,3 @@ func _filePath(dir, name string) string {
cannonicalName := strings.Replace(name, "\\", "/", -1) cannonicalName := strings.Replace(name, "\\", "/", -1)
return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
} }
+3 -3
View File
@@ -1,4 +1,3 @@
//go:generate go-bindata -pkg caddyhugo simplemde/dist/... simplemde/debug/...
package caddyhugo package caddyhugo
import ( import (
@@ -18,6 +17,7 @@ import (
"time" "time"
"git.stephensearles.com/stephen/acedoc" "git.stephensearles.com/stephen/acedoc"
"git.stephensearles.com/stephen/caddy-hugo2/assets"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/mholt/caddy" "github.com/mholt/caddy"
@@ -146,11 +146,11 @@ func (ch *CaddyHugo) ServeHTTPWithNext(next httpserver.Handler, c *caddy.Control
return http.StatusFound, nil return http.StatusFound, nil
} }
if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.css") { if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.css") {
w.Write(MustAsset("simplemde/dist/simplemde.min.css")) w.Write(assets.MustAsset("simplemde/dist/simplemde.min.css"))
return http.StatusOK, nil return http.StatusOK, nil
} }
if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.js") { if strings.HasPrefix(r.URL.Path, "/hugo/simplemde.js") {
w.Write(MustAsset("simplemde/debug/simplemde.js")) w.Write(assets.MustAsset("simplemde/debug/simplemde.js"))
return http.StatusOK, nil return http.StatusOK, nil
} }
if strings.HasPrefix(r.URL.Path, "/hugo/admin") { if strings.HasPrefix(r.URL.Path, "/hugo/admin") {