Skip to content

Commit

Permalink
Postpone introduction of the new event name rails_admin:dom_ready
Browse files Browse the repository at this point in the history
to make the upcoming release a patch one.
This partially reverts commit 2ee43de.
  • Loading branch information
mshibuya committed Mar 23, 2023
1 parent aca22b6 commit 33773d7
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 32 deletions.
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
window.domReadyTriggered = [];

document.addEventListener("rails_admin:dom_ready", function () {
window.domReadyTriggered.push("plainjs/colon");
});

document.addEventListener("rails_admin.dom_ready", function () {
window.domReadyTriggered.push("plainjs/dot");
});

$(document).on("rails_admin:dom_ready", function () {
window.domReadyTriggered.push("jquery/colon");
});

$(document).on("rails_admin.dom_ready", function () {
window.domReadyTriggered.push("jquery/dot");
});
8 changes: 0 additions & 8 deletions spec/dummy_app/app/javascript/rails_admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@ ActiveStorage.start();

window.domReadyTriggered = [];

document.addEventListener("rails_admin:dom_ready", function () {
window.domReadyTriggered.push("plainjs/colon");
});

document.addEventListener("rails_admin.dom_ready", function () {
window.domReadyTriggered.push("plainjs/dot");
});

$(document).on("rails_admin:dom_ready", function () {
window.domReadyTriggered.push("jquery/colon");
});

$(document).on("rails_admin.dom_ready", function () {
window.domReadyTriggered.push("jquery/dot");
});
4 changes: 2 additions & 2 deletions spec/integration/rails_admin_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
is_expected.to have_content 'Details for Player'
end

it 'triggers rails_admin:dom_ready right after a validation error' do
it 'triggers rails_admin.dom_ready right after a validation error' do
visit edit_path(model_name: 'player', id: player.id)
fill_in 'player[name]', with: 'on steroids'
find_button('Save').trigger 'click'
Expand All @@ -209,7 +209,7 @@
describe 'dom_ready events', js: true do
it 'trigger properly' do
visit dashboard_path
expect(evaluate_script('domReadyTriggered')).to match_array %w[plainjs/colon plainjs/dot jquery/colon jquery/dot]
expect(evaluate_script('domReadyTriggered')).to match_array %w[plainjs/dot jquery/dot]
end
end

Expand Down
5 changes: 2 additions & 3 deletions src/rails_admin/nested-form-hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ import * as bootstrap from "bootstrap";
toggler = controls.find(".toggler");
nav.append(new_tab);

document.dispatchEvent(
new CustomEvent("rails_admin:dom_ready", { detail: field })
);
const event = new CustomEvent("rails_admin.dom_ready", { detail: field });
document.dispatchEvent(event);

new_tab.children("a").each(function (index, element) {
bootstrap.Tab.getOrCreateInstance(element).show();
Expand Down
5 changes: 2 additions & 3 deletions src/rails_admin/remote-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ import * as bootstrap from "bootstrap";
})
.html(saveButtonText);

document.dispatchEvent(
new CustomEvent("rails_admin:dom_ready", { detail: form })
);
const event = new CustomEvent("rails_admin.dom_ready", { detail: form });
document.dispatchEvent(event);

form.bind("ajax:complete", function (event) {
var data = event.detail[0];
Expand Down
2 changes: 1 addition & 1 deletion src/rails_admin/sidescroll.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

{
document.addEventListener("rails_admin:dom_ready", () => {
document.addEventListener("rails_admin.dom_ready", () => {
const scroller = document.getElementById("sidescroll");
if (!scroller) {
return;
Expand Down
10 changes: 4 additions & 6 deletions src/rails_admin/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ import I18n from "./i18n";
function triggerDomReady() {
I18n.init($("html").attr("lang"), $("#admin-js").data("i18nOptions"));

document.dispatchEvent(new CustomEvent("rails_admin:dom_ready"));
const event = new CustomEvent("rails_admin.dom_ready");
document.dispatchEvent(event);
}
$(document).ready(triggerDomReady);
document.addEventListener("turbo:render", triggerDomReady);

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

// Trigger with the old event name for compatibility with existing user codes
document.dispatchEvent(
new CustomEvent("rails_admin.dom_ready", { detail: event.detail })
);
// Trigger via jQuery for compatibility with existing user codes
$(document).trigger(
"rails_admin.dom_ready",
event.detail ? [event.detail] : null
Expand Down
2 changes: 1 addition & 1 deletion src/rails_admin/widgets.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import flatpickr from "flatpickr";
import I18n from "./i18n";

(function ($) {
document.addEventListener("rails_admin:dom_ready", function (event) {
document.addEventListener("rails_admin.dom_ready", function (event) {
var $editors,
array,
config_options,
Expand Down

0 comments on commit 33773d7

Please sign in to comment.