replace data-URL method usage with blob-URL one
This commit is contained in:
El RIDO
parent
6cf52f4cf3
commit
451a4817c4
3 changed files with 8 additions and 77 deletions
|
|
@ -2101,8 +2101,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
||||||
// show preview
|
// show preview
|
||||||
PasteViewer.setText($message.val());
|
PasteViewer.setText($message.val());
|
||||||
if (AttachmentViewer.hasAttachmentData()) {
|
if (AttachmentViewer.hasAttachmentData()) {
|
||||||
let attachmentData = AttachmentViewer.getAttachmentData() || AttachmentViewer.getAttachmentLink().attr('href');
|
const attachment = AttachmentViewer.getAttachment();
|
||||||
AttachmentViewer.handleAttachmentPreview(AttachmentViewer.getAttachmentPreview(), attachmentData);
|
AttachmentViewer.handleBlobAttachmentPreview(
|
||||||
|
AttachmentViewer.getAttachmentPreview(),
|
||||||
|
attachment[0], attachment[1]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
PasteViewer.run();
|
PasteViewer.run();
|
||||||
|
|
||||||
|
|
@ -2743,85 +2746,13 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
||||||
attachmentData = dataURL;
|
attachmentData = dataURL;
|
||||||
|
|
||||||
if (Editor.isPreview()) {
|
if (Editor.isPreview()) {
|
||||||
me.handleAttachmentPreview($attachmentPreview, dataURL);
|
me.setAttachment(dataURL, loadedFile.name || '');
|
||||||
$attachmentPreview.removeClass('hidden');
|
$attachmentPreview.removeClass('hidden');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
fileReader.readAsDataURL(loadedFile);
|
fileReader.readAsDataURL(loadedFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* handle the preview of files that can either be an image, video, audio or pdf element
|
|
||||||
*
|
|
||||||
* @name AttachmentViewer.handleAttachmentPreview
|
|
||||||
* @function
|
|
||||||
* @argument {jQuery} $targetElement element where the preview should be appended
|
|
||||||
* @argument {string} file as a data URL
|
|
||||||
*/
|
|
||||||
me.handleAttachmentPreview = function ($targetElement, data) {
|
|
||||||
if (data) {
|
|
||||||
// source: https://developer.mozilla.org/en-US/docs/Web/API/FileReader#readAsDataURL()
|
|
||||||
const mimeType = data.slice(
|
|
||||||
data.indexOf('data:') + 5,
|
|
||||||
data.indexOf(';base64,')
|
|
||||||
);
|
|
||||||
|
|
||||||
attachmentHasPreview = true;
|
|
||||||
if (mimeType.match(/image\//i)) {
|
|
||||||
$targetElement.html(
|
|
||||||
$(document.createElement('img'))
|
|
||||||
.attr('src', data)
|
|
||||||
.attr('class', 'img-thumbnail')
|
|
||||||
);
|
|
||||||
} else if (mimeType.match(/video\//i)) {
|
|
||||||
$targetElement.html(
|
|
||||||
$(document.createElement('video'))
|
|
||||||
.attr('controls', 'true')
|
|
||||||
.attr('autoplay', 'true')
|
|
||||||
.attr('class', 'img-thumbnail')
|
|
||||||
|
|
||||||
.append($(document.createElement('source'))
|
|
||||||
.attr('type', mimeType)
|
|
||||||
.attr('src', data))
|
|
||||||
);
|
|
||||||
} else if (mimeType.match(/audio\//i)) {
|
|
||||||
$targetElement.html(
|
|
||||||
$(document.createElement('audio'))
|
|
||||||
.attr('controls', 'true')
|
|
||||||
.attr('autoplay', 'true')
|
|
||||||
|
|
||||||
.append($(document.createElement('source'))
|
|
||||||
.attr('type', mimeType)
|
|
||||||
.attr('src', data))
|
|
||||||
);
|
|
||||||
} else if (mimeType.match(/\/pdf/i)) {
|
|
||||||
// PDFs are only displayed if the filesize is smaller than about 1MB (after base64 encoding).
|
|
||||||
// Bigger filesizes currently cause crashes in various browsers.
|
|
||||||
// See also: https://code.google.com/p/chromium/issues/detail?id=69227
|
|
||||||
|
|
||||||
// Firefox crashes with files that are about 1.5MB
|
|
||||||
// The performance with 1MB files is bearable
|
|
||||||
if (data.length > 1398488) {
|
|
||||||
Alert.showError('File too large, to display a preview. Please download the attachment.'); //TODO: is this error really necessary?
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback for browsers, that don't support the vh unit
|
|
||||||
const clientHeight = $(window).height();
|
|
||||||
|
|
||||||
$targetElement.html(
|
|
||||||
$(document.createElement('embed'))
|
|
||||||
.attr('src', data)
|
|
||||||
.attr('type', 'application/pdf')
|
|
||||||
.attr('class', 'pdfPreview')
|
|
||||||
.css('height', clientHeight)
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
attachmentHasPreview = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* handle the preview of files decoded to blob that can either be an image, video, audio or pdf element
|
* handle the preview of files decoded to blob that can either be an image, video, audio or pdf element
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ if ($MARKDOWN):
|
||||||
endif;
|
endif;
|
||||||
?>
|
?>
|
||||||
<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
|
<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
|
||||||
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-kjbmxiSF8+OGm+5u/09c+YYlfMJBa9+i5bH7/2cd184aBxKDZsB9zc11XjFeYx5by2ZfaqhPBHNtWe2YBzCAuQ==" crossorigin="anonymous"></script>
|
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-1ER3ecJc80rN4kY5KXEMzudsTy26ypDxeAjiUs/rtaMsxZqKH2EWyK/V7x59eqn9udAlOOt3u5++xaEWu9b+ZQ==" crossorigin="anonymous"></script>
|
||||||
<!--[if lt IE 10]>
|
<!--[if lt IE 10]>
|
||||||
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ if ($MARKDOWN):
|
||||||
endif;
|
endif;
|
||||||
?>
|
?>
|
||||||
<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
|
<script type="text/javascript" data-cfasync="false" src="js/purify-1.0.7.js" integrity="sha512-VnKJHLosO8z2ojNvWk9BEKYqnhZyWK9rM90FgZUUEp/PRnUqR5OLLKE0a3BkVmn7YgB7LXRrjHgFHQYKd6DAIA==" crossorigin="anonymous"></script>
|
||||||
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-kjbmxiSF8+OGm+5u/09c+YYlfMJBa9+i5bH7/2cd184aBxKDZsB9zc11XjFeYx5by2ZfaqhPBHNtWe2YBzCAuQ==" crossorigin="anonymous"></script>
|
<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-1ER3ecJc80rN4kY5KXEMzudsTy26ypDxeAjiUs/rtaMsxZqKH2EWyK/V7x59eqn9udAlOOt3u5++xaEWu9b+ZQ==" crossorigin="anonymous"></script>
|
||||||
<!--[if lt IE 10]>
|
<!--[if lt IE 10]>
|
||||||
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
|
||||||
<![endif]-->
|
<![endif]-->
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue