Skip to content

Commit

Permalink
Update version 0.2.18
Browse files Browse the repository at this point in the history
  • Loading branch information
madvas committed Jul 12, 2016
1 parent 9cf788f commit 1a28136
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 31 deletions.
24 changes: 0 additions & 24 deletions CHANGELOG.md

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,13 +2,13 @@

This library is interop to get [Material-UI](http://www.material-ui.com/#/) working in Clojurescript.

Current Material-UI version: `0.15.1`
Current Material-UI version: `0.15.2`

###### See Om.Next example app here
https://github.com/madvas/cljs-react-material-ui-example

## Installation
- Add `[cljs-react-material-ui "0.2.17"]` to your dependencies
- Add `[cljs-react-material-ui "0.2.18"]` to your dependencies
- Exclude `cljsjs/react` from Om or other React library.
This is because currently material-ui has to be built together with react to get [onTouchTap](http://www.material-ui.com/#/get-started/installation) event [working](http://stackoverflow.com/questions/29881439/react-tap-events-and-material-ui). This will not be needed in future.
for example: `[org.omcljs/om "1.0.0-alpha34" :exclusions [cljsjs/react]]`
Expand Down
4 changes: 2 additions & 2 deletions project.clj
@@ -1,8 +1,8 @@
(defproject cljs-react-material-ui "0.2.17"
(defproject cljs-react-material-ui "0.2.18"
:description "Iterop library for material-ui.com"
:url "https://github.com/madvas/cljs-react-material-ui"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/clojurescript "1.8.40"]
[cljsjs/material-ui "0.15.1-1"]])
[cljsjs/material-ui "0.15.2-0"]])
4 changes: 2 additions & 2 deletions src/cljs_react_material_ui/core.cljs
Expand Up @@ -33,7 +33,6 @@

(defn mui-theme-provider [& args] (create-mui-cmp js/MaterialUIStyles "MuiThemeProvider" args))


(defn app-bar [& args] (create-mui-el "AppBar" args))
(defn auto-complete [& args] (create-mui-el "AutoComplete" args))
(defn avatar [& args] (create-mui-el "Avatar" args))
Expand All @@ -45,6 +44,7 @@
(defn card-title [& args] (create-mui-el "CardTitle" args))
(defn card-text [& args] (create-mui-el "CardText" args))
(defn checkbox [& args] (create-mui-el "Checkbox" args))
(defn chip [& args] (create-mui-el "Chip" args))
(defn circular-progress [& args] (create-mui-el "CircularProgress" args))
(defn date-picker [& args] (create-mui-el "DatePicker" args))
(defn dialog [& args] (create-mui-el "Dialog" args))
Expand All @@ -64,6 +64,7 @@
(defn make-selectable [& args] (create-mui-el "MakeSelectable" args))
(defn menu [& args] (create-mui-el "Menu" args))
(defn menu-item [& args] (create-mui-el "MenuItem" args))
(defn mui-theme-provider [& args] (create-mui-el "MuiThemeProvider" args))
(defn paper [& args] (create-mui-el "Paper" args))
(defn popover [& args] (create-mui-el "Popover" args))
(defn radio-button [& args] (create-mui-el "RadioButton" args))
Expand Down Expand Up @@ -98,4 +99,3 @@
(defn toolbar-title [& args] (create-mui-el "ToolbarTitle" args))



4 changes: 4 additions & 0 deletions src/cljs_react_material_ui/elements.clj
@@ -1,6 +1,8 @@
(ns cljs-react-material-ui.elements
(:require [cljs-react-material-ui.core :as m]))

; export (\w*) .*
; $1
(def tags
'[
AppBar
Expand All @@ -14,6 +16,7 @@
CardTitle
CardText
Checkbox
Chip
CircularProgress
DatePicker
Dialog
Expand All @@ -33,6 +36,7 @@
MakeSelectable
Menu
MenuItem
MuiThemeProvider
Paper
Popover
RadioButton
Expand Down
2 changes: 2 additions & 0 deletions src/cljs_react_material_ui/reagent.cljs
Expand Up @@ -15,6 +15,7 @@
(def card-title (r/adapt-react-class (aget js/MaterialUI "CardTitle")))
(def card-text (r/adapt-react-class (aget js/MaterialUI "CardText")))
(def checkbox (r/adapt-react-class (aget js/MaterialUI "Checkbox")))
(def chip (r/adapt-react-class (aget js/MaterialUI "Chip")))
(def circular-progress (r/adapt-react-class (aget js/MaterialUI "CircularProgress")))
(def date-picker (r/adapt-react-class (aget js/MaterialUI "DatePicker")))
(def dialog (r/adapt-react-class (aget js/MaterialUI "Dialog")))
Expand All @@ -34,6 +35,7 @@
(def make-selectable (r/adapt-react-class (aget js/MaterialUI "MakeSelectable")))
(def menu (r/adapt-react-class (aget js/MaterialUI "Menu")))
(def menu-item (r/adapt-react-class (aget js/MaterialUI "MenuItem")))
(def mui-theme-provider (r/adapt-react-class (aget js/MaterialUI "MuiThemeProvider")))
(def paper (r/adapt-react-class (aget js/MaterialUI "Paper")))
(def popover (r/adapt-react-class (aget js/MaterialUI "Popover")))
(def radio-button (r/adapt-react-class (aget js/MaterialUI "RadioButton")))
Expand Down
4 changes: 3 additions & 1 deletion src/cljs_react_material_ui/rum.cljs
Expand Up @@ -17,6 +17,7 @@
(def card-title (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "CardTitle"))
(def card-text (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "CardText"))
(def checkbox (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Checkbox"))
(def chip (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Chip"))
(def circular-progress (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "CircularProgress"))
(def date-picker (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "DatePicker"))
(def dialog (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Dialog"))
Expand All @@ -36,6 +37,7 @@
(def make-selectable (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "MakeSelectable"))
(def menu (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Menu"))
(def menu-item (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "MenuItem"))
(def mui-theme-provider (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "MuiThemeProvider"))
(def paper (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Paper"))
(def popover (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Popover"))
(def radio-button (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "RadioButton"))
Expand Down Expand Up @@ -67,4 +69,4 @@
(def toolbar (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Toolbar"))
(def toolbar-group (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarGroup"))
(def toolbar-separator (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarSeparator"))
(def toolbar-title (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarTitle"))
(def toolbar-title (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarTitle"))

0 comments on commit 1a28136

Please sign in to comment.