Remove obsolete usage of reader macro #ux/tr.

This commit is contained in:
Andrey Antukh 2016-04-14 21:39:50 +03:00
parent 48171bbecc
commit debc68661a
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
7 changed files with 14 additions and 29 deletions

View file

@ -1,8 +1,4 @@
(require '[cljs.build.api :as b] (require '[cljs.build.api :as b])
'[cljs.tagged-literals])
(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
(println "Building ...") (println "Building ...")

View file

@ -1,8 +1,4 @@
(require '[cljs.build.api :as b] (require '[cljs.build.api :as b])
'[cljs.tagged-literals])
(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
(println "Building ...") (println "Building ...")

View file

@ -1,9 +1,5 @@
(require '[figwheel-sidecar.repl :as r] (require '[figwheel-sidecar.repl :as r]
'[figwheel-sidecar.repl-api :as ra] '[figwheel-sidecar.repl-api :as ra])
'[cljs.tagged-literals])
(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
(ra/start-figwheel! (ra/start-figwheel!
{:figwheel-options {:css-dirs ["resources/public/css"]} {:figwheel-options {:css-dirs ["resources/public/css"]}

View file

@ -1,8 +1,4 @@
(require '[cljs.build.api :as b] (require '[cljs.build.api :as b])
'[cljs.tagged-literals])
(alter-var-root #'cljs.tagged-literals/*cljs-data-readers*
assoc 'ux/tr (fn [v] `(uxbox.locales/tr ~v)))
(b/watch (b/inputs "src" "vendor" "test") (b/watch (b/inputs "src" "vendor" "test")
{:main 'uxbox.test-runner {:main 'uxbox.test-runner

View file

@ -57,7 +57,7 @@
(html (html
[:div.dashboard-title {} [:div.dashboard-title {}
[:h2 {} [:h2 {}
[:span #ux/tr "ds.library-title"] [:span (tr "ds.library-title")]
[:span {:content-editable "" [:span {:content-editable ""
:on-key-up on-title-edited} :on-key-up on-title-edited}
(:name coll)]] (:name coll)]]

View file

@ -9,7 +9,7 @@
(:require [sablono.core :as html :refer-macros [html]] (:require [sablono.core :as html :refer-macros [html]]
[rum.core :as rum] [rum.core :as rum]
[lentes.core :as l] [lentes.core :as l]
[uxbox.locales] [uxbox.locales :refer (tr)]
[uxbox.router :as r] [uxbox.router :as r]
[uxbox.rstore :as rs] [uxbox.rstore :as rs]
[uxbox.state :as s] [uxbox.state :as s]
@ -42,13 +42,13 @@
(header-link :dashboard/projects i/logo)] (header-link :dashboard/projects i/logo)]
[:ul.main-nav [:ul.main-nav
[:li {:class (when projects? "current")} [:li {:class (when projects? "current")}
(header-link :dashboard/projects #ux/tr "ds.projects")] (header-link :dashboard/projects (tr "ds.projects"))]
[:li {:class (when elements? "current")} [:li {:class (when elements? "current")}
(header-link :dashboard/elements #ux/tr "ds.elements")] (header-link :dashboard/elements (tr "ds.elements"))]
[:li {:class (when icons? "current")} [:li {:class (when icons? "current")}
(header-link :dashboard/icons #ux/tr "ds.icons")] (header-link :dashboard/icons (tr "ds.icons"))]
[:li {:class (when colors? "current")} [:li {:class (when colors? "current")}
(header-link :dashboard/colors #ux/tr "ds.colors")]] (header-link :dashboard/colors (tr "ds.colors"))]]
(ui.u/user)]))) (ui.u/user)])))
(def ^:static header (def ^:static header

View file

@ -12,6 +12,7 @@
[uxbox.state :as st] [uxbox.state :as st]
[uxbox.rstore :as rs] [uxbox.rstore :as rs]
[uxbox.schema :as sc] [uxbox.schema :as sc]
[uxbox.locales :refer (tr)]
[uxbox.library :as library] [uxbox.library :as library]
[uxbox.data.dashboard :as dd] [uxbox.data.dashboard :as dd]
[uxbox.ui.icons :as i] [uxbox.ui.icons :as i]
@ -36,7 +37,7 @@
(html (html
[:div.dashboard-title {} [:div.dashboard-title {}
[:h2 {} [:h2 {}
[:span #ux/tr "ds.library-title"] [:span (tr "ds.library-title")]
[:span {:content-editable "" [:span {:content-editable ""
:on-key-up (constantly nil)} :on-key-up (constantly nil)}
(:name coll)]] (:name coll)]]
@ -68,10 +69,10 @@
[:ul.library-tabs [:ul.library-tabs
[:li {:class-name (when builtin? "current") [:li {:class-name (when builtin? "current")
:on-click #(rs/emit! (dd/set-collection-type :builtin))} :on-click #(rs/emit! (dd/set-collection-type :builtin))}
#ux/tr "ds.standard-title"] (tr "ds.standard-title")]
[:li {:class-name (when own? "current") [:li {:class-name (when own? "current")
:on-click #(rs/emit! (dd/set-collection-type :own))} :on-click #(rs/emit! (dd/set-collection-type :own))}
#ux/tr "ds.your-libraries-title"]] (tr "ds.your-libraries-title")]]
[:ul.library-elements [:ul.library-elements
(when own? (when own?
[:li [:li