Skip to content

Commit 242986e

Browse files
authored
Merge pull request #18 from workgena/drop_coffee_script
Convert CoffeeScript to JavaScript
2 parents 9d7e829 + 638bad0 commit 242986e

File tree

5 files changed

+46
-49
lines changed

5 files changed

+46
-49
lines changed

.travis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
sudo: required
2+
23
language: ruby
4+
35
addons:
46
chrome: stable
57

6-
before_install: gem install bundler -v 1.17.1
8+
before_install:
9+
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
10+
- gem install bundler -v '< 2'
711

812
script: bundle exec rspec
913

1014
env:
1115
matrix:
1216
- RAILS=5.1.6 AA=1.1.0
13-
- RAILS=5.1.6 AA=1.2.1
14-
- RAILS=5.2.1 AA=1.3.1
1517
- RAILS=5.2.1 AA=1.4.0
1618

1719
rvm:
18-
- 2.3
19-
- 2.5
20+
- 2.4
21+
- 2.6

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ source 'https://rubygems.org'
44
gemspec
55

66
group :test do
7-
gem 'rails', "#{ENV['RAILS'] || '5.2.1'}"
8-
gem 'activeadmin', "#{ENV['AA'] || '1.3.1'}"
7+
gem 'rails', "~> #{ENV['RAILS'] || '5.2.1'}"
8+
gem 'activeadmin', "~> #{ENV['AA'] || '1.3.1'}"
99

1010
gem 'rspec-rails'
11-
gem 'sqlite3'
11+
gem 'sqlite3', '~> 1.3.6'
1212
gem 'database_cleaner'
1313
gem 'capybara'
1414
gem 'selenium-webdriver'

README.md

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,25 @@ Provides ability to manipulate sidebar position for ActiveAdmin (tested with Act
44

55
## Install
66

7+
Add following line to the `Gemfile`
8+
79
```ruby
810
gem 'active_admin_sidebar'
9-
# or latest from GitHub
10-
gem 'active_admin_sidebar', git: 'https://github.com/activeadmin-plugins/active_admin_sidebar.git'
1111
```
1212

13-
Add including of CSS file
13+
Add following line to the `app/assets/stylesheets/active_admin.css.scss`
1414

1515
```scss
1616
@import "active_admin_sidebar";
1717
```
1818

19-
to the
20-
```
21-
app/assets/stylesheets/active_admin.css.scss
22-
```
23-
24-
And including of coffee file (optional, need only for collapsed sidebar)
19+
If you want to use collapsing feature, add following line
2520

26-
```coffeescript
27-
#= require active_admin_sidebar
21+
```javascripts
22+
//= require active_admin_sidebar
2823
```
2924

30-
to the
31-
32-
```scss
33-
app/assets/javascripts/active_admin.js
34-
```
25+
to the `app/assets/javascripts/active_admin.js`
3526

3627
# Configuration per resource
3728

app/assets/javascripts/active_admin_sidebar.coffee

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
(function() {
2+
$(document).ready(function() {
3+
var $aa_content, set_collapsed_sidebar;
4+
if ($('body').hasClass('index') && ($('#active_admin_content').hasClass('collapsible_sidebar'))) {
5+
$aa_content = $('#active_admin_content');
6+
$aa_content.find('.sidebar_section:first>h3').append('<span class="collapse_btn icono-caret-left" title="Hide sidebar"></span>');
7+
$aa_content.prepend('<span class="uncollapse_btn icono-caret-right" title="Show sidebar"></span>');
8+
set_collapsed_sidebar = function(value) {
9+
return $.getJSON(this.href, {
10+
collapsed_sidebar: value
11+
});
12+
};
13+
return $aa_content.on('click', '.collapse_btn, .uncollapse_btn', function(e) {
14+
if (!$aa_content.hasClass('collapsed_sidebar')) {
15+
set_collapsed_sidebar(true);
16+
$aa_content.removeClass('left_sidebar');
17+
$aa_content.addClass('collapsed_sidebar');
18+
return $aa_content.trigger('collapsible_sidebar:collapsed');
19+
} else {
20+
set_collapsed_sidebar(false);
21+
$aa_content.removeClass('collapsed_sidebar');
22+
$aa_content.addClass('left_sidebar');
23+
return $aa_content.trigger('collapsible_sidebar:uncollapsed');
24+
}
25+
});
26+
}
27+
});
28+
29+
}).call(this);

0 commit comments

Comments
 (0)