Skip to content

Remove xdan-datetimepicker-rails dependency #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Add the following line into `app/assets/javascripts/active_admin.js`:

## Usage

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).
This plugin adds the `date_time_picker` input and `date_time_range` filter, which use the [XDSoft DateTime Picker](https://github.com/xdan/datetimepicker/).

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

Expand Down
1 change: 0 additions & 1 deletion active_admin_datetimepicker.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]

spec.add_dependency "activeadmin", ">= 2.0", "< 3.a"
spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.4"
end
2 changes: 1 addition & 1 deletion app/assets/javascripts/active_admin_datetimepicker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//= require jquery.xdan.datetimepicker.full
//= require vendor/jquery.datetimepicker.full

function setupDateTimePicker(container) {
const defaults = {
Expand Down
2,911 changes: 2,911 additions & 0 deletions app/assets/javascripts/vendor/jquery.datetimepicker.full.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/assets/stylesheets/active_admin_datetimepicker.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'vendor/jquery.datetimepicker';

form.filter_form {
.filter_form_field {
&.filter_date_time_range {
Expand Down
Loading