Skip to content

Upgrade prismatic schema #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tanzoniteblack wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Upgrade prismatic schema #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/core.async "0.2.374"]
[prismatic/om-tools "0.3.11" :exclusions [om]]
[prismatic/schema "0.4.0"
[prismatic/schema "1.1.1"
:exclusions [org.clojure/clojurescript]]
[org.omcljs/om "0.8.8" :scope "provided"]]
:profiles {:provided
Expand Down
12 changes: 6 additions & 6 deletions src/om_bootstrap/input.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
;; ### Schema

(def Addons
{(s/optional-key :addon-before) (s/either s/Str t/Component)
(s/optional-key :addon-after) (s/either s/Str t/Component)
(s/optional-key :addon-button) (s/either s/Str t/Component)
(s/optional-key :addon-button-before) (s/either s/Str t/Component)
(s/optional-key :addon-button-after) (s/either s/Str t/Component)})
{(s/optional-key :addon-before) (s/cond-pre s/Str t/Component)
(s/optional-key :addon-after) (s/cond-pre s/Str t/Component)
(s/optional-key :addon-button) (s/cond-pre s/Str t/Component)
(s/optional-key :addon-button-before) (s/cond-pre s/Str t/Component)
(s/optional-key :addon-button-after) (s/cond-pre s/Str t/Component)})

(def FeedbackIcons
"Helps render feedback icons."
Expand Down Expand Up @@ -66,7 +66,7 @@
represents the final class to apply.

TODO: Use class-set from om-tools."
[klasses :- {(s/either s/Str s/Keyword) s/Bool}]
[klasses :- {(s/cond-pre s/Str s/Keyword) s/Bool}]
(->> (mapcat (fn [[k keep?]]
(when keep? [(name k)]))
klasses)
Expand Down
4 changes: 2 additions & 2 deletions src/om_bootstrap/nav.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
(def Nav
(t/bootstrap
{:bs-style (s/enum "tabs" "pills")
(s/optional-key :active-key) (s/either s/Str s/Num)
(s/optional-key :active-key) (s/cond-pre s/Str s/Num)
(s/optional-key :active-href) s/Str
(s/optional-key :stacked?) s/Bool
(s/optional-key :justified?) s/Bool
Expand Down Expand Up @@ -171,7 +171,7 @@
"Returns true if any of the necessary properties are in place to
render the navbar-header and toggle button."
[bs]
(boolean
(boolean
(or (:brand bs)
(:toggle-button bs)
(:toggle-nav-key bs))))
Expand Down