WIP remote image styles

pull/1/head
ansuz 4 years ago
parent e5c8b6fd75
commit 4dcbddd174

@ -155,15 +155,23 @@
text-align: left; text-align: left;
} }
/* div.cp-inline-img-warning {
span.cp-inline-img-warning { display: inline-block;
//display: inline-block; //border: 1px solid red !important; // @cp_markdown-border !important;
border: 1px solid red; padding: 10px;
a, br, strong { //color: @cryptpad_color_light_red; // very bad in light mode
border: none; //background: @cryptpad_color_red_fader;
}
} */ .cp-inline-img {
//.cp-inline-img { } display: flex;
margin-bottom:10px;
}
.cp-alt-txt {
margin-left: 10px;
font-family: monospace;
font-size: 0.8em;
}
}
} }
.markdown_cryptpad() { .markdown_cryptpad() {

@ -279,8 +279,6 @@ define([
} }
}; };
var urlArgs = Util.find(ApiConfig, ['requireConf', 'urlArgs']) || '';
renderer.image = function (href, title, text) { // XXX renderer.image = function (href, title, text) { // XXX
if (href.slice(0,6) === '/file/') { // XXX this has been deprecated for about 3 years... use the same inline image handler as below? if (href.slice(0,6) === '/file/') { // XXX this has been deprecated for about 3 years... use the same inline image handler as below?
// DEPRECATED // DEPRECATED
@ -299,20 +297,22 @@ define([
return mt; return mt;
} }
var warning = h('span.cp-inline-img-warning', [ var warning = h('div.cp-inline-img-warning', [
h('img', { h('div.cp-inline-img', [
src: '/images/broken.png?ver=' + ApiConfig.requireConf.urlArgs, h('img.cp-inline-img', {
src: '/images/broken.png',
title: title || '',
}), }),
h('br'), h('p.cp-alt-txt', text),
h('span', { ]),
//title: text, h('span.cp-img-block-notice', {
}, "CryptPad blocked a remote image."), }, "CryptPad blocked a remote image."),
h('br'), h('br'),
h('a', { h('a.cp-remote-img', {
href: qualifiedHref(href), href: qualifiedHref(href),
}, "Open its source in a new tab"), }, "Open its source in a new tab"),
h('br'), h('br'),
h('a', { h('a.cp-learn-more', {
href: 'https://docs.cryptpad.fr/en/user_guide/index.html?placeholder=remote_images', href: 'https://docs.cryptpad.fr/en/user_guide/index.html?placeholder=remote_images',
}, 'learn why it was blocked'), }, 'learn why it was blocked'),
]); ]);
@ -827,26 +827,10 @@ define([
}); });
// replace remote images with links to those images // replace remote images with links to those images
$content.find('span.cp-inline-img-warning').each(function (index, el) { // XXX $content.find('div.cp-inline-img-warning').each(function (index, el) {
/*
var link = h('a', {
href: href, //el.src, //common.getBounceURL(el.src), // XXX
//target: '_blank',
//rel: 'noopener noreferrer',
//title: title, //el.src,
}, [
'open image at ',
h('strong', href), //el.src),
]);
*/
console.log('INLINE_IMG', index, el);
if (!el) { return; } if (!el) { return; }
var link = el.querySelector('a.cp-remote-img');
var link = el.querySelector('a');
if (!link) { return; } if (!link) { return; }
link.onclick = function (ev) { link.onclick = function (ev) {
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();

Loading…
Cancel
Save