Skip to content

Commit 74a60c0

Browse files
committed
Remove dependency on rails-assets-webui-popover
The rails-assets-webui-popover require jquery gem from rails-assets.com, which is conflict with the jquery gem require by activeadmin. It makes all the default codes using jquery in active admin behave strangely. Resolution: Remove the gem, add the webui-popover code directly into gem.
1 parent 9706642 commit 74a60c0

File tree

8 files changed

+1574
-18
lines changed

8 files changed

+1574
-18
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## VERSION 0.2
2+
3+
- Remove gem 'rails-assets-webui-popover' from https://rails-assets.org to avoid conflict with active admin jquery.
4+
- Add Webui popover source code.

Gemfile.lock

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
PATH
22
remote: .
33
specs:
4-
activeadmin-regex-input (0.0.0)
5-
activeadmin (~> 1.0)
6-
jquery-rails
4+
activeadmin-regex-input (0.2.0)
5+
activeadmin
76

87
GEM
98
remote: https://rubygems.org/

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,17 @@ A simple filter input for active admin with checking at client if input match pr
99
## Dependency
1010

1111
* activeadmin 1.0.0 pre
12-
* rails-assets-webui-popover (Require manual install)
13-
* jquery-rails 3.1
1412

1513
## Installation
1614

1715
Add following lines to the Gemfile:
1816

1917
```ruby
20-
gem 'rails-assets-webui-popover', source: 'https://rails-assets.org'
2118
gem 'activeadmin-regex-input', '~> 0.1'
2219
```
2320

2421
Then execute `bundle` to install to your activeadmin project.
2522

26-
2723
## Usage
2824
In the index section of activeadmin controller:
2925
```ruby
@@ -33,4 +29,8 @@ filter :sample_regex,
3329
example: '123'
3430
```
3531

36-
The regex option is the string representation of the regex. This must compatible with javascript default regex engine. Currently the server side validation isn't included.
32+
The regex option is the string representation of the regex. This must compatible with javascript default regex engine. Currently the server side validation isn't included.
33+
34+
## Thanks
35+
36+
Thank sandywalker for beautiful jquery popover library [webui-popover](https://github.com/sandywalker/webui-popover).

activeadmin-regex-input.gemspec

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ require 'activeadmin/regex-input/version'
44

55
Gem::Specification.new do |s|
66
s.name = 'activeadmin-regex-input'
7-
s.version = '0.1.1'
7+
s.version = '0.2.0'
88
s.date = '2018-03-14'
9-
s.summary = "Formtastic Regex Input"
9+
s.summary = "Active Admin Regex Input"
1010
s.description = "A simple filter input for active admin with checking at client if input match predefined regex."
1111
s.authors = ["Canh Nguyen"]
1212
s.email = '[email protected]'
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
1919
s.add_development_dependency "rake", "~> 12"
2020

2121
s.add_runtime_dependency 'activeadmin'
22-
s.add_runtime_dependency 'jquery-rails', '~> 3.1'
2322
end

0 commit comments

Comments
 (0)