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

DEV: Update to diffHTML 1.0.0-beta.30 (#23729)

This commit is contained in:
Bianca Nenciu 2023-10-03 10:15:17 +03:00 committed by GitHub
parent 1c489bdbcc
commit e3d3e34e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,9 +461,6 @@ export default Component.extend(TextareaTextManipulation, {
previewPromise = loadScript("/javascripts/diffhtml.min.js").then(() => { previewPromise = loadScript("/javascripts/diffhtml.min.js").then(() => {
const previewElement = const previewElement =
this.element.querySelector(".d-editor-preview"); this.element.querySelector(".d-editor-preview");
// 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); 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.29/diffhtml.min.js", "diffhtml.min.js": "diffhtml/1.0.0-beta.30/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",

2
package.json
View File

@ -20,7 +20,7 @@
"chrome-launcher": "^0.15.1", "chrome-launcher": "^0.15.1",
"chrome-remote-interface": "^0.31.3", "chrome-remote-interface": "^0.31.3",
"concurrently": "^8.2.1", "concurrently": "^8.2.1",
"diffhtml": "1.0.0-beta.20", "diffhtml": "1.0.0-beta.30",
"ember-template-lint": "5.11.2", "ember-template-lint": "5.11.2",
"esbuild": "^0.19.2", "esbuild": "^0.19.2",
"eslint": "^8.37.0", "eslint": "^8.37.0",

1
public/javascripts/diffhtml/1.0.0-beta.29/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.30/diffhtml.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

8
yarn.lock
View File

@ -1490,10 +1490,10 @@ devtools-protocol@0.0.1147663:
resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz#4ec5610b39a6250d1f87e6b9c7e16688ed0ac78e" resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1147663.tgz#4ec5610b39a6250d1f87e6b9c7e16688ed0ac78e"
integrity sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ== integrity sha512-hyWmRrexdhbZ1tcJUGpO95ivbRhWXz++F4Ko+n21AY5PNln2ovoJw+8ZMNDTtip+CNFQfrtLVh/w4009dXO/eQ==
diffhtml@1.0.0-beta.20: diffhtml@1.0.0-beta.30:
version "1.0.0-beta.20" version "1.0.0-beta.30"
resolved "https://registry.yarnpkg.com/diffhtml/-/diffhtml-1.0.0-beta.20.tgz#129b403fa152276c9b876188980ca0f9b2540351" resolved "https://registry.yarnpkg.com/diffhtml/-/diffhtml-1.0.0-beta.30.tgz#725c0a5941bd825675f8a62b701a12a67e7516c7"
integrity sha512-xSSwGb2dkQsTc7Bl910iySH65PkzsCtowfVGMfrmc2fEwvYrhJUpIEIx+3mpZ1wMWVt+t/0ltVwrjQkMJotxLg== integrity sha512-yrBteaq309reltj+kAnGqsnpJyQSqmCkd5LAJNAcWNmlgvu+PbiUm9bNxdRYi21BQsQsljTxrjs+AWeeHHghWA==
dir-glob@^3.0.1: dir-glob@^3.0.1:
version "3.0.1" version "3.0.1"