Merge pull request #3050 from AlchemyCMS/convert-dialog-into-esm

Convert dialog class into esm
AlchemyCMS · Sep 24, 2024 · 4c20717 · 4c20717
2 parents 367b5cf + 881a5f9
commit 4c20717
Show file tree

Hide file tree

Showing 16 changed files with 492 additions and 400 deletions.
diff --git a/app/assets/javascripts/alchemy/admin.js b/app/assets/javascripts/alchemy/admin.js
diff --git a/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee b/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee
diff --git a/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee b/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee
diff --git a/app/javascript/alchemy_admin.js b/app/javascript/alchemy_admin.js
@@ -7,15 +7,14 @@ import "select2"
 
 import Rails from "@rails/ujs"
 
-import GUI from "alchemy_admin/gui"
 import { translate } from "alchemy_admin/i18n"
+import { currentDialog, closeCurrentDialog } from "alchemy_admin/dialog"
 import Dirty from "alchemy_admin/dirty"
 import * as FixedElements from "alchemy_admin/fixed_elements"
 import { growl } from "alchemy_admin/growler"
 import ImageLoader from "alchemy_admin/image_loader"
 import Initializer from "alchemy_admin/initializer"
 import { LinkDialog } from "alchemy_admin/link_dialog"
-import pictureSelector from "alchemy_admin/picture_selector"
 import pleaseWaitOverlay from "alchemy_admin/please_wait_overlay"
 import Sitemap from "alchemy_admin/sitemap"
 import Spinner from "alchemy_admin/spinner"
@@ -42,14 +41,14 @@ if (typeof window.Alchemy === "undefined") {
 
 // Enhance the global Alchemy object with imported features
 Object.assign(Alchemy, {
+  closeCurrentDialog,
+  currentDialog,
   ...Dirty,
-  GUI,
   t: translate, // Global utility method for translating a given string
   FixedElements,
   growl,
   ImageLoader: ImageLoader.init,
   LinkDialog,
-  pictureSelector,
   pleaseWaitOverlay,
   Sitemap,
   Spinner,