File tree Expand file tree Collapse file tree 8 files changed +12
-32
lines changed
assets/javascripts/rails_admin/custom Expand file tree Collapse file tree 8 files changed +12
-32
lines changed Original file line number Diff line number Diff line change 1
1
window . domReadyTriggered = [ ] ;
2
2
3
- document . addEventListener ( "rails_admin:dom_ready" , function ( ) {
4
- window . domReadyTriggered . push ( "plainjs/colon" ) ;
5
- } ) ;
6
-
7
3
document . addEventListener ( "rails_admin.dom_ready" , function ( ) {
8
4
window . domReadyTriggered . push ( "plainjs/dot" ) ;
9
5
} ) ;
10
6
11
- $ ( document ) . on ( "rails_admin:dom_ready" , function ( ) {
12
- window . domReadyTriggered . push ( "jquery/colon" ) ;
13
- } ) ;
14
-
15
7
$ ( document ) . on ( "rails_admin.dom_ready" , function ( ) {
16
8
window . domReadyTriggered . push ( "jquery/dot" ) ;
17
9
} ) ;
Original file line number Diff line number Diff line change @@ -7,18 +7,10 @@ ActiveStorage.start();
7
7
8
8
window . domReadyTriggered = [ ] ;
9
9
10
- document . addEventListener ( "rails_admin:dom_ready" , function ( ) {
11
- window . domReadyTriggered . push ( "plainjs/colon" ) ;
12
- } ) ;
13
-
14
10
document . addEventListener ( "rails_admin.dom_ready" , function ( ) {
15
11
window . domReadyTriggered . push ( "plainjs/dot" ) ;
16
12
} ) ;
17
13
18
- $ ( document ) . on ( "rails_admin:dom_ready" , function ( ) {
19
- window . domReadyTriggered . push ( "jquery/colon" ) ;
20
- } ) ;
21
-
22
14
$ ( document ) . on ( "rails_admin.dom_ready" , function ( ) {
23
15
window . domReadyTriggered . push ( "jquery/dot" ) ;
24
16
} ) ;
Original file line number Diff line number Diff line change 197
197
is_expected . to have_content 'Details for Player'
198
198
end
199
199
200
- it 'triggers rails_admin: dom_ready right after a validation error' do
200
+ it 'triggers rails_admin. dom_ready right after a validation error' do
201
201
visit edit_path ( model_name : 'player' , id : player . id )
202
202
fill_in 'player[name]' , with : 'on steroids'
203
203
find_button ( 'Save' ) . trigger 'click'
209
209
describe 'dom_ready events' , js : true do
210
210
it 'trigger properly' do
211
211
visit dashboard_path
212
- expect ( evaluate_script ( 'domReadyTriggered' ) ) . to match_array %w[ plainjs/colon plainjs/ dot jquery/colon jquery/dot ]
212
+ expect ( evaluate_script ( 'domReadyTriggered' ) ) . to match_array %w[ plainjs/dot jquery/dot ]
213
213
end
214
214
end
215
215
Original file line number Diff line number Diff line change @@ -37,9 +37,8 @@ import * as bootstrap from "bootstrap";
37
37
toggler = controls . find ( ".toggler" ) ;
38
38
nav . append ( new_tab ) ;
39
39
40
- document . dispatchEvent (
41
- new CustomEvent ( "rails_admin:dom_ready" , { detail : field } )
42
- ) ;
40
+ const event = new CustomEvent ( "rails_admin.dom_ready" , { detail : field } ) ;
41
+ document . dispatchEvent ( event ) ;
43
42
44
43
new_tab . children ( "a" ) . each ( function ( index , element ) {
45
44
bootstrap . Tab . getOrCreateInstance ( element ) . show ( ) ;
Original file line number Diff line number Diff line change @@ -101,9 +101,8 @@ import * as bootstrap from "bootstrap";
101
101
} )
102
102
. html ( saveButtonText ) ;
103
103
104
- document . dispatchEvent (
105
- new CustomEvent ( "rails_admin:dom_ready" , { detail : form } )
106
- ) ;
104
+ const event = new CustomEvent ( "rails_admin.dom_ready" , { detail : form } ) ;
105
+ document . dispatchEvent ( event ) ;
107
106
108
107
form . bind ( "ajax:complete" , function ( event ) {
109
108
var data = event . detail [ 0 ] ;
Original file line number Diff line number Diff line change 1
1
"use strict" ;
2
2
3
3
{
4
- document . addEventListener ( "rails_admin: dom_ready" , ( ) => {
4
+ document . addEventListener ( "rails_admin. dom_ready" , ( ) => {
5
5
const scroller = document . getElementById ( "sidescroll" ) ;
6
6
if ( ! scroller ) {
7
7
return ;
Original file line number Diff line number Diff line change @@ -82,12 +82,13 @@ import I18n from "./i18n";
82
82
function triggerDomReady ( ) {
83
83
I18n . init ( $ ( "html" ) . attr ( "lang" ) , $ ( "#admin-js" ) . data ( "i18nOptions" ) ) ;
84
84
85
- document . dispatchEvent ( new CustomEvent ( "rails_admin:dom_ready" ) ) ;
85
+ const event = new CustomEvent ( "rails_admin.dom_ready" ) ;
86
+ document . dispatchEvent ( event ) ;
86
87
}
87
88
$ ( document ) . ready ( triggerDomReady ) ;
88
89
document . addEventListener ( "turbo:render" , triggerDomReady ) ;
89
90
90
- document . addEventListener ( "rails_admin: dom_ready" , function ( event ) {
91
+ document . addEventListener ( "rails_admin. dom_ready" , function ( event ) {
91
92
$ ( ".nav.nav-pills li.active" ) . removeClass ( "active" ) ;
92
93
$ (
93
94
'.nav.nav-pills li[data-model="' + $ ( ".page-header" ) . data ( "model" ) + '"]'
@@ -129,10 +130,7 @@ import I18n from "./i18n";
129
130
window . Turbo . session . drive = false ;
130
131
} ) ;
131
132
132
- // Trigger with the old event name for compatibility with existing user codes
133
- document . dispatchEvent (
134
- new CustomEvent ( "rails_admin.dom_ready" , { detail : event . detail } )
135
- ) ;
133
+ // Trigger via jQuery for compatibility with existing user codes
136
134
$ ( document ) . trigger (
137
135
"rails_admin.dom_ready" ,
138
136
event . detail ? [ event . detail ] : null
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ import flatpickr from "flatpickr";
5
5
import I18n from "./i18n" ;
6
6
7
7
( function ( $ ) {
8
- document . addEventListener ( "rails_admin: dom_ready" , function ( event ) {
8
+ document . addEventListener ( "rails_admin. dom_ready" , function ( event ) {
9
9
var $editors ,
10
10
array ,
11
11
config_options ,
You can’t perform that action at this time.
0 commit comments