web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace media-tag.js with the new one

Browse Source
This commit is contained in:
yflory 2018-06-07 14:11:49 +02:00
parent 38887eb088
commit bc57f8c274
5 changed files with 445 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.jshintignore
View File

@ -5,7 +5,7 @@ www/common/tippy/
www/common/jquery-ui/ www/common/jquery-ui/
server.js server.js
www/common/media-tag.js www/common/old-media-tag.js
www/scratch www/scratch
www/common/toolbar.js www/common/toolbar.js

431
www/common/media-tag.js
View File

File diff suppressed because one or more lines are too long

1
www/common/old-media-tag.js Normal file
View File

File diff suppressed because one or more lines are too long

12
www/mediatag/media-tag.js
View File

@ -22,6 +22,14 @@
} }
}; };
var fixHTML = function (str) {
if (!str) { return ''; }
return str.replace(/[<>&"']/g, function (x) {
return ({ "<": "&lt;", ">": "&gt", "&": "&amp;", '"': "&#34;", "'": "&#39;" })[x];
});
};
// Default config, can be overriden per media-tag call // Default config, can be overriden per media-tag call
var config = { var config = {
allowed: [ allowed: [
@ -48,6 +56,7 @@
image: function (metadata, url, content, cfg, cb) { image: function (metadata, url, content, cfg, cb) {
var img = document.createElement('img'); var img = document.createElement('img');
img.setAttribute('src', url); img.setAttribute('src', url);
img.blob = content;
cb(void 0, img); cb(void 0, img);
}, },
video: function (metadata, url, content, cfg, cb) { video: function (metadata, url, content, cfg, cb) {
@ -74,7 +83,8 @@
}, },
download: function (metadata, url, content, cfg, cb) { download: function (metadata, url, content, cfg, cb) {
var btn = document.createElement('button'); var btn = document.createElement('button');
btn.innerHTML = cfg.download.text; btn.innerHTML = cfg.download.text + '<br>' +
metadata.name ? '<b>' + fixHTML(metadata.name) + '</b>' : '';
btn.addEventListener('click', function () { btn.addEventListener('click', function () {
saveFile(content, url, metadata.name); saveFile(content, url, metadata.name);
}); });

4
www/pad/inner.js
View File

@ -601,8 +601,8 @@ define([
var $clone = $(inner).clone(); var $clone = $(inner).clone();
nThen(function (waitFor) { nThen(function (waitFor) {
$(inner).find('media-tag').each(function (i, el) { $(inner).find('media-tag').each(function (i, el) {
if (!$(el).data('blob')) { return; } if (!$(el).data('blob') || !el.blob) { return; }
Util.blobToImage($(el).data('blob'), waitFor(function (imgSrc) { Util.blobToImage(el.blob || $(el).data('blob'), waitFor(function (imgSrc) {
$clone.find('media-tag[src="' + $(el).attr('src') + '"] img') $clone.find('media-tag[src="' + $(el).attr('src') + '"] img')
.attr('src', imgSrc); .attr('src', imgSrc);
$clone.find('media-tag').parent() $clone.find('media-tag').parent()