Merge pull request #23 from synyx/fix-blurry-svg

Fix blurry SVG
synyx · Jun 2, 2021 · 0f9060c · 0f9060c
2 parents 266d8c3 + 93e2560
commit 0f9060c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/js/editor/index.js b/js/editor/index.js
@@ -130,9 +130,9 @@ export function notFound() {
   return h("div", "Unwritten tale…");
 }
 
-function poster(url) {
-  return h("img.poster", {
-    attrs: { src: url },
+function poster(url, type) {
+  return h("object.poster", {
+    attrs: { data: url, type },
   });
 }
 
@@ -239,7 +239,7 @@ let navigator = (tale, transformMatrix, cameraPosition, activeSlide) => {
       },
     },
     [
-      poster(`/editor/${tale.slug}/${tale["file-path"]}`),
+      poster(`/editor/${tale.slug}/${tale["file-path"]}`, tale.fileType),
       layer(
         {
           on: {

diff --git a/js/editor/upload.js b/js/editor/upload.js
@@ -8,6 +8,7 @@ export let uploader = tale => {
     h("input", {
       attrs: {
         type: "file",
+        accept: "image/*",
       },
       on: {
         change: ev => {

diff --git a/js/presenter/index.js b/js/presenter/index.js
@@ -40,9 +40,10 @@ export let presenter = tale => {
           },
         },
       },
-      h("img", {
+      h("object", {
         attrs: {
-          src: `/editor/${tale.slug}/${tale["file-path"]}`,
+          data: `/editor/${tale.slug}/${tale["file-path"]}`,
+          type: tale.fileType,
         },
       }),
     ),

diff --git a/pkg/project/fs.go b/pkg/project/fs.go
@@ -131,6 +131,7 @@ func (fr *FilesystemRepository) SaveImage(slug, contentType string, data []byte)
 		return Project{}, err
 	}
 	project.FilePath = filename
+	project.FileType = contentType
 	project, err = fr.SaveProject(slug, project)
 	if err != nil {
 		return Project{}, err

diff --git a/pkg/project/project.go b/pkg/project/project.go
@@ -24,6 +24,7 @@ type Project struct {
 	Slug       string     `json:"slug"`
 	Name       string     `json:"name"`
 	FilePath   string     `json:"file-path" edn:"file-path"`
+	FileType   string     `json:"fileType" edn:"fileType"`
 	Dimensions Dimensions `json:"dimensions"`
 	Slides     []Slide    `json:"slides"`
 }

diff --git a/pkg/web/api_test.go b/pkg/web/api_test.go
@@ -230,7 +230,8 @@ func TestAPI_updateProjectImage(t *testing.T) {
 		header.Add("Content-Type", "image/bmp")
 		resp := tc.RequestWithHeaders("PUT", "/api/tales/foo/image", data, header)
 
-		AssertProjectResponse(t, resp, project.Project{Slug: "foo", Name: "Bar", FilePath: "foo.bmp"}, 202)
+		AssertProjectResponse(t, resp, project.Project{Slug: "foo", Name: "Bar", FilePath: "foo.bmp",
+			FileType: "image/bmp"}, 202)
 	})
 	t.Run("invalid content type", func(t *testing.T) {
 		tc := NewTestClient(t)