From aef47249531803397c3d94ef5516c39ed384b3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arne=20Schl=C3=BCter?= Date: Wed, 26 Dec 2018 16:22:07 +0100 Subject: [PATCH] Fix incorrect sizing of canvases, closes issue #36 Plus probably another of other unnoticed css-bugs because hiccup doesn't interpret :class-name anymore --- src/cljs/airsonic_ui/components/audio_player/views.cljs | 2 +- src/cljs/airsonic_ui/components/library/views.cljs | 2 +- src/cljs/airsonic_ui/views/cover.cljs | 4 ++-- src/cljs/airsonic_ui/views/notifications.cljs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cljs/airsonic_ui/components/audio_player/views.cljs b/src/cljs/airsonic_ui/components/audio_player/views.cljs index f9a9180..bd931e8 100644 --- a/src/cljs/airsonic_ui/components/audio_player/views.cljs +++ b/src/cljs/airsonic_ui/components/audio_player/views.cljs @@ -50,7 +50,7 @@ (.fill)))) (defn current-progress [current-time seekable duration] - [canvas {:class-name "current-progress-canvas" + [canvas {:class "current-progress-canvas" :draw #(draw-progress % current-time seekable duration)}]) ;; FIXME: It's ugly to have the canvas padding and styling scattered everywhere (sass, drawing code above, and here) diff --git a/src/cljs/airsonic_ui/components/library/views.cljs b/src/cljs/airsonic_ui/components/library/views.cljs index 1ee9f4f..b16be59 100644 --- a/src/cljs/airsonic_ui/components/library/views.cljs +++ b/src/cljs/airsonic_ui/components/library/views.cljs @@ -8,7 +8,7 @@ [:ul (for [[idx [route label]] (map-indexed vector items)] (let [[_ params _] route] ^{:key idx} [:li (when (= params active-item) - {:class-name "is-active"}) + {:class "is-active"}) [:a {:href (apply url-for route)} label]]))]]) ;; this variable determines how many pages before the first known page we should list diff --git a/src/cljs/airsonic_ui/views/cover.cljs b/src/cljs/airsonic_ui/views/cover.cljs index 8a0abfc..873ba50 100644 --- a/src/cljs/airsonic_ui/views/cover.cljs +++ b/src/cljs/airsonic_ui/views/cover.cljs @@ -33,7 +33,7 @@ (defn missing-cover [item size] - [canvas {:class-name "missing-cover" + [canvas {:class "missing-cover" :draw #(generate-cover % item)}]) (defn has-cover? [item] @@ -45,7 +45,7 @@ [item size] (let [original @(subscribe [::subs/cover-url item size]) retina @(subscribe [::subs/cover-url item (* 2 size)])] - [:figure {:class-name (str "image is-" size "x" size)} + [:figure {:class (str "image is-" size "x" size)} (if (has-cover? item) [:img {:src original :srcSet (str original ", " retina " 2x")}] diff --git a/src/cljs/airsonic_ui/views/notifications.cljs b/src/cljs/airsonic_ui/views/notifications.cljs index 2e2210f..f094941 100644 --- a/src/cljs/airsonic_ui/views/notifications.cljs +++ b/src/cljs/airsonic_ui/views/notifications.cljs @@ -9,6 +9,6 @@ (let [class (case (:level notification) :error "danger" "info")] - ^{:key id} [:div {:class-name (str "notification is-small is-" class)} + ^{:key id} [:div {:class (str "notification is-small is-" class)} [:button.delete {:on-click #(dispatch [:notification/hide id])}] (:message notification)]))])