dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display preview with a single click

This commit is contained in:
yflory 2020-04-21 16:40:19 +02:00
parent 89de5869c5
commit 440980c4af
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/src/less2/include/markdown.less
View File

@ -1,3 +1,5 @@
@import (reference) "./tools.less";
.markdown_main() { .markdown_main() {
blockquote { blockquote {
background: #e5e5e5; background: #e5e5e5;
@ -95,6 +97,7 @@
svg { svg {
max-width: 100%; max-width: 100%;
cursor: pointer; cursor: pointer;
.tools_unselectable();
} }
} }
} }

16
www/common/diffMarked.js
View File

@ -447,7 +447,9 @@ define([
idx = 0; idx = 0;
} }
common.getMediaTagPreview(mts, idx); setTimeout(function () {
common.getMediaTagPreview(mts, idx);
});
}; };
}; };
@ -465,10 +467,10 @@ define([
contextMenu.show(e); contextMenu.show(e);
}); });
if ($mt.children().length) { if ($mt.children().length) {
$mt.off('dblclick preview'); $mt.off('click dblclick preview');
$mt.on('preview', onPreview($mt)); $mt.on('preview', onPreview($mt));
if ($mt.find('img').length) { if ($mt.find('img').length) {
$mt.on('dblclick', function () { $mt.on('click dblclick', function () {
$mt.trigger('preview'); $mt.trigger('preview');
}); });
} }
@ -485,10 +487,10 @@ define([
observer.disconnect(); observer.disconnect();
} }
}); });
$mt.off('dblclick preview'); $mt.off('click dblclick preview');
$mt.on('preview', onPreview($mt)); $mt.on('preview', onPreview($mt));
if ($mt.find('img').length) { if ($mt.find('img').length) {
$mt.on('dblclick', function () { $mt.on('click dblclick', function () {
$mt.trigger('preview'); $mt.trigger('preview');
}); });
} }
@ -518,9 +520,9 @@ define([
$(contextMenu.menu).find('li:not(.cp-svg)').hide(); $(contextMenu.menu).find('li:not(.cp-svg)').hide();
contextMenu.show(e); contextMenu.show(e);
}); });
$el.off('dblclick preview'); $el.off('dblclick click preview');
$el.on('preview', onPreview($el)); $el.on('preview', onPreview($el));
$el.on('dblclick', function () { $el.on('dblclick click', function () {
$el.trigger('preview'); $el.trigger('preview');
}); });

2
www/common/inner/common-mediatag.js
View File

@ -256,11 +256,9 @@ define([
$inner.append(cfg.svg); $inner.append(cfg.svg);
if (!cfg.render) { if (!cfg.render) {
$spinner.hide(); $spinner.hide();
console.error('here');
locked = false; locked = false;
return; return;
} }
console.error('there');
setTimeout(cfg.render); setTimeout(cfg.render);
tag = cfg.svg; tag = cfg.svg;
} else { } else {

1
www/common/sframe-common-outer.js
View File

@ -1003,6 +1003,7 @@ define([
if (typeof(SecureModal.cb) !== "function") { return; } if (typeof(SecureModal.cb) !== "function") { return; }
SecureModal.cb(data); SecureModal.cb(data);
}; };
config.onFileUpload = onFileUpload;
config.onClose = function () { config.onClose = function () {
SecureModal.$iframe.hide(); SecureModal.$iframe.hide();
}; };