Permalink
Browse files

uses com.8thlight/hiccup

  • Loading branch information...
1 parent 7eb0623 commit 41d17e1b28b0abea3ab2905cfff8eb99aeed225a @slagyr slagyr committed Dec 18, 2013
View
@@ -1,4 +1,8 @@
+# 1.1.3
+
+* switched hiccups library to com.8thlight/hiccup 1.1.1
+
# 1.1.2
* autocomplete field - improved key event handling
-* autocomplete field does not throttle by default. Throttling is configurable.
+* autocomplete field does not throttle by default. Throttling is configurable.
View
@@ -1,10 +1,10 @@
-(defproject com.8thlight/filament "1.1.2"
+(defproject com.8thlight/filament "1.1.3"
:description "Rich client utilities"
:url "http://github.com/8thlight/filament"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
- :dependencies [[hiccups "0.2.0"]
+ :dependencies [[com.8thlight/hiccup "1.1.1"]
[org.clojure/clojure "1.5.1"]
[org.clojars.trptcolin/core.async "0.1.242.1"] ; waiting on core/merge -> cljs.core/merge fix
[org.clojars.trptcolin/domina "1.0.2.1"] ; waiting on release including https://github.com/levand/domina/pull/65
@@ -1,5 +1,5 @@
(ns com.eighthlight.filament.autocomplete-field-spec
- (:require-macros [hiccups.core :as h]
+ (:require-macros [hiccup.core :as h]
[specljs.core :refer [describe context it should= should-contain with before around should-invoke should-not-invoke]])
(:require [com.eighthlight.filament.async :as async]
[com.eighthlight.filament.autocomplete-field :as ac]
@@ -9,6 +9,7 @@
[domina :as dom]
[domina.css :as css]
[domina.events :as event]
+ [hiccup.core]
[specljs.core]))
(describe "Autocomplete Field"
@@ -1,10 +1,11 @@
(ns com.eighthlight.filament.forms-spec
- (:require-macros [hiccups.core :as h]
+ (:require-macros [hiccup.core :as h]
[specljs.core :refer [describe context it should= with before around should-contain should-not-contain]])
(:require [com.eighthlight.filament.forms :as forms]
[com.eighthlight.filament.spec-helper :as helper]
[domina :as dom]
[domina.css :as css]
+ [hiccup.core]
[specljs.core]))
(describe "Forms"
@@ -1,10 +1,11 @@
(ns com.eighthlight.filament.fx-spec
- (:require-macros [hiccups.core :as h]
+ (:require-macros [hiccup.core :as h]
[specljs.core :refer [describe it should=]])
(:require [com.eighthlight.filament.fx :as fx]
[com.eighthlight.filament.spec-helper :as helper]
[domina :as dom]
[domina.css :as css]
+ [hiccup.core]
[specljs.core]))
(describe "FX"
@@ -1,5 +1,5 @@
(ns com.eighthlight.filament.inplace-field-spec
- (:require-macros [hiccups.core :as h]
+ (:require-macros [hiccup.core :as h]
[specljs.core :refer [describe context it should= with before around should-contain should-not-contain stub with-stubs should-have-invoked should-not-have-invoked]])
(:require [com.eighthlight.filament.fx :as fx]
[com.eighthlight.filament.inplace-field :as inplace]
@@ -9,6 +9,7 @@
[domina :as dom]
[domina.css :as css]
[domina.events :as event]
+ [hiccup.core]
[specljs.core]))
(describe "Inplace Field"
@@ -1,10 +1,11 @@
(ns com.eighthlight.filament.util-spec
- (:require-macros [hiccups.core :as h]
+ (:require-macros [hiccup.core :as h]
[specljs.core :refer [should should-not describe context it should= with before]])
(:require [com.eighthlight.filament.spec-helper :as helper]
[com.eighthlight.filament.util :as util]
[domina :as dom]
[domina.css :as css]
+ [hiccup.core]
[specljs.core]))
(describe "Util"
@@ -43,4 +44,4 @@
(it "returns whether a search term is not blank"
(should (util/not-blank? "search term"))
(should-not (util/not-blank? ""))
- (should-not (util/not-blank? " ")))))
+ (should-not (util/not-blank? " ")))))
@@ -1,13 +1,14 @@
(ns com.eighthlight.filament.autocomplete-field
- (:require-macros [hiccups.core :as h])
+ (:require-macros [hiccup.core :as h])
(:require [clojure.string :as string]
[com.eighthlight.filament.async :as async]
[com.eighthlight.filament.fx :as fx]
[com.eighthlight.filament.util :as util]
[domina :as dom]
[domina.css :as css]
[domina.events :as event]
- [goog.style]))
+ [goog.style]
+ [hiccup.core]))
(defn- dropdown [] (dom/by-id "autocomplete-dropdown"))
@@ -1,5 +1,4 @@
(ns com.eighthlight.filament.forms
- (:require-macros [hiccups.core :as h])
(:require [clojure.string :as str]
[domina :as dom]
[domina.css :as css]
@@ -1,12 +1,13 @@
(ns com.eighthlight.filament.fx
- (:require-macros [hiccups.core :as h])
+ (:require-macros [hiccup.core :as h])
(:require [com.eighthlight.filament.util :as util]
[domina :as dom]
[domina.css :as css]
[domina.events :as event]
[goog.dom.forms :as forms]
[goog.fx.easing :as ease]
- [goog.fx.dom]))
+ [goog.fx.dom]
+ [hiccup.core]))
(defn calc-duration [options]
(or (:duration options) 500))
@@ -1,11 +1,11 @@
(ns com.eighthlight.filament.inplace-field
- (:require-macros [hiccups.core :as h])
+ (:require-macros [hiccup.core :as h])
(:require [com.eighthlight.filament.fx :as fx]
[com.eighthlight.filament.util :as util]
[domina :as dom]
[domina.css :as css]
[domina.events :as event]
- [hiccups.runtime]))
+ [hiccup.core]))
(def text-input [:input.inplace-field-input {:type "text"}])
@@ -1,10 +1,11 @@
(ns com.eighthlight.filament.modal
- (:require-macros [hiccups.core :as h])
+ (:require-macros [hiccup.core :as h])
(:require [com.eighthlight.filament.util :as util]
[com.eighthlight.filament.fx :as fx]
[domina :as dom]
[domina.css :as css]
- [domina.events :as event]))
+ [domina.events :as event]
+ [hiccup.core]))
(defn modal-view
([id] (modal-view id "modal"))
@@ -1,11 +1,11 @@
(ns com.eighthlight.filament.util
- (:require-macros [hiccups.core :as h])
+ (:require-macros [hiccup.core :as h])
(:require [clojure.string :as string]
[clojure.walk :as walk]
[domina :as dom]
[domina.css :as css]
[domina.events :as event]
- [hiccups.runtime]))
+ [hiccup.core]))
(defn ->options
"Takes keyword argument and converts them to a map. If the args are prefixed with a map, the rest of the

0 comments on commit 41d17e1

Please sign in to comment.