Skip to content

Commit ecf71ea

Browse files
committed
Remove coffee script dependency
1 parent 9a7993b commit ecf71ea

File tree

4 files changed

+29
-37
lines changed

4 files changed

+29
-37
lines changed

active_admin_datetimepicker.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
1919
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
2020
spec.require_paths = ["lib"]
2121

22-
spec.add_dependency "coffee-rails"
23-
spec.add_dependency "activeadmin", ">= 1.1", "< 3.a"
22+
spec.add_dependency "activeadmin", ">= 2.0", "< 3.a"
2423
spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.4"
2524
end
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//= require jquery.xdan.datetimepicker.full
2+
3+
function setupDateTimePicker(container) {
4+
const defaults = {
5+
formatDate: 'y-m-d',
6+
format: 'Y-m-d H:i',
7+
allowBlank: true,
8+
defaultSelect: false,
9+
validateOnBlur: false
10+
}
11+
12+
$(container).find('input.date-time-picker').each(function(index, entry) {
13+
$(entry).datetimepicker($.extend(defaults, $(entry).data('datepicker-options')));
14+
});
15+
}
16+
17+
function initXdanDateTimePickerPlugin() {
18+
setupDateTimePicker($('body'));
19+
$(document).on('has_many_add:after', '.has_many_container', function(e, fieldset) {
20+
setupDateTimePicker(fieldset);
21+
});
22+
}
23+
24+
$(document).ready(initXdanDateTimePickerPlugin);
25+
$(document).on('turbolinks:load', initXdanDateTimePickerPlugin());

app/assets/javascripts/active_admin_datetimepicker.js.coffee

Lines changed: 0 additions & 26 deletions
This file was deleted.

spec/support/rails_template.rb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@
2727
"@import \"active_admin_datetimepicker\";\n",
2828
after: "@import \"active_admin/base\";\n"
2929

30-
if File.file?("app/assets/javascripts/active_admin.js.coffee")
31-
inject_into_file "app/assets/javascripts/active_admin.js.coffee",
32-
"#= require active_admin_datetimepicker\n",
33-
after: "#= require active_admin/base\n"
34-
else
35-
inject_into_file "app/assets/javascripts/active_admin.js",
36-
"//= require active_admin_datetimepicker\n",
37-
after: "//= require active_admin/base\n"
38-
end
30+
inject_into_file "app/assets/javascripts/active_admin.js",
31+
"//= require active_admin_datetimepicker\n",
32+
after: "//= require active_admin/base\n"
3933

4034
run "rm -r test"
4135
run "rm -r spec"

0 commit comments

Comments
 (0)