From bb85b3a0d2c0ab6b59bcb405731c39089ec6731c Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Thu, 9 Jul 2020 13:15:23 +1000 Subject: [PATCH 1/3] Update raw template global in erb --- assets/javascripts/wizard-raw-templates.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/javascripts/wizard-raw-templates.js.erb b/assets/javascripts/wizard-raw-templates.js.erb index 3556dc45..b6a5b7f7 100644 --- a/assets/javascripts/wizard-raw-templates.js.erb +++ b/assets/javascripts/wizard-raw-templates.js.erb @@ -21,7 +21,7 @@ Discourse.unofficial_plugins.each do |plugin| result << " (function() { if ('Wizard' in window) { - Discourse.RAW_TEMPLATES['javascripts/#{name}'] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled}); + window.__DISCOURSE_RAW_TEMPLATES['javascripts/#{name}'] = requirejs('discourse-common/lib/raw-handlebars').template(#{compiled}); } })(); " From 271e270dcaca977a8348e472bbbf2078f4561086 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Wed, 15 Jul 2020 10:19:04 +1000 Subject: [PATCH 2/3] Handle new category and tag hashtags --- .discourse-compatibility | 1 + assets/javascripts/wizard-custom.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .discourse-compatibility diff --git a/.discourse-compatibility b/.discourse-compatibility new file mode 100644 index 00000000..76788d2c --- /dev/null +++ b/.discourse-compatibility @@ -0,0 +1 @@ +v2.6.0.beta1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c \ No newline at end of file diff --git a/assets/javascripts/wizard-custom.js b/assets/javascripts/wizard-custom.js index cef27152..89bc06ef 100644 --- a/assets/javascripts/wizard-custom.js +++ b/assets/javascripts/wizard-custom.js @@ -19,9 +19,8 @@ //= require discourse/app/lib/formatter //= require discourse/app/lib/quote //= require discourse/app/lib/link-mentions -//= require discourse/app/lib/link-category-hashtags +//= require discourse/app/lib/link-hashtags //= require discourse/app/lib/category-hashtags -//= require discourse/app/lib/link-tag-hashtag //= require discourse/app/lib/tag-hashtags //= require discourse/app/lib/uploads //= require discourse/app/lib/category-tag-search From 06c3605974cd0ed33bd9173b68df13821e3a4128 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Wed, 15 Jul 2020 10:58:09 +1000 Subject: [PATCH 3/3] No 'v' in .discourse-compatibility versions --- .discourse-compatibility | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.discourse-compatibility b/.discourse-compatibility index 76788d2c..0b4de0ee 100644 --- a/.discourse-compatibility +++ b/.discourse-compatibility @@ -1 +1 @@ -v2.6.0.beta1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c \ No newline at end of file +2.6.0.beta1: bb85b3a0d2c0ab6b59bcb405731c39089ec6731c \ No newline at end of file