Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • hive/condenser
1 result
Show changes
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
src/app/components/elements/PostCountDown.jsx
View file @ ee38ab00
......@@ -3,28 +3,39 @@ import { DateTime } from 'luxon';
import tt from "counterpart";
import HumanizeDuration from "humanize-duration";
import classnames from 'classnames';
import {Map} from "immutable";
const PostCountDown = (props) => {
const { post } = props;
const jsonMetadata = post.get('json_metadata');
const countDownEndDate = jsonMetadata.get('countdown');
let jsonMetadata;
let countDownEndDate;
if (post) {
jsonMetadata = post.get('json_metadata');
}
if (jsonMetadata instanceof Map) {
countDownEndDate = jsonMetadata.get('countdown');
}
const [remainingTime, setRemainingTime] = useState();
const [intervalHandler, setIntervalHandler] = useState();
useEffect(() => {
const endDate = DateTime.fromISO(countDownEndDate);
let interval = 1000;
if (countDownEndDate) {
const endDate = DateTime.fromISO(countDownEndDate);
let interval = 1000;
if (endDate.diff(DateTime.now()).as('days') >= 1) {
interval = 24 * 3600;
}
if (endDate.diff(DateTime.now()).as('days') >= 1) {
interval = 24 * 3600;
}
const updateRemainingTime = () => {
const remainingSeconds = Math.round(endDate.diff(DateTime.now()).as('seconds'));
setRemainingTime(remainingSeconds);
};
const updateRemainingTime = () => {
const remainingSeconds = Math.round(endDate.diff(DateTime.now()).as('seconds'));
setRemainingTime(remainingSeconds);
};
if (countDownEndDate) {
updateRemainingTime();
setIntervalHandler(setInterval(updateRemainingTime, interval));
}
......
src/shared/HtmlReady.js
View file @ ee38ab00
......@@ -153,7 +153,7 @@ function traverseForCodeHighlight(node, depth = 0) {
export function highlightCodes(html) {
if (html.match(/<code>.*?<\/code>/s)) {
const doc = DOMParser.parseFromString(html, 'text/html');
const doc = DOMParser.parseFromString(html.startsWith('<html>') ? html : `<html>${html}</html>`, 'text/html');
traverseForCodeHighlight(doc);
return {
html: doc ? XMLSerializer.serializeToString(doc) : '',
......
yarn.lock
View file @ ee38ab00
......@@ -2711,7 +2711,7 @@
object.fromentries "^2.0.0"
prop-types "^15.7.0"
 
"@xmldom/xmldom@^0.7.0":
"@xmldom/xmldom@^0.7.13":
version "0.7.13"
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.13.tgz#ff34942667a4e19a9f4a0996a76814daac364cf3"
integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==
......