Skip to content

Commit 1107e64

Browse files
authored
Merge pull request #77 from Skumring/remove-xdan-datetimepicker-rails-dependency
Remove xdan-datetimepicker-rails dependency
2 parents 092de0d + a5a415e commit 1107e64

File tree

8 files changed

+3483
-8
lines changed

8 files changed

+3483
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Add the following line into `app/assets/javascripts/active_admin.js`:
3939

4040
## Usage
4141

42-
This plugin adds the `date_time_picker` input and `date_time_range` filter, which use the [XDSoft DateTime Picker gem](https://github.com/shekibobo/xdan-datetimepicker-rails).
42+
This plugin adds the `date_time_picker` input and `date_time_range` filter, which use the [XDSoft DateTime Picker](https://github.com/xdan/datetimepicker/).
4343

4444
The `date_time_picker` input accepts many of the options available to the standard jQueryUI Datepicker. For example:
4545

active_admin_datetimepicker.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ Gem::Specification.new do |spec|
2020
spec.require_paths = ["lib"]
2121

2222
spec.add_dependency "activeadmin", ">= 2.0", "< 3.a"
23-
spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.4"
2423
end

app/assets/javascripts/active_admin_datetimepicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//= require jquery.xdan.datetimepicker.full
1+
//= require vendor/jquery.datetimepicker.full
22

33
function setupDateTimePicker(container) {
44
const defaults = {

app/assets/javascripts/vendor/jquery.datetimepicker.full.js

Lines changed: 2911 additions & 0 deletions
Large diffs are not rendered by default.

app/assets/stylesheets/active_admin_datetimepicker.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import 'vendor/jquery.datetimepicker';
2+
13
form.filter_form {
24
.filter_form_field {
35
&.filter_date_time_range {

0 commit comments

Comments
 (0)