upgrade flatpickr

googed · May 11, 2018 · babf2c5 · babf2c5
1 parent 52f0f12
commit babf2c5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "public/vendor/shepherd"]
 	path = public/vendor/shepherd
 	url = https://github.com/HubSpot/shepherd
-[submodule "public/vendor/flatpickr"]
-	path = public/vendor/flatpickr
-	url = https://github.com/chmln/flatpickr
 [submodule "public/vendor/bar-rating"]
 	path = public/vendor/bar-rating
 	url = https://github.com/antennaio/jquery-bar-rating
diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala
@@ -80,6 +80,10 @@ trait AssetHelper { self: I18nHelper =>
     s"""<script async defer src="${staticUrl("javascripts/vendor/fp2.min.js")}"></script>"""
   }
 
+  val flatpickrTag = Html {
+    s"""<script async defer src="${staticUrl("javascripts/vendor/flatpickr.min.js")}"></script>"""
+  }
+
   private def cdnOrLocal(cdn: String, test: String, local: String) = Html {
     if (isProd)
       s"""<script src="$cdn"></script><script>$test || document.write('<script src="$local">\\x3C/script>')</script>"""

diff --git a/public/javascripts/vendor/flatpickr.min.js b/public/javascripts/vendor/flatpickr.min.js
diff --git a/public/stylesheets/flatpickr.css b/public/stylesheets/flatpickr.css
diff --git a/public/stylesheets/material.form.css b/public/stylesheets/material.form.css
@@ -164,6 +164,7 @@ body.dark .material.form .form-group select option {
 }
 .material.form .form-group select ~ .control-label,
 .material.form .form-group input:focus ~ .control-label,
+.material.form .form-group input.flatpickr ~ .control-label,
 .material.form .form-group input:valid ~ .control-label,
 .material.form .form-group input.form-file ~ .control-label,
 .material.form .form-group input.has-value ~ .control-label,

diff --git a/public/vendor/flatpickr b/public/vendor/flatpickr