Skip to content

Commit

Permalink
Merge branch 'release/0.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gregg8
Gregg8 committed Apr 18, 2016
2 parents 6a9c549 + 81d4dc8 commit 3839a37
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
17 changes: 9 additions & 8 deletions project.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

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

(defproject re-com "0.8.0"
(defproject re-com "0.8.1"
:description "Reusable UI components for Reagent"
:url "https://github.com/Day8/re-com.git"
:license {:name "MIT"}

:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/clojurescript "1.7.145"]
[reagent "0.5.1"]
[com.andrewmcveigh/cljs-time "0.3.14"]]
[com.andrewmcveigh/cljs-time "0.4.0"]]

;:plugins [[lein-unpack-resources "0.1.1"]]
;
Expand All @@ -29,15 +29,15 @@

:profiles {:dev {:dependencies [[clj-stacktrace "0.2.8"]
[alandipert/storage-atom "1.2.4" ]
[figwheel "0.4.1"]
[figwheel "0.5.2"]
[spellhouse/clairvoyant "0.0-48-gf5e59d3"]
[secretary "1.2.3"]]
:plugins [[lein-cljsbuild "1.1.1-SNAPSHOT"]
[lein-figwheel "0.4.1"]
:plugins [[lein-cljsbuild "1.1.2"]
[lein-figwheel "0.5.2"]
[lein-shell "0.5.0"]
[com.cemerick/clojurescript.test "0.3.3"]
[lein-s3-static-deploy "0.1.1-SNAPSHOT"]
[lein-ancient "0.6.2"]]}
[lein-ancient "0.6.7"]]}
:dev-run {:clean-targets ^{:protect false} ["run/resources/public/compiled_dev"]}
:prod-run {:clean-targets ^{:protect false} ["run/resources/public/compiled_prod"]}
:dev-test {:clean-targets ^{:protect false} ["run/test/compiled"]}}
Expand Down Expand Up @@ -65,7 +65,7 @@
:source-paths ["src"]
:compiler {:output-to "run/resources/public/compiled_prod/demo.js"
:output-dir "run/resources/public/compiled_prod/demo"
:closure-defines {:goog.DEBUG false}
:closure-defines {"goog.DEBUG" false}
:optimizations :advanced
:pretty-print false
:pseudo-names false}}
Expand All @@ -75,7 +75,8 @@
:output-dir "run/test/compiled/test"
:source-map true
:optimizations :none
:pretty-print true}}]}
:pretty-print true}}]
:test-commands {}} ;; figwheel 0.5.2 required this for some reason

:figwheel {:css-dirs ["run/resources/public/assets/css"]
:server-port ~fig-port
Expand Down
3 changes: 2 additions & 1 deletion src/re_com/dropdown.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
(= offset :end) (dec (count choices))
(nil? current-index) 0
:else (mod (+ current-index offset) (count choices)))]
(when new-index (id-fn (nth choices new-index)))))
(when (and new-index (pos? (count choices)))
(id-fn (nth choices new-index)))))


(defn- choices-with-group-headings
Expand Down

0 comments on commit 3839a37

Please sign in to comment.