From 8badf7792231dc9548e730bc0c5a712fddb01289 Mon Sep 17 00:00:00 2001 From: bom Date: Tue, 14 Sep 2021 14:42:09 +0200 Subject: [PATCH] fixes in browser --- project.clj | 4 ---- src/main/cljs/dda/c4k_common/browser.cljs | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/project.clj b/project.clj index acf22c2..a041e99 100644 --- a/project.clj +++ b/project.clj @@ -1,8 +1,4 @@ -<<<<<<< HEAD -(defproject org.domaindrivenarchitecture/c4k-common-clj "0.2.11" -======= (defproject org.domaindrivenarchitecture/c4k-common-clj "0.3.1-SNAPSHOT" ->>>>>>> 8b5c33183cbe8e324b69ee5150f5cc40add9a2b4 :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" diff --git a/src/main/cljs/dda/c4k_common/browser.cljs b/src/main/cljs/dda/c4k_common/browser.cljs index 155c807..056b488 100644 --- a/src/main/cljs/dda/c4k_common/browser.cljs +++ b/src/main/cljs/dda/c4k_common/browser.cljs @@ -87,18 +87,18 @@ [id label default-value] - (str (generate-label id label) - {:type :element :attrs {:class "form-control" :type "text" :name id :value default-value} :tag :input :content nil} - (generate-feedback-tag id))) + [(generate-label id label) + {:type :element :attrs {:class "form-control" :type "text" :name id :value default-value} :tag :input :content nil} + (generate-feedback-tag id)]) (defn generate-text-area [id label default-value rows] - (str (generate-label id label) - {:type :element :attrs {:name id :id id :class "form-control" :rows rows} :tag :textarea :content [default-value]} - (generate-feedback-tag id))) + [(generate-label id label) + {:type :element :attrs {:name id :id id :class "form-control" :rows rows} :tag :textarea :content [default-value]} + (generate-feedback-tag id)]) (defn generate-button [id @@ -117,7 +117,7 @@ label rows] {:type :element, :attrs {:id id}, :tag :div, :content [{:type :element, :attrs {:for "output", :class "form-label"}, :tag :label, :content [label]} - {:type :element, :attrs {:name "output", :id "output", :class "form-control", :rows rows}, :tag :textarea, :content []}]}) + {:type :element, :attrs {:name "output", :id "output", :class "form-control", :rows rows}, :tag :textarea, :content []}]}) (defn generate-needs-validation []