Skip to content

Commit 33773d7

Browse files
committed
Postpone introduction of the new event name rails_admin:dom_ready
to make the upcoming release a patch one. This partially reverts commit 2ee43de.
1 parent aca22b6 commit 33773d7

File tree

8 files changed

+12
-32
lines changed

8 files changed

+12
-32
lines changed
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
window.domReadyTriggered = [];
22

3-
document.addEventListener("rails_admin:dom_ready", function () {
4-
window.domReadyTriggered.push("plainjs/colon");
5-
});
6-
73
document.addEventListener("rails_admin.dom_ready", function () {
84
window.domReadyTriggered.push("plainjs/dot");
95
});
106

11-
$(document).on("rails_admin:dom_ready", function () {
12-
window.domReadyTriggered.push("jquery/colon");
13-
});
14-
157
$(document).on("rails_admin.dom_ready", function () {
168
window.domReadyTriggered.push("jquery/dot");
179
});

spec/dummy_app/app/javascript/rails_admin.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,10 @@ ActiveStorage.start();
77

88
window.domReadyTriggered = [];
99

10-
document.addEventListener("rails_admin:dom_ready", function () {
11-
window.domReadyTriggered.push("plainjs/colon");
12-
});
13-
1410
document.addEventListener("rails_admin.dom_ready", function () {
1511
window.domReadyTriggered.push("plainjs/dot");
1612
});
1713

18-
$(document).on("rails_admin:dom_ready", function () {
19-
window.domReadyTriggered.push("jquery/colon");
20-
});
21-
2214
$(document).on("rails_admin.dom_ready", function () {
2315
window.domReadyTriggered.push("jquery/dot");
2416
});

spec/integration/rails_admin_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
is_expected.to have_content 'Details for Player'
198198
end
199199

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
201201
visit edit_path(model_name: 'player', id: player.id)
202202
fill_in 'player[name]', with: 'on steroids'
203203
find_button('Save').trigger 'click'
@@ -209,7 +209,7 @@
209209
describe 'dom_ready events', js: true do
210210
it 'trigger properly' do
211211
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]
213213
end
214214
end
215215

src/rails_admin/nested-form-hooks.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ import * as bootstrap from "bootstrap";
3737
toggler = controls.find(".toggler");
3838
nav.append(new_tab);
3939

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);
4342

4443
new_tab.children("a").each(function (index, element) {
4544
bootstrap.Tab.getOrCreateInstance(element).show();

src/rails_admin/remote-form.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ import * as bootstrap from "bootstrap";
101101
})
102102
.html(saveButtonText);
103103

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);
107106

108107
form.bind("ajax:complete", function (event) {
109108
var data = event.detail[0];

src/rails_admin/sidescroll.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22

33
{
4-
document.addEventListener("rails_admin:dom_ready", () => {
4+
document.addEventListener("rails_admin.dom_ready", () => {
55
const scroller = document.getElementById("sidescroll");
66
if (!scroller) {
77
return;

src/rails_admin/ui.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ import I18n from "./i18n";
8282
function triggerDomReady() {
8383
I18n.init($("html").attr("lang"), $("#admin-js").data("i18nOptions"));
8484

85-
document.dispatchEvent(new CustomEvent("rails_admin:dom_ready"));
85+
const event = new CustomEvent("rails_admin.dom_ready");
86+
document.dispatchEvent(event);
8687
}
8788
$(document).ready(triggerDomReady);
8889
document.addEventListener("turbo:render", triggerDomReady);
8990

90-
document.addEventListener("rails_admin:dom_ready", function (event) {
91+
document.addEventListener("rails_admin.dom_ready", function (event) {
9192
$(".nav.nav-pills li.active").removeClass("active");
9293
$(
9394
'.nav.nav-pills li[data-model="' + $(".page-header").data("model") + '"]'
@@ -129,10 +130,7 @@ import I18n from "./i18n";
129130
window.Turbo.session.drive = false;
130131
});
131132

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
136134
$(document).trigger(
137135
"rails_admin.dom_ready",
138136
event.detail ? [event.detail] : null

src/rails_admin/widgets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import flatpickr from "flatpickr";
55
import I18n from "./i18n";
66

77
(function ($) {
8-
document.addEventListener("rails_admin:dom_ready", function (event) {
8+
document.addEventListener("rails_admin.dom_ready", function (event) {
99
var $editors,
1010
array,
1111
config_options,

0 commit comments

Comments
 (0)