github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 10:57:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Update diffhtml to 1.0.0-beta.29 again (#22365)

Browse Source 
This reverts commit d40da76c8e.
This commit is contained in:
Bianca Nenciu 2023-07-03 19:38:43 +03:00 committed by GitHub
parent 1b693d0d60
commit 6a50d79044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/components/d-editor.js
View File

@ -455,10 +455,12 @@ export default Component.extend(TextareaTextManipulation, {
); );
previewPromise = loadScript("/javascripts/diffhtml.min.js").then(() => { previewPromise = loadScript("/javascripts/diffhtml.min.js").then(() => {
window.diff.innerHTML( const previewElement =
this.element.querySelector(".d-editor-preview"), this.element.querySelector(".d-editor-preview");
cookedElement.innerHTML // This is a workaround for a known bug in diffHTML
); // https://github.com/tbranyen/diffhtml/issues/217#issuecomment-1479956332
window.diff.release(previewElement);
window.diff.innerHTML(previewElement, cookedElement.innerHTML);
}); });
} }

2
app/assets/javascripts/discourse/app/lib/public-js-versions.js
View File

@ -7,7 +7,7 @@ export const PUBLIC_JS_VERSIONS = {
"chart.min.js": "chart.js/3.5.1/chart.min.js", "chart.min.js": "chart.js/3.5.1/chart.min.js",
"chartjs-plugin-datalabels.min.js": "chartjs-plugin-datalabels.min.js":
"chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js", "chartjs-plugin-datalabels/2.2.0/chartjs-plugin-datalabels.min.js",
"diffhtml.min.js": "diffhtml/1.0.0-beta.20/diffhtml.min.js", "diffhtml.min.js": "diffhtml/1.0.0-beta.29/diffhtml.min.js",
"jquery.magnific-popup.min.js": "jquery.magnific-popup.min.js":
"magnific-popup/1.1.0/jquery.magnific-popup.min.js", "magnific-popup/1.1.0/jquery.magnific-popup.min.js",
"pikaday.js": "pikaday/1.8.2/pikaday.js", "pikaday.js": "pikaday/1.8.2/pikaday.js",

1
public/javascripts/diffhtml/1.0.0-beta.20/diffhtml.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/javascripts/diffhtml/1.0.0-beta.29/diffhtml.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long