diff --git a/i18n/es.json b/i18n/es.json
index 427f90dc..3a53ce83 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -132,6 +132,7 @@
"Cloned: '%s'": "Clonado: '%s'.",
"The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
"Attach a file": "Adjuntar archivo",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Remover adjunto",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Tu navegador no admite la carga de archivos cifrados. Utilice un navegador más reciente.",
diff --git a/i18n/fr.json b/i18n/fr.json
index 5ac34244..d5ad3d87 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -141,6 +141,7 @@
"Cloned: '%s'": "Cloner '%s'",
"The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
"Attach a file": "Attacher un fichier ",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Enlever l'attachement",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Votre navigateur ne supporte pas l'envoi de fichiers chiffrés. Merci d'utiliser un navigateur plus récent.",
diff --git a/i18n/it.json b/i18n/it.json
index d7885d70..548480ff 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -132,6 +132,7 @@
"Cloned: '%s'": "Clonato: '%s'",
"The cloned file '%s' was attached to this paste.": "Il file clonato '%s' era allegato a questo messaggio.",
"Attach a file": "Allega un file",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Rimuovi allegato",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Il tuo browser non supporta l'invio di file cifrati. Utilizza un browser più recente.",
diff --git a/i18n/no.json b/i18n/no.json
index 8292e104..6a227406 100644
--- a/i18n/no.json
+++ b/i18n/no.json
@@ -132,6 +132,7 @@
"Cloned: '%s'": "Kopiert: '%s'",
"The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
"Attach a file": "Legg til fil",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Slett vedlegg",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Nettleseren din støtter ikke å laste opp krypterte filer. Vennligst bruk en nyere nettleser.",
diff --git a/i18n/oc.json b/i18n/oc.json
index 90478768..c4f0984f 100644
--- a/i18n/oc.json
+++ b/i18n/oc.json
@@ -141,6 +141,7 @@
"Cloned: '%s'": "Clonar: '%s'",
"The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
"Attach a file": "Juntar un fichièr ",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Levar la pèca junta",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Vòstre navigator es pas compatible amb lo mandadís de fichièrs chifrats. Mercés d'emplegar un navigator mai recent.",
diff --git a/i18n/pl.json b/i18n/pl.json
index 82d9b579..d3e358e5 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -132,6 +132,7 @@
"Cloned: '%s'": "Sklonowano: '%s'",
"The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
"Attach a file": "Załącz plik",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Usuń załącznik",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Twoja przeglądarka nie wspiera wysyłania zaszyfrowanych plików. Użyj nowszej przeglądarki.",
diff --git a/i18n/pt.json b/i18n/pt.json
index 05ce23d1..cb388879 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -132,6 +132,7 @@
"Cloned: '%s'": "Clonado: '%s'",
"The cloned file '%s' was attached to this paste.": "O arquivo clonado '%s' foi anexado a essa cópia.",
"Attach a file": "Anexar um arquivo",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Remover anexo",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Seu navegador não permite subir arquivos cifrados. Por favor, utilize um navegador mais recente.",
diff --git a/i18n/ru.json b/i18n/ru.json
index da462c38..d5a7c85a 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -142,6 +142,7 @@
"The cloned file '%s' was attached to this paste.":
"Дубликат файла '%s' был прикреплен к этой записи.",
"Attach a file": "Прикрепить файл",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Удалить вложение",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Ваш браузер не поддерживает отправку зашифрованных файлов. Используйте более новый браузер.",
diff --git a/i18n/sl.json b/i18n/sl.json
index 21db8c1d..a7b337ad 100644
--- a/i18n/sl.json
+++ b/i18n/sl.json
@@ -141,6 +141,7 @@
"Cloned: '%s'": "'%s' klonirana",
"The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
"Attach a file": "Pripni datoteko",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "Odstrani priponko",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"Tvoj brskalnik ne omogoča nalaganje zakodiranih datotek. Prosim uporabi novejši brskalnik.",
diff --git a/i18n/zh.json b/i18n/zh.json
index 5fcaf3db..388ec1f2 100644
--- a/i18n/zh.json
+++ b/i18n/zh.json
@@ -132,6 +132,7 @@
"Cloned: '%s'": "克隆: '%s'",
"The cloned file '%s' was attached to this paste.": "克隆文件 '%s' 已附加到此粘贴。",
"Attach a file": "添加一个附件",
+ "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
"Remove attachment": "移除附件",
"Your browser does not support uploading encrypted files. Please use a newer browser.":
"您的浏览器不支持上传加密的文件，请使用更新的浏览器。",
diff --git a/js/privatebin.js b/js/privatebin.js
index 77e393fe..563efe52 100644
--- a/js/privatebin.js
+++ b/js/privatebin.js
@@ -1594,9 +1594,9 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
// show preview
PasteViewer.setText($message.val());
- if (AttachmentViewer.$attachment.length) {
- var attachmentData = AttachmentViewer.attachmentData || AttachmentViewer.$attachmentLink.attr('href');
- AttachmentViewer.handleAttachmentPreview(AttachmentViewer.$attachmentPreview, attachmentData);
+ if (AttachmentViewer.hasAttachmentData()) {
+ var attachmentData = AttachmentViewer.getAttachmentData() || AttachmentViewer.getAttachmentLink().attr('href');
+ AttachmentViewer.handleAttachmentPreview(AttachmentViewer.getAttachmentPreview(), attachmentData);
}
PasteViewer.run();
@@ -1984,13 +1984,13 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
var AttachmentViewer = (function (window, document) {
var me = {};
- me.$attachmentLink = undefined;
- me.$attachmentPreview = undefined;
- me.$attachment = undefined;
- me.attachmentData = undefined;
- me.file = undefined;
- me.$fileInput = undefined;
-
+ var $attachmentLink = undefined;
+ var $attachmentPreview = undefined;
+ var $attachment = undefined;
+ var attachmentData = undefined;
+ var file = undefined;
+ var $fileInput = undefined;
+ var $dragAndDropFileName = undefined;
var attachmentHasPreview = false;
/**
@@ -2003,15 +2003,14 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.setAttachment = function(attachmentData, fileName)
{
- me.$attachmentLink.attr('href', attachmentData);
+ $attachmentLink.attr('href', attachmentData);
if (typeof fileName !== 'undefined') {
- me.$attachmentLink.attr('download', fileName);
+ $attachmentLink.attr('download', fileName);
}
- AttachmentViewer.handleAttachmentPreview(AttachmentViewer.$attachmentPreview, attachmentData);
+ me.handleAttachmentPreview($attachmentPreview, attachmentData);
attachmentHasPreview = true;
-
- }
+ };
/**
* displays the attachment
@@ -2021,12 +2020,12 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.showAttachment = function()
{
- me.$attachment.removeClass('hidden');
+ $attachment.removeClass('hidden');
if (attachmentHasPreview) {
- me.$attachmentPreview.removeClass('hidden');
+ $attachmentPreview.removeClass('hidden');
}
- }
+ };
/**
* removes the attachment
@@ -2039,18 +2038,18 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.removeAttachment = function()
{
- if (!me.$attachment.length) {
+ if (!$attachment.length) {
return;
}
me.hideAttachment();
me.hideAttachmentPreview();
- me.$attachmentLink.prop('href', '');
- me.$attachmentLink.prop('download', '');
- me.$attachmentPreview.html('');
+ $attachmentLink.prop('href', '');
+ $attachmentLink.prop('download', '');
+ $attachmentPreview.html('');
- AttachmentViewer.file = undefined;
- AttachmentViewer.attachmentData = undefined;
- }
+ file = undefined;
+ attachmentData = undefined;
+ };
/**
* hides the attachment
@@ -2064,8 +2063,8 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.hideAttachment = function()
{
- me.$attachment.addClass('hidden');
- }
+ $attachment.addClass('hidden');
+ };
/**
* hides the attachment preview
@@ -2075,10 +2074,10 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.hideAttachmentPreview = function()
{
- if(me.$attachmentPreview){
- me.$attachmentPreview.addClass('hidden');
+ if ($attachmentPreview) {
+ $attachmentPreview.addClass('hidden');
}
- }
+ };
/**
* checks if there is an attachment
@@ -2088,12 +2087,26 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.hasAttachment = function()
{
- if (!AttachmentViewer.$attachment.length) {
+ if (!$attachment.length) {
return false;
}
- var link = me.$attachmentLink.prop('href');
- return (typeof link !== 'undefined' && link !== '')
- }
+ var link = $attachmentLink.prop('href');
+ return (typeof link !== 'undefined' && link !== '');
+ };
+
+ /**
+ * checks if there is attachment data available
+ *
+ * @name AttachmentViewer.hasAttachmentData
+ * @function
+ */
+ me.hasAttachmentData = function()
+ {
+ if ($attachment.length) {
+ return true;
+ }
+ return false;
+ };
/**
* return the attachment
@@ -2105,10 +2118,10 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
me.getAttachment = function()
{
return [
- me.$attachmentLink.prop('href'),
- me.$attachmentLink.prop('download')
+ $attachmentLink.prop('href'),
+ $attachmentLink.prop('download')
];
- }
+ };
/**
* moves the attachment link to another element
@@ -2123,68 +2136,66 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
me.moveAttachmentTo = function($element, label)
{
// move elemement to new place
- me.$attachmentLink.appendTo($element);
+ $attachmentLink.appendTo($element);
// update text
- I18n._(me.$attachmentLink, label, me.$attachmentLink.attr('download'));
- }
+ I18n._($attachmentLink, label, $attachmentLink.attr('download'));
+ };
-
- /*
- * Read file data as dataURL using the FileReader API
- * https://developer.mozilla.org/en-US/docs/Web/API/FileReader#readAsDataURL()
+ /**
+ * Read file data as dataURL using the FileReader API.
+ * @param {type} aFile The loaded file.
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/FileReader#readAsDataURL()}
+ * @returns {undefined}
*/
- me.readFileData = function (file) {
+ me.readFileData = function (aFile) {
if (typeof FileReader === 'undefined') {
// revert loading status…
- AttachmentViewer.hideAttachment();
- AttachmentViewer.hideAttachmentPreview();
- Alert.showError(I18n._('Your browser does not support uploading encrypted files. Please use a newer browser.'));
+ me.hideAttachment();
+ me.hideAttachmentPreview();
+ Alert.showError('Your browser does not support uploading encrypted files. Please use a newer browser.');
return;
}
var fileReader = new FileReader();
- if (file === undefined) {
- file = me.$fileInput[0].files[0];
- $('#dragAndDropFileName').text('');
+ if (aFile === undefined) {
+ aFile = $fileInput[0].files[0];
+ $($dragAndDropFileName).text('');
} else {
- $('#dragAndDropFileName').text(file.name);
+ $($dragAndDropFileName).text(aFile.name);
}
- me.file = file;
+ file = aFile;
fileReader.onload = function (event) {
var dataURL = event.target.result;
- me.attachmentData = dataURL;
+ attachmentData = dataURL;
if (Editor.isPreview()) {
- me.handleAttachmentPreview(AttachmentViewer.$attachmentPreview, dataURL);
+ me.handleAttachmentPreview($attachmentPreview, dataURL);
}
};
- fileReader.readAsDataURL(file);
+ fileReader.readAsDataURL(aFile);
};
/**
* Handle the preview of files that can either be an image, video, audio or pdf element.
- * @argument {DOM Element} targetElement where the preview should be appended.
+ * @argument {DOM Element} $targetElement where the preview should be appended.
* @argument {File Data} data of the file to be displayed.
*/
- me.handleAttachmentPreview = function (targetElement, data) {
+ me.handleAttachmentPreview = function ($targetElement, data) {
if (data) {
- var mimeType = this.getMimeTypeFromDataURL(data);
+ var mimeType = me.getMimeTypeFromDataURL(data);
if (mimeType.match(/image\//i)) {
- this.showImagePreview(targetElement, data);
+ this.showImagePreview($targetElement, data);
} else if (mimeType.match(/video\//i)) {
- this.showVideoPreview(targetElement, data, mimeType);
+ this.showVideoPreview($targetElement, data, mimeType);
} else if (mimeType.match(/audio\//i)) {
- this.showAudioPreview(targetElement, data, mimeType);
+ this.showAudioPreview($targetElement, data, mimeType);
} else if (mimeType.match(/\/pdf/i)) {
- this.showPDFPreview(targetElement, data);
+ this.showPDFPreview($targetElement, data);
}
- //else {
- //console.log("file but no image/video/audio/pdf");
- //}
}
};
@@ -2192,70 +2203,87 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
* Get Mime Type from a DataURL
*
* @param {type} dataURL
- * @returns Mime Type from a dataURL as obtained for a file using the FileReader API https://developer.mozilla.org/en-US/docs/Web/API/FileReader#readAsDataURL()
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/FileReader#readAsDataURL()}
+ * @returns Mime Type from a dataURL as obtained for a file using the FileReader API
*/
me.getMimeTypeFromDataURL = function (dataURL) {
return dataURL.slice(dataURL.indexOf('data:') + 5, dataURL.indexOf(';base64,'));
};
- me.showImagePreview = function (targetElement, image) {
- targetElement.html(
+ /**
+ * Displays an image attachment within the $targetElement.
+ * @param {type} $targetElement jQuery reference to the element, where the image should be displayed.
+ * @param {type} image The image to display.
+ */
+ me.showImagePreview = function ($targetElement, image) {
+ $targetElement.html(
$(document.createElement('img'))
.attr('src', image)
.attr('class', 'img-thumbnail')
);
- targetElement.removeClass('hidden');
+ $targetElement.removeClass('hidden');
};
- me.showVideoPreview = function (targetElement, video, mimeType) {
- var videoPlayer = $(document.createElement('video'))
+ /**
+ * Displays a video with the HTML5 video tag.
+ * @param {type} $targetElement jQuery reference to the element, where the image should be displayed.
+ * @param {type} video The video file.
+ * @param {type} mimeType The mimeType of the video, as returned by getMimeTypeFromDataURL.
+ */
+ me.showVideoPreview = function ($targetElement, video, mimeType) {
+ var $videoPlayer = $(document.createElement('video'))
.attr('controls', 'true')
.attr('autoplay', 'true')
- .attr('loop', 'true')
.attr('class', 'img-thumbnail');
- videoPlayer.append($(document.createElement('source'))
+ $videoPlayer.append($(document.createElement('source'))
.attr('type', mimeType)
.attr('src', video));
- targetElement.html(videoPlayer);
- targetElement.removeClass('hidden');
+ $targetElement.html($videoPlayer);
+ $targetElement.removeClass('hidden');
};
- me.showAudioPreview = function (targetElement, audio, mimeType) {
- var audioPlayer = $(document.createElement('audio'))
+ /**
+ * Play audio with the HTML5 audio tag.
+ * @param {type} $targetElement jQuery reference to the element, where the image should be displayed.
+ * @param {type} audio The audio file.
+ * @param {type} mimeType The mimeType of the audio file, as returned by getMimeTypeFromDataURL.
+ */
+ me.showAudioPreview = function ($targetElement, audio, mimeType) {
+ var $audioPlayer = $(document.createElement('audio'))
.attr('controls', 'true')
.attr('autoplay', 'true');
- audioPlayer.append($(document.createElement('source'))
+ $audioPlayer.append($(document.createElement('source'))
.attr('type', mimeType)
.attr('src', audio));
- targetElement.html(audioPlayer);
- targetElement.removeClass('hidden');
+ $targetElement.html($audioPlayer);
+ $targetElement.removeClass('hidden');
};
- me.showPDFPreview = function (targetElement, pdf) {
+ me.showPDFPreview = function ($targetElement, pdf) {
//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 bareable
- if (pdf.length < 1398488) {
+ if (pdf.length > 1398488) {
+ Alert.showError('File too large, to display a preview. Please download the attachment.');
+ return;
+ }
//Fallback for browsers, that don't support the vh unit
var clientHeight = $(window).height();
- targetElement.html(
+ $targetElement.html(
$(document.createElement('embed'))
.attr('src', pdf)
.attr('type', 'application/pdf')
.attr('class', 'pdfPreview')
.css('height', clientHeight)
);
- targetElement.removeClass('hidden');
- } else {
- Alert.showError(I18n._('File too large, to display a preview. Please download the attachment.'));
- }
+ $targetElement.removeClass('hidden');
};
/**
@@ -2263,9 +2291,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
* @returns {undefined}
*/
me.addDragDropHandler = function () {
- var fileInput = me.$fileInput;
-
- if (typeof fileInput === 'undefined' || fileInput.length === 0) {
+ if (typeof $fileInput === 'undefined' || $fileInput.length === 0) {
return;
}
@@ -2275,14 +2301,15 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
};
var drop = function(event) {
- event.stopPropagation();
- event.preventDefault();
+ var evt = event.originalEvent;
+ evt.stopPropagation();
+ evt.preventDefault();
- if (fileInput) {
- var file = event.dataTransfer.files[0];
+ if ($fileInput) {
+ var file = evt.dataTransfer.files[0];
//Clear the file input:
- fileInput.wrap('