WIP remote image styles

This commit is contained in:
ansuz 2021-06-24 17:33:45 +05:30
parent e5c8b6fd75
commit 4dcbddd174
2 changed files with 29 additions and 37 deletions

View File

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

View File

@ -279,8 +279,6 @@ define([
}
};
var urlArgs = Util.find(ApiConfig, ['requireConf', 'urlArgs']) || '';
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?
// DEPRECATED
@ -299,20 +297,22 @@ define([
return mt;
}
var warning = h('span.cp-inline-img-warning', [
h('img', {
src: '/images/broken.png?ver=' + ApiConfig.requireConf.urlArgs,
}),
h('br'),
h('span', {
//title: text,
var warning = h('div.cp-inline-img-warning', [
h('div.cp-inline-img', [
h('img.cp-inline-img', {
src: '/images/broken.png',
title: title || '',
}),
h('p.cp-alt-txt', text),
]),
h('span.cp-img-block-notice', {
}, "CryptPad blocked a remote image."),
h('br'),
h('a', {
h('a.cp-remote-img', {
href: qualifiedHref(href),
}, "Open its source in a new tab"),
h('br'),
h('a', {
h('a.cp-learn-more', {
href: 'https://docs.cryptpad.fr/en/user_guide/index.html?placeholder=remote_images',
}, 'learn why it was blocked'),
]);
@ -827,26 +827,10 @@ define([
});
// replace remote images with links to those images
$content.find('span.cp-inline-img-warning').each(function (index, el) { // XXX
/*
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);
$content.find('div.cp-inline-img-warning').each(function (index, el) {
if (!el) { return; }
var link = el.querySelector('a');
var link = el.querySelector('a.cp-remote-img');
if (!link) { return; }
link.onclick = function (ev) {
ev.preventDefault();
ev.stopPropagation();