From 81b781b5f71fa8267e5d2ce20af0d6a9a4983185 Mon Sep 17 00:00:00 2001 From: jumagura Date: Thu, 24 Aug 2023 15:30:21 -0400 Subject: [PATCH 1/2] REVERT: Update insert-hyperlink invocation following core change --- .../components/custom-wizard-composer-editor.js.es6 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6 b/assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6 index 95ae56c0..e52f2382 100644 --- a/assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6 +++ b/assets/javascripts/discourse/components/custom-wizard-composer-editor.js.es6 @@ -12,14 +12,12 @@ import { alias } from "@ember/object/computed"; import Site from "discourse/models/site"; import { uploadIcon } from "discourse/lib/uploads"; import { dasherize } from "@ember/string"; -import InsertHyperlink from "discourse/components/modal/insert-hyperlink"; -import { inject as service } from "@ember/service"; +import showModal from "discourse/lib/show-modal"; const IMAGE_MARKDOWN_REGEX = /!\[(.*?)\|(\d{1,4}x\d{1,4})(,\s*\d{1,3}%)?(.*?)\]\((upload:\/\/.*?)\)(?!(.*`))/g; export default ComposerEditor.extend({ - modal: service(), classNameBindings: ["fieldClass"], allowUpload: true, @@ -200,8 +198,9 @@ export default ComposerEditor.extend({ if (this._lastSel) { linkText = this._lastSel.value; } - this.modal.show(InsertHyperlink, { - model: { linkText, toolbarEvent }, + showModal("insert-hyperlink").setProperties({ + linkText, + toolbarEvent, }); }, From cf1b9b9ba0f39bab89cb257db77cceb119831e60 Mon Sep 17 00:00:00 2001 From: jumagura Date: Fri, 25 Aug 2023 19:09:45 -0400 Subject: [PATCH 2/2] bump version on stable --- plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.rb b/plugin.rb index c5681fb6..756154bb 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-custom-wizard # about: Forms for Discourse. Better onboarding, structured posting, data enrichment, automated actions and much more. -# version: 2.4.17 +# version: 2.4.18 # authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George, Kaitlin Maddever, Juan Marcos Gutierrez Ramos # url: https://github.com/paviliondev/discourse-custom-wizard # contact_emails: development@pavilion.tech