diff --git a/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js b/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js index cee6ef82ad..4b87880b14 100644 --- a/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js +++ b/app/assets/javascripts/rails_admin/ra.nested-form-hooks.js @@ -30,7 +30,10 @@ content = parent_group.children(".tab-content"); toggler = controls.find(".toggler"); nav.append(new_tab); - $(window.document).trigger("rails_admin.dom_ready", [field, parent_group]); + + const event = new CustomEvent("rails_admin.dom_ready", { detail: field }); + document.dispatchEvent(event); + new_tab.children("a").tab("show"); if (!one_to_one) { nav.filter(":hidden").show("slow"); diff --git a/app/assets/javascripts/rails_admin/ra.remote-form.js b/app/assets/javascripts/rails_admin/ra.remote-form.js index f416c812e5..df262132bf 100644 --- a/app/assets/javascripts/rails_admin/ra.remote-form.js +++ b/app/assets/javascripts/rails_admin/ra.remote-form.js @@ -105,7 +105,8 @@ }) .html(saveButtonText); - $(document).trigger("rails_admin.dom_ready", [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], diff --git a/app/assets/javascripts/rails_admin/ra.sidescroll.js b/app/assets/javascripts/rails_admin/ra.sidescroll.js index 3f274e11f4..e9e03854be 100644 --- a/app/assets/javascripts/rails_admin/ra.sidescroll.js +++ b/app/assets/javascripts/rails_admin/ra.sidescroll.js @@ -30,5 +30,5 @@ } $(window).on("load", setFrozenColPositions); - $(document).on("rails_admin.dom_ready", setFrozenColPositions); + document.addEventListener("rails_admin.dom_ready", setFrozenColPositions); })(jQuery); diff --git a/app/assets/javascripts/rails_admin/ra.widgets.js b/app/assets/javascripts/rails_admin/ra.widgets.js index dc8d571cc2..ca159be345 100644 --- a/app/assets/javascripts/rails_admin/ra.widgets.js +++ b/app/assets/javascripts/rails_admin/ra.widgets.js @@ -1,5 +1,5 @@ (function ($) { - $(document).on("rails_admin.dom_ready", function (e, content) { + document.addEventListener("rails_admin.dom_ready", function (event) { var $editors, array, config_options, @@ -9,7 +9,7 @@ goFroalaWysiwygs, goSimpleMDEs, options; - content = content ? content : $("form"); + var content = event.detail || $("form"); if (content.length) { $.fn.datetimepicker.defaults.icons = { time: "fa fa-clock-o", diff --git a/app/assets/javascripts/rails_admin/ui.js b/app/assets/javascripts/rails_admin/ui.js index 729c7a9b6f..b39d25ef53 100644 --- a/app/assets/javascripts/rails_admin/ui.js +++ b/app/assets/javascripts/rails_admin/ui.js @@ -94,14 +94,17 @@ $("html").attr("lang"), $("#admin-js").data("i18nOptions") ); - $(document).trigger("rails_admin.dom_ready"); + + const event = new CustomEvent("rails_admin.dom_ready"); + document.dispatchEvent(event); }); $(document).on("pjax:end", function () { - $(document).trigger("rails_admin.dom_ready"); + const event = new CustomEvent("rails_admin.dom_ready"); + document.dispatchEvent(event); }); - $(document).on("rails_admin.dom_ready", function () { + document.addEventListener("rails_admin.dom_ready", function () { $(".nav.nav-pills li.active").removeClass("active"); $( '.nav.nav-pills li[data-model="' + $(".page-header").data("model") + '"]'