diff --git a/main.go b/main.go index 5d35691..c95abb9 100755 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "encoding/json" "image" "image/color" "io/ioutil" @@ -253,13 +254,16 @@ func (server Server) streamRecordings(w http.ResponseWriter, r *http.Request) { log.Println(err) return } + momentsJSON, _ := json.Marshal(moments) err = momentsTemplate.Execute(w, struct { - Streams map[string]*Stream - Moments [][]string - Stream *Stream - WatchArea *WatchArea + Streams map[string]*Stream + MomentsJSON string + Moments [][]string + Stream *Stream + WatchArea *WatchArea }{ server.Streams, + string(momentsJSON[:]), moments, stream, watchArea, diff --git a/templates/moments.html b/templates/moments.html index 0681211..ff4a71e 100755 --- a/templates/moments.html +++ b/templates/moments.html @@ -34,14 +34,6 @@ let streamName = "{{.Stream.Name}}"; let watchAreaName = "{{.WatchArea.Name}}"; let interval = {{.Stream.MotionInterval}}; - let moments = [ - {{range $moment := .Moments}} - [ - {{range $image := $moment}} - '{{$image}}', - {{end}} -], - {{end}} - ]; + let moments = {{.MomentsJSON}} {{end}} \ No newline at end of file