minor fixes
This commit is contained in:
@@ -25,11 +25,14 @@
|
|||||||
(str (.-protocol (.-location js/window)) "//" (.-host (.-location js/window)) (.-pathname (.-location js/window))
|
(str (.-protocol (.-location js/window)) "//" (.-host (.-location js/window)) (.-pathname (.-location js/window))
|
||||||
"?"
|
"?"
|
||||||
(cemerick.url/map->query (->> uri-params
|
(cemerick.url/map->query (->> uri-params
|
||||||
(filter (fn [[k v]] (not-empty v)) )
|
(filter (fn [[k v]] (and v
|
||||||
|
(or (not (seqable? v))
|
||||||
|
(not-empty v)))) )
|
||||||
(map
|
(map
|
||||||
(fn [[k v]]
|
(fn [[k v]]
|
||||||
(if (string? v)
|
(if (string? v)
|
||||||
[k (str "\"" v "\"")])))
|
[k (str "\"" v "\"")]
|
||||||
|
[k v])))
|
||||||
(into {} )))))))
|
(into {} )))))))
|
||||||
|
|
||||||
(re-frame/reg-fx
|
(re-frame/reg-fx
|
||||||
|
|||||||
@@ -189,7 +189,7 @@
|
|||||||
[:tbody.test
|
[:tbody.test
|
||||||
(for [i (range 20)]
|
(for [i (range 20)]
|
||||||
^{:key i}
|
^{:key i}
|
||||||
[:tr
|
[:tr
|
||||||
(for [x (range column-count)]
|
(for [x (range column-count)]
|
||||||
^{:key x}
|
^{:key x}
|
||||||
[:td #_{:col-span column-count}
|
[:td #_{:col-span column-count}
|
||||||
|
|||||||
@@ -62,13 +62,13 @@
|
|||||||
(re-frame/reg-event-fx
|
(re-frame/reg-event-fx
|
||||||
::received
|
::received
|
||||||
(fn [{:keys [db]} [_ id data]]
|
(fn [{:keys [db]} [_ id data]]
|
||||||
|
(println @(re-frame/subscribe [::params id]))
|
||||||
{:db (assoc-in db [::data id] data)
|
{:db (assoc-in db [::data id] data)
|
||||||
:set-uri-params (dissoc @(re-frame/subscribe [::params id]) :client-id)}))
|
:set-uri-params (dissoc @(re-frame/subscribe [::params id]) :client-id)}))
|
||||||
|
|
||||||
(re-frame/reg-event-db
|
(re-frame/reg-event-db
|
||||||
::dispose
|
::dispose
|
||||||
(fn [db [_ id]]
|
(fn [db [_ id]]
|
||||||
(println "TABLE" (::table-params db) (::table-params (update db ::table-params dissoc id)))
|
|
||||||
(-> db
|
(-> db
|
||||||
(update ::data dissoc id)
|
(update ::data dissoc id)
|
||||||
(update ::checked dissoc id)
|
(update ::checked dissoc id)
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
(fn [{:keys [db]} [_ id]]
|
(fn [{:keys [db]} [_ id]]
|
||||||
{:db (-> db
|
{:db (-> db
|
||||||
(assoc-in [::settled-filters id] @(re-frame/subscribe [::filters id]))
|
(assoc-in [::settled-filters id] @(re-frame/subscribe [::filters id]))
|
||||||
(update-in [::table-params id ] dissoc :start))}))
|
(assoc-in [::table-params id :start] 0))}))
|
||||||
|
|
||||||
(re-frame/reg-sub
|
(re-frame/reg-sub
|
||||||
::settled-filters
|
::settled-filters
|
||||||
|
|||||||
Reference in New Issue
Block a user