From 9238a9e427a3e6e8b1458adfe85860d9c734b27c Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX <j.jaffeux@gmail.com> Date: Mon, 14 Sep 2020 18:33:14 +0200 Subject: [PATCH] FIX: adds shims for popper in wizard (#10658) --- .../javascripts/select-kit/addon/components/select-kit.js | 4 ++-- app/assets/javascripts/wizard-shims.js | 6 ++++++ app/assets/javascripts/wizard-vendor.js | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/wizard-shims.js diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js index 34936caf26f..650fe22a929 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js @@ -1,3 +1,4 @@ +import { createPopper } from "@popperjs/core"; import I18n from "I18n"; import EmberObject, { computed, get } from "@ember/object"; import { guidFor } from "@ember/object/internals"; @@ -772,8 +773,7 @@ export default Component.extend( const verticalOffset = this.multiSelect ? 0 : 3; - /* global Popper:true */ - this.popper = Popper.createPopper(anchor, popper, { + this.popper = createPopper(anchor, popper, { eventsEnabled: false, strategy: placementStrategy, placement: this.selectKit.options.placement, diff --git a/app/assets/javascripts/wizard-shims.js b/app/assets/javascripts/wizard-shims.js new file mode 100644 index 00000000000..d7bc1715a8d --- /dev/null +++ b/app/assets/javascripts/wizard-shims.js @@ -0,0 +1,6 @@ +define("@popperjs/core", ["exports"], function (__exports__) { + __exports__.default = window.Popper; + __exports__.createPopper = window.Popper.createPopper; + __exports__.defaultModifiers = window.Popper.defaultModifiers; + __exports__.popperGenerator = window.Popper.popperGenerator; +}); diff --git a/app/assets/javascripts/wizard-vendor.js b/app/assets/javascripts/wizard-vendor.js index f4e1d57dc04..9b76a8fe42b 100644 --- a/app/assets/javascripts/wizard-vendor.js +++ b/app/assets/javascripts/wizard-vendor.js @@ -4,4 +4,5 @@ //= require sweetalert.js //= require virtual-dom //= require virtual-dom-amd -//= require popper +//= require popper.js +//= require wizard-shims