Merge pull request #13 from kickinespresso/master

Fivell · Fivell · commit bf71bce95582 · 2016-03-10T11:18:26.000+02:00
Fix asset path for newer version of xdan-datetimepicker-rails, subsequently datetimepicker
diff --git a/active_admin_datetimepicker.gemspec b/active_admin_datetimepicker.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "xdan-datetimepicker-rails", "~> 2.4"
+  spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
 
diff --git a/app/assets/javascripts/active_admin_datetimepicker.js.coffee b/app/assets/javascripts/active_admin_datetimepicker.js.coffee
@@ -1,4 +1,4 @@
-#= require jquery.xdan.datetimepicker
+#= require jquery.xdan.datetimepicker.full
 
 @setupDateTimePicker = (container) ->
   defaults = {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#= require jquery.xdan.datetimepicker`
	`1`	`+#= require jquery.xdan.datetimepicker.full`
`2`	`2`
`3`	`3`	`@setupDateTimePicker = (container) ->`
`4`	`4`	`defaults = {`