Merge branch 'master' into develop

Conflicts:
	src/re_frame/subs.cljc
This commit is contained in:
Mike Thompson 2016-07-23 09:52:41 +10:00
commit 52d61c03b3
1 changed files with 1 additions and 1 deletions

View File

@ -74,7 +74,7 @@
(let [query-id (first-in-vector v) (let [query-id (first-in-vector v)
handler-fn (get @qid->fn query-id)] handler-fn (get @qid->fn query-id)]
(when debug-enabled? (when debug-enabled?
(when-let [not-reactive (remove ratom? dynv)] (when-let [not-reactive (not-empty (remove ratom? dynv))]
(console :warn "re-frame: your subscription's dynamic parameters that don't implement IReactiveAtom: " not-reactive))) (console :warn "re-frame: your subscription's dynamic parameters that don't implement IReactiveAtom: " not-reactive)))
(if (nil? handler-fn) (if (nil? handler-fn)
(console :error "re-frame: no subscription handler registered for: \"" query-id "\". Returning a nil subscription.") (console :error "re-frame: no subscription handler registered for: \"" query-id "\". Returning a nil subscription.")