mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-29 22:01:49 +03:00
Added html difference library (#16658)
no issue
<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at 2839ca2</samp>
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 <fabien@allou.is>
This commit is contained in:
parent
b3257cb7ea
commit
b13677085d
@ -14,6 +14,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="gh-post-history-main">
|
||||
|
||||
<div>
|
||||
{{{this.postDiff}}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,5 +1,18 @@
|
||||
import ModalComponent from 'ghost-admin/components/modal-base';
|
||||
import diff from 'node-htmldiff';
|
||||
|
||||
export default ModalComponent.extend({
|
||||
|
||||
|
||||
get previous() {
|
||||
return `<div class="koenig-react-editor"><div class="koenig-lexical "><div data-kg="editor"><div class="kg-prose" contenteditable="true" spellcheck="true" data-lexical-editor="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-koenig-dnd-container="true" role="textbox"><p dir="ltr" data-koenig-dnd-droppable="true"><strong data-lexical-text="true">Lorem Ipsum</strong><span data-lexical-text="true"> 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.</span></p><p dir="ltr" data-koenig-dnd-droppable="true"><span data-lexical-text="true">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.</span></p><p data-koenig-dnd-droppable="true"><br></p></div></div> <div id="koenig-drag-drop-ghost-container" style="position: fixed; width: 100%; z-index: 10001;"></div></div></div></div>`;
|
||||
},
|
||||
|
||||
get current() {
|
||||
return `<div class="koenig-react-editor"><div class="koenig-lexical "><div data-kg="editor"><div class="kg-prose" contenteditable="true" spellcheck="true" data-lexical-editor="true" style="user-select: text; white-space: pre-wrap; word-break: break-word;" data-koenig-dnd-container="true" role="textbox"><p dir="ltr" data-koenig-dnd-droppable="true"><strong data-lexical-text="true">Lorem Ipsum</strong><span data-lexical-text="true"> 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.</span></p><p dir="ltr" data-koenig-dnd-droppable="true"><span data-lexical-text="true">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.</span></p><p data-koenig-dnd-droppable="true"><br></p></div></div> <div id="koenig-drag-drop-ghost-container" style="position: fixed; width: 100%; z-index: 10001;"></div></div></div>`;
|
||||
},
|
||||
|
||||
get postDiff() {
|
||||
let diffHtml = diff(this.previous, this.current);
|
||||
return diffHtml;
|
||||
}
|
||||
});
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
.gh-post-history-main {
|
||||
width: 100%;
|
||||
max-width: 740px;
|
||||
margin: 16rem auto 0;
|
||||
}
|
||||
|
||||
.gh-post-history-main .koenig-lexical del {
|
||||
color: var(--red) !important;
|
||||
}
|
||||
|
@ -181,7 +181,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"jose": "4.13.1",
|
||||
"node-htmldiff": "^0.9.4",
|
||||
"path-browserify": "1.0.1",
|
||||
"webpack": "5.77.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user