active_scaffold_vho 3.0.29 → 3.0.30

Sign up to get free protection for your applications and to get access to all the features.
@@ -1175,12 +1175,20 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
1175
1175
 
1176
1176
  if (this.position == 'after') {
1177
1177
  this.target.after(this.wrap_with_adapter_html(content, should_refresh_data));
1178
- ActiveScaffold.trigger_load_events(this.target.next().find('.records').first().find('> [data-as_load]'));
1178
+ if(this.action == 'index') {
1179
+ ActiveScaffold.trigger_load_events(this.target.next().find('.records').first().find('> [data-as_load]'));
1180
+ } else {
1181
+ ActiveScaffold.trigger_load_events(this.target.next().find('[data-as_load]'));
1182
+ }
1179
1183
  this.set_adapter(this.target.next());
1180
1184
  }
1181
1185
  else if (this.position == 'before') {
1182
1186
  this.target.before(this.wrap_with_adapter_html(content, should_refresh_data));
1183
- ActiveScaffold.trigger_load_events(this.target.prev().find('.records').first().find('> [data-as_load]'));
1187
+ if (this.action == 'index') {
1188
+ ActiveScaffold.trigger_load_events(this.target.prev().find('.records').first().find('> [data-as_load]'));
1189
+ } else {
1190
+ ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
1191
+ }
1184
1192
  this.set_adapter(this.target.prev());
1185
1193
  }
1186
1194
  else {
@@ -1223,7 +1231,11 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
1223
1231
  }
1224
1232
  if (!new_adapter.hasClass('as_adapter')) {
1225
1233
  new_adapter = ActiveScaffold.replace(new_adapter, this.wrap_with_adapter_html(new_adapter.children(':first-child').html(), should_refresh_data), true);
1226
- ActiveScaffold.trigger_load_events(new_adapter.find('.records').first().find('> [data-as_load]'));
1234
+ if (this.action == 'index') {
1235
+ ActiveScaffold.trigger_load_events(new_adapter.find('.records').first().find('> [data-as_load]'));
1236
+ } else {
1237
+ ActiveScaffold.trigger_load_events(new_adapter.find('[data-as_load]'));
1238
+ }
1227
1239
  }
1228
1240
  this.set_adapter(new_adapter);
1229
1241
  this.disable();
@@ -529,9 +529,10 @@ color: #ccc;
529
529
  }
530
530
 
531
531
  .active-scaffold-footer .pagination {
532
- float: right;
532
+ text-align: right;
533
533
  white-space: nowrap;
534
534
  margin-right: 5px;
535
+ font: bold 12px arial, sans-serif;
535
536
  }
536
537
 
537
538
  .blue-theme .active-scaffold-footer .active-scaffold-records {
@@ -542,8 +543,7 @@ margin-left: 5px;
542
543
  text-decoration: none;
543
544
  letter-spacing: 0;
544
545
  padding: 0 2px;
545
- margin: 0 -2px;
546
- font: bold 12px arial, sans-serif;
546
+ margin: 0;
547
547
  }
548
548
 
549
549
  .blue-theme .active-scaffold-footer a,
@@ -2,7 +2,7 @@ module ActiveScaffold
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 0
5
- PATCH = 29
5
+ PATCH = 30
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_vho
3
3
  version: !ruby/object:Gem::Version
4
- hash: 61
4
+ hash: 59
5
5
  prerelease:
6
6
  segments:
7
7
  - 3
8
8
  - 0
9
- - 29
10
- version: 3.0.29
9
+ - 30
10
+ version: 3.0.30
11
11
  platform: ruby
12
12
  authors:
13
13
  - Many, see README