Browse Source

Load buddy images from "static" subfolder.

pull/15/head
Joachim Bauch 11 years ago
parent
commit
f4bf2e9c8d
  1. 2
      src/app/spreed-speakfreely-server/main.go
  2. 2
      static/js/services/buddylist.js

2
src/app/spreed-speakfreely-server/main.go

@ -319,12 +319,12 @@ func runner(runtime phoenix.Runtime) error { @@ -319,12 +319,12 @@ func runner(runtime phoenix.Runtime) error {
router := mux.NewRouter()
r := router.PathPrefix(basePath).Subrouter().StrictSlash(true)
r.HandleFunc("/", httputils.MakeGzipHandler(mainHandler))
r.Handle("/static/img/buddy/{imageid}/{idx:.*}", http.StripPrefix(basePath, makeImageHandler(hub, time.Hour)))
r.Handle("/static/{path:.*}", http.StripPrefix(basePath, httputils.FileStaticServer(http.Dir(rootFolder))))
r.Handle("/robots.txt", http.StripPrefix(basePath, http.FileServer(http.Dir(path.Join(rootFolder, "static")))))
r.Handle("/favicon.ico", http.StripPrefix(basePath, http.FileServer(http.Dir(path.Join(rootFolder, "static", "img")))))
r.Handle("/ws", makeWsHubHandler(hub))
r.HandleFunc("/{room}", httputils.MakeGzipHandler(roomHandler))
r.Handle("/img/buddy/{imageid}/{idx:.*}", http.StripPrefix(basePath, makeImageHandler(hub, time.Hour)))
// Add API end points.
api := sleepy.NewAPI(r.PathPrefix("/api/v1/").Subrouter())

2
static/js/services/buddylist.js

@ -323,7 +323,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text! @@ -323,7 +323,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
// can use data: urls directly
return url;
} else if (url.indexOf("img:") === 0) {
return mediaStream.config.B + "img/buddy/"+url.substr(4);
return mediaStream.config.B + "static/img/buddy/"+url.substr(4);
}
console.log("Unknown buddy picture url", url);

Loading…
Cancel
Save