From b13677085d56c709ae02b07e1d64bfcf995162c1 Mon Sep 17 00:00:00 2001 From: Ronald Langeveld Date: Tue, 18 Apr 2023 09:20:24 +0100 Subject: [PATCH] Added html difference library (#16658) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no issue ### 🤖 Generated by Copilot at 2839ca2 This pull request adds a feature to show the HTML diff of the post content changes in the post history modal. It uses the `node-htmldiff` module to generate the diff and updates the `modal-post-history` component and its template and style files. --------- Co-authored-by: Fabien "egg" O'Carroll --- ghost/admin/app/components/modal-post-history.hbs | 4 +++- ghost/admin/app/components/modal-post-history.js | 15 ++++++++++++++- ghost/admin/app/styles/layouts/post-history.css | 15 +++++++++++++-- ghost/admin/package.json | 3 ++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/ghost/admin/app/components/modal-post-history.hbs b/ghost/admin/app/components/modal-post-history.hbs index daa9ba2171..62fcaa68fc 100644 --- a/ghost/admin/app/components/modal-post-history.hbs +++ b/ghost/admin/app/components/modal-post-history.hbs @@ -14,6 +14,8 @@
- +
+ {{{this.postDiff}}} +
diff --git a/ghost/admin/app/components/modal-post-history.js b/ghost/admin/app/components/modal-post-history.js index e755aa8d09..6b941f9d7b 100644 --- a/ghost/admin/app/components/modal-post-history.js +++ b/ghost/admin/app/components/modal-post-history.js @@ -1,5 +1,18 @@ import ModalComponent from 'ghost-admin/components/modal-base'; +import diff from 'node-htmldiff'; export default ModalComponent.extend({ - + + get previous() { + return `

Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.

Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.


`; + }, + + get current() { + return `

Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It is one of the worse things I've ever read. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.

Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.


`; + }, + + get postDiff() { + let diffHtml = diff(this.previous, this.current); + return diffHtml; + } }); diff --git a/ghost/admin/app/styles/layouts/post-history.css b/ghost/admin/app/styles/layouts/post-history.css index 84d5bcdd74..a3247e5eae 100644 --- a/ghost/admin/app/styles/layouts/post-history.css +++ b/ghost/admin/app/styles/layouts/post-history.css @@ -1,4 +1,5 @@ .gh-post-history { + display: flex; height: 100%; } @@ -15,7 +16,7 @@ display: flex; justify-content: space-between; align-items: center; - padding: 32px; + padding: 3.2rem; border-bottom: 1px solid var(--whitegrey-d1); } @@ -29,4 +30,14 @@ .modal-fullsettings-sidebar-header .gh-btn-icon svg { margin: 0; -} \ No newline at end of file +} + +.gh-post-history-main { + width: 100%; + max-width: 740px; + margin: 16rem auto 0; +} + +.gh-post-history-main .koenig-lexical del { + color: var(--red) !important; +} diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 1892289b32..69aacca622 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -181,7 +181,8 @@ }, "dependencies": { "jose": "4.13.1", + "node-htmldiff": "^0.9.4", "path-browserify": "1.0.1", "webpack": "5.77.0" } -} \ No newline at end of file +}