active_scaffold_sortable 3.1.0 → 3.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/frontends/default/views/{on_create.js.rjs → on_create.js.erb} +9 -3
  2. data/frontends/default/views/{on_update.js.rjs → on_update.js.erb} +9 -3
  3. data/frontends/default/views/reorder.js.erb +1 -0
  4. data/lib/active_scaffold_sortable/version.rb +1 -1
  5. metadata +19 -19
  6. data/frontends/default/views/reorder.js.rjs +0 -1
data/frontends/default/views/{on_create.js.rjs → on_create.js.erb} RENAMED
@@ -1,10 +1,16 @@
1
- page << render(:super, :locals => {:insert_at => :bottom})
1
+ <%= render(:super, :locals => {:insert_at => :bottom}) %>
2
+ <%
2
3
  unless nested_singular_association?
3
4
  if ActiveScaffold.js_framework == :prototype
4
- page.sortable(*sort_params)
5
+ %>
6
+ <%= sortable_element_js(*sort_params) %>
7
+ <%
5
8
  elsif ActiveScaffold.js_framework == :jquery
6
9
  reorder_params = {}
7
10
  reorder_params[:eid] = params[:eid] unless params[:eid].blank?
8
- page << "ActiveScaffold.sortable('#{sort_params[0]}', #{controller_name.to_json}, #{reorder_params.to_json});"
11
+ %>
12
+ <%= "ActiveScaffold.sortable('#{sort_params[0]}', #{controller_name.to_json}, #{reorder_params.to_json});" %>
13
+ <%
9
14
  end if controller.send :successful?
10
15
  end
16
+ %>
data/frontends/default/views/{on_update.js.rjs → on_update.js.erb} RENAMED
@@ -1,11 +1,17 @@
1
- page << render(:super)
1
+ <%= render(:super) %>
2
+ <%
2
3
  # if we are currently editing a nested belongs_to association do not do any sorting stuff
3
4
  unless nested_singular_association?
4
5
  if ActiveScaffold.js_framework == :prototype
5
- page.sortable(*sort_params)
6
+ %>
7
+ <%= sortable_element_js(*sort_params) %>
8
+ <%
6
9
  elsif ActiveScaffold.js_framework == :jquery
7
10
  reorder_params = {}
8
11
  reorder_params[:eid] = params[:eid] unless params[:eid].blank?
9
- page << "ActiveScaffold.sortable('#{sort_params[0]}', #{controller_name.to_json}, #{reorder_params.to_json});"
12
+ %>
13
+ <%= "ActiveScaffold.sortable('#{sort_params[0]}', #{controller_name.to_json}, #{reorder_params.to_json});" %>
14
+ <%
10
15
  end if controller.send :successful?
11
16
  end
17
+ %>
data/frontends/default/views/reorder.js.erb ADDED
@@ -0,0 +1 @@
1
+ ActiveScaffold.stripe('<%= active_scaffold_tbody_id %>');
data/lib/active_scaffold_sortable/version.rb CHANGED
@@ -2,7 +2,7 @@ module ActiveScaffoldSortable
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 1
5
- PATCH = 0
5
+ PATCH = 1
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold_sortable
3
3
  version: !ruby/object:Gem::Version
4
- hash: 3
4
+ hash: 1
5
5
  prerelease:
6
6
  segments:
7
7
  - 3
8
8
  - 1
9
- - 0
10
- version: 3.1.0
9
+ - 1
10
+ version: 3.1.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Sergio Cambra
@@ -16,10 +16,10 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-09-15 00:00:00 Z
19
+ date: 2012-01-16 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
- requirement: &id001 !ruby/object:Gem::Requirement
22
+ version_requirements: &id001 !ruby/object:Gem::Requirement
23
23
  none: false
24
24
  requirements:
25
25
  - - ">="
@@ -28,12 +28,12 @@ dependencies:
28
28
  segments:
29
29
  - 0
30
30
  version: "0"
31
+ requirement: *id001
32
+ prerelease: false
31
33
  type: :development
32
34
  name: shoulda
33
- version_requirements: *id001
34
- prerelease: false
35
35
  - !ruby/object:Gem::Dependency
36
- requirement: &id002 !ruby/object:Gem::Requirement
36
+ version_requirements: &id002 !ruby/object:Gem::Requirement
37
37
  none: false
38
38
  requirements:
39
39
  - - ~>
@@ -44,12 +44,12 @@ dependencies:
44
44
  - 0
45
45
  - 0
46
46
  version: 1.0.0
47
+ requirement: *id002
48
+ prerelease: false
47
49
  type: :development
48
50
  name: bundler
49
- version_requirements: *id002
50
- prerelease: false
51
51
  - !ruby/object:Gem::Dependency
52
- requirement: &id003 !ruby/object:Gem::Requirement
52
+ version_requirements: &id003 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ">="
@@ -58,12 +58,12 @@ dependencies:
58
58
  segments:
59
59
  - 0
60
60
  version: "0"
61
+ requirement: *id003
62
+ prerelease: false
61
63
  type: :development
62
64
  name: rcov
63
- version_requirements: *id003
64
- prerelease: false
65
65
  - !ruby/object:Gem::Dependency
66
- requirement: &id004 !ruby/object:Gem::Requirement
66
+ version_requirements: &id004 !ruby/object:Gem::Requirement
67
67
  none: false
68
68
  requirements:
69
69
  - - ~>
@@ -73,10 +73,10 @@ dependencies:
73
73
  - 3
74
74
  - 0
75
75
  version: "3.0"
76
+ requirement: *id004
77
+ prerelease: false
76
78
  type: :runtime
77
79
  name: active_scaffold
78
- version_requirements: *id004
79
- prerelease: false
80
80
  description: Sort Tree or List Structures by Drag n Drop
81
81
  email: activescaffold@googlegroups.com
82
82
  executables: []
@@ -88,9 +88,9 @@ extra_rdoc_files:
88
88
  - README.textile
89
89
  files:
90
90
  - app/assets/stylesheets/active_scaffold_sortable.css
91
- - frontends/default/views/on_create.js.rjs
92
- - frontends/default/views/on_update.js.rjs
93
- - frontends/default/views/reorder.js.rjs
91
+ - frontends/default/views/on_create.js.erb
92
+ - frontends/default/views/on_update.js.erb
93
+ - frontends/default/views/reorder.js.erb
94
94
  - frontends/default/views/_list_with_header.html.erb
95
95
  - lib/active_scaffold/actions/sortable.rb
96
96
  - lib/active_scaffold/config/sortable.rb
data/frontends/default/views/reorder.js.rjs DELETED
@@ -1 +0,0 @@
1
- page << "ActiveScaffold.stripe('#{active_scaffold_tbody_id}');"