Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Missing files from previous commit

This commit is contained in:
Robin Ward 2020-09-15 10:59:41 -04:00
parent 8c384ae6b8
commit e7abba9bbe
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pretty_text.rb
View File

@ -82,6 +82,8 @@ module PrettyText
ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js") ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/handlebars-shim.js") ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/handlebars-shim.js")
ctx_load(ctx, "vendor/assets/javascripts/lodash.js") ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
ctx_load(ctx, "vendor/assets/javascripts/xss.min.js")
ctx.load("#{Rails.root}/lib/pretty_text/vendor-shims.js")
ctx_load_manifest(ctx, "pretty-text-bundle.js") ctx_load_manifest(ctx, "pretty-text-bundle.js")
ctx_load_manifest(ctx, "markdown-it-bundle.js") ctx_load_manifest(ctx, "markdown-it-bundle.js")
root_path = "#{Rails.root}/app/assets/javascripts/" root_path = "#{Rails.root}/app/assets/javascripts/"

12
lib/pretty_text/shims.js
View File

@ -9,16 +9,16 @@ __resetTranslationTree = require("pretty-text/engines/discourse-markdown/emoji")
I18n = { I18n = {
t(a, b) { t(a, b) {
return __helpers.t(a, b); return __helpers.t(a, b);
} },
}; };
define("I18n", ["exports"], function(exports) { define("I18n", ["exports"], function (exports) {
exports.default = I18n; exports.default = I18n;
}); });
// Formatting doesn't currently need any helper context // Formatting doesn't currently need any helper context
define("discourse-common/lib/helpers", ["exports"], function(exports) { define("discourse-common/lib/helpers", ["exports"], function (exports) {
exports.helperContext = function() { exports.helperContext = function () {
return {}; return {};
}; };
}); });
@ -27,10 +27,10 @@ __utils = require("discourse/lib/utilities");
__emojiUnicodeReplacer = null; __emojiUnicodeReplacer = null;
__setUnicode = function(replacements) { __setUnicode = function (replacements) {
let unicodeRegexp = new RegExp(__buildReplacementsList(replacements), "g"); let unicodeRegexp = new RegExp(__buildReplacementsList(replacements), "g");
__emojiUnicodeReplacer = function(text) { __emojiUnicodeReplacer = function (text) {
unicodeRegexp.lastIndex = 0; unicodeRegexp.lastIndex = 0;
let m; let m;
while ((m = unicodeRegexp.exec(text)) !== null) { while ((m = unicodeRegexp.exec(text)) !== null) {

3
lib/pretty_text/vendor-shims.js Normal file
View File

@ -0,0 +1,3 @@
define("xss", ["exports"], function (__exports__) {
__exports__.default = window.filterXSS;
});