DEV: remove showHtml jQuery plugin (#15316)

This commit is contained in:
Penar Musaraj
2021-12-15 13:13:06 -05:00
committed by GitHub
parent 102fa71ef3
commit 9fd92f329e
7 changed files with 39 additions and 70 deletions

View File

@@ -163,7 +163,7 @@ export default class PostCooked {
}
this.expanding = true;
const blockQuote = $aside[0].querySelector("blockquote");
$aside.data("expanded", !$aside.data("expanded"));
const finished = () => (this.expanding = false);
@@ -171,14 +171,13 @@ export default class PostCooked {
if ($aside.data("expanded")) {
this._updateQuoteElements($aside, "chevron-up");
// Show expanded quote
const $blockQuote = $("> blockquote", $aside);
$aside.data("original-contents", $blockQuote.html());
$aside.data("original-contents", blockQuote.innerHTML);
const originalText =
$blockQuote.text().trim() ||
$("> blockquote", this.attrs.cooked).text().trim();
blockQuote.textContent.trim() ||
this.attrs.cooked.querySelector("blockquote").textContent.trim();
$blockQuote.html(spinnerHTML);
blockQuote.innerHTML = spinnerHTML;
let topicId = this.attrs.topicId;
if ($aside.data("topic")) {
@@ -205,26 +204,24 @@ export default class PostCooked {
highlightHTML(div, originalText, {
matchCase: true,
});
$blockQuote.showHtml(div, "fast", finished);
blockQuote.innerHTML = "";
blockQuote.appendChild(div);
finished();
})
.catch((e) => {
if ([403, 404].includes(e.jqXHR.status)) {
const icon = e.jqXHR.status === 403 ? "lock" : "far-trash-alt";
$blockQuote.showHtml(
$(`<div class='expanded-quote'>${iconHTML(icon)}</div>`),
"fast",
finished
);
blockQuote.innerHTML = `<div class='expanded-quote icon-only'>${iconHTML(
icon
)}</div>`;
}
});
} else {
// Hide expanded quote
this._updateQuoteElements($aside, "chevron-down");
$("blockquote", $aside).showHtml(
$aside.data("original-contents"),
"fast",
finished
);
blockQuote.innerHTML = $aside.data("original-contents");
finished();
}
return false;
}

View File

@@ -46,7 +46,6 @@ module.exports = function (defaults) {
app.import(vendorJs + "jquery.fileupload-process.js");
app.import(vendorJs + "jquery.autoellipsis-1.0.10.js");
app.import(vendorJs + "caret_position.js");
app.import(vendorJs + "show-html.js");
app.import("node_modules/ember-source/dist/ember-template-compiler.js", {
type: "test",
});

View File

@@ -27,7 +27,6 @@
//= require lodash.js
//= require itsatrap.js
//= require rsvp.js
//= require show-html.js
//= require uppy.js
//= require buffered-proxy
//= require jquery.autoellipsis-1.0.10

View File

@@ -20,7 +20,6 @@
//= require lodash.js
//= require itsatrap.js
//= require rsvp.js
//= require show-html.js
//= require uppy.js
//= require buffered-proxy
//= require jquery.autoellipsis-1.0.10

View File

@@ -290,6 +290,16 @@ $quote-share-maxwidth: 150px;
animation: heartBump 0.4s;
}
@keyframes slideout {
from {
max-height: 60px;
}
to {
max-height: 9999px;
}
}
// we use aside to hold expandable quotes (versus, say, static blockquotes)
aside.quote {
margin-top: 1em;
@@ -317,6 +327,17 @@ aside.quote {
// blockquote is docked within aside for content
blockquote {
margin-top: 0;
.expanded-quote {
overflow: hidden;
animation: slideout 1s ease-in-out;
&.icon-only {
text-align: center;
font-size: var(--font-up-4);
padding-top: 0.5em;
padding-bottom: 0.5em;
color: var(--primary-medium);
}
}
}
}