Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-thompson-day8 committed Apr 14, 2015
2 parents 426aae2 + a731207 commit 6494067
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

;; ---------------------------------------------------------------------------------------

(defproject re-com "0.5.0"
(defproject re-com "0.5.1"
:description "Reusable UI components for Reagent"
:url "https://github.com/Day8/re-com.git"
:license {:name "MIT"}
Expand Down
4 changes: 2 additions & 2 deletions src/re_com/tabs.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{:pre [(validate-args-macro tabs-args-desc args "tabs")]}
(let [current (deref-or-value model)
tabs (deref-or-value tabs)
_ (assert (not-empty (filter #(= current (:id %)) tabs)) "model not found in tabs vector")]
_ (assert (not-empty (filter #(= current (id-fn %)) tabs)) "model not found in tabs vector")]
[:ul
{:class "rc-tabs nav nav-tabs noselect"
:style (flex-child-style "none")}
Expand All @@ -50,7 +50,7 @@
[& {:keys [model tabs on-change id-fn label-fn vertical?]}]
(let [current (deref-or-value model)
tabs (deref-or-value tabs)
_ (assert (not-empty (filter #(= current (:id %)) tabs)) "model not found in tabs vector")]
_ (assert (not-empty (filter #(= current (id-fn %)) tabs)) "model not found in tabs vector")]
[:div
{:class (str "rc-tabs noselect btn-group" (if vertical? "-vertical"))
:style (flex-child-style "none")}
Expand Down

0 comments on commit 6494067

Please sign in to comment.