Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixes; remove test workspaces from db; fix u/new-id
  • Loading branch information
andrew committed Jun 6, 2016
1 parent 446a53e commit caf31f6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/cljs/ulysses/components/basic.cljs
Expand Up @@ -26,7 +26,7 @@

(defn text-input []
"regular text field, with the special ability
to derefence a `forein` reference value,
to derefence a `foreign` reference value,
as well as reset! it if an :on-change is not supplied
ex. [text-input :value my-atom]
ex. [text-input :value my-value :on-change #(dispatch ...)]"
Expand Down
6 changes: 2 additions & 4 deletions src/cljs/ulysses/db.cljs
Expand Up @@ -37,9 +37,7 @@
:grant-ops []

; workspaces (bare-bones)
:workspaces [{:id 1 :name "a" :grant-op-id 1}
{:id 2 :name "b" :grant-op-id 1}
{:id 3 :name "c" :grant-op-id 1}]
:workspaces []

; faculties (extended, with keywords) [builder]
:faculties {}
Expand Down Expand Up @@ -99,7 +97,7 @@
;; interface
;; -------------------------------------------------------------------------

; modal: {:title Hiccup | String, :action-label String :on-action Function :children Hiccup | String
; modal: {:title Hiccup | String, :action-label String :on-action Function :children Hiccup | String}
:modal nil})

(defn refresh-keys
Expand Down
12 changes: 8 additions & 4 deletions src/cljs/ulysses/utils.cljs
Expand Up @@ -89,9 +89,9 @@
"merge multiple seqables of maps by :id; the rightmost having the highest preference"
([a b]
(let [new-ids (map :id b)]
(->> a
(remove #(-> % :id hash-set (some new-ids)))
(concat b))))
(concat
(remove #(-> % :id hash-set (some new-ids)) a)
b)))
([& seqables]
(reduce merge-by-id seqables)))

Expand All @@ -116,7 +116,11 @@
"generate a new integer id, given a list of maps
containing existing integer ids"
[existing]
(->> existing (map :id) (apply max) (inc)))
(->> existing
(map :id)
(cons 0) ; default pre-inc
(apply max)
(inc)))

(defn map-lookup
"map ids to elements retrieved from map,
Expand Down
5 changes: 0 additions & 5 deletions src/sass/components/_range-slider.scss
Expand Up @@ -9,7 +9,6 @@
}

.range-slider::-webkit-slider-runnable-track {
// animate: .2s;
background: $white;
border-radius: 11px;
cursor: pointer;
Expand All @@ -19,8 +18,6 @@

.range-slider::-webkit-slider-thumb {
-webkit-appearance: none;
// border: 0;
// box-shadow: none;
background: $brand-primary;
border-radius: 9px;
cursor: pointer;
Expand All @@ -34,7 +31,6 @@
}

.range-slider::-moz-range-track {
// animate: .2s;
background: $white;
border-radius: 11px;
cursor: pointer;
Expand All @@ -51,7 +47,6 @@
}

.range-slider::-ms-track {
// animate: .2s;
background: transparent;
border-color: transparent;
color: transparent;
Expand Down

0 comments on commit caf31f6

Please sign in to comment.