Apply new template loader

Former-commit-id: f28eab261ea1ac93774e04240c7e6da663e0da7c
This commit is contained in:
corebreaker 2017-07-21 17:00:36 +03:00
parent 8b0c381808
commit 9777490822

View File

@ -230,12 +230,8 @@ func (s *DjangoEngine) loadAssets() error {
virtualDirectory, virtualExtension := s.directory, s.extension
assetFn, namesFn := s.assetFn, s.namesFn
var templateErr error
/*fsLoader, err := pongo2.NewLocalFileSystemLoader(virtualDirectory)
if err != nil {
return err
}*/
set := pongo2.NewSet("", pongo2.DefaultLoader)
// Make a file set with a template loader based on asset function
set := pongo2.NewSet("", &tDjangoAssetLoader{baseDir: s.directory, assetGet: s.assetFn})
set.Globals = getPongoContext(s.globals)
// set the filters
@ -256,6 +252,8 @@ func (s *DjangoEngine) loadAssets() error {
s.mu.Lock()
defer s.mu.Unlock()
var templateErr error
names := namesFn()
for _, path := range names {
if !strings.HasPrefix(path, virtualDirectory) {