chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undoing code style regression

This commit is contained in:
El RIDO 2018-01-06 09:58:19 +01:00
parent 72acc95326
commit d92755f030
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
js/privatebin.js
View File

@ -508,7 +508,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
function compress(message) function compress(message)
{ {
return Base64.toBase64( RawDeflate.deflate( Base64.utob(message) ) ); return Base64.toBase64( RawDeflate.deflate( Base64.utob(message) ) );
}; }
/** /**
* decompress a message compressed with cryptToolcompress() * decompress a message compressed with cryptToolcompress()
@ -522,7 +522,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
function decompress(data) function decompress(data)
{ {
return Base64.btou( RawDeflate.inflate( Base64.fromBase64(data) ) ); return Base64.btou( RawDeflate.inflate( Base64.fromBase64(data) ) );
}; }
/** /**
* compress, then encrypt message with given key and password * compress, then encrypt message with given key and password
@ -804,7 +804,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// redirect to home page // redirect to home page
window.location.href = currentLocation; window.location.href = currentLocation;
} }
}; }
/** /**
* reload the page * reload the page
@ -1014,7 +1014,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// show notification // show notification
$element.removeClass('hidden'); $element.removeClass('hidden');
}; }
/** /**
* display a status message * display a status message
@ -1220,7 +1220,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
{ {
window.location.href = $shortenButton.data('shortener') window.location.href = $shortenButton.data('shortener')
+ encodeURIComponent($pasteUrl.attr('href')); + encodeURIComponent($pasteUrl.attr('href'));
}; }
/** /**
* Forces opening the paste if the link does not do this automatically. * Forces opening the paste if the link does not do this automatically.
@ -1239,7 +1239,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// if so we need to load link by reloading the current site // if so we need to load link by reloading the current site
window.location.reload(true); window.location.reload(true);
} }
}; }
/** /**
* creates a notification after a successfull paste upload * creates a notification after a successfull paste upload
@ -1379,7 +1379,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
$passwordModal.modal('hide'); $passwordModal.modal('hide');
PasteDecrypter.run(); PasteDecrypter.run();
}; }
/** /**
* ask the user for the password and set it * ask the user for the password and set it
@ -1495,7 +1495,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// prevent the textarea to lose focus // prevent the textarea to lose focus
event.preventDefault(); event.preventDefault();
} }
}; }
/** /**
* view the Editor tab * view the Editor tab
@ -1524,7 +1524,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
if (typeof event !== 'undefined') { if (typeof event !== 'undefined') {
event.preventDefault(); event.preventDefault();
} }
}; }
/** /**
* view the preview tab * view the preview tab
@ -1553,7 +1553,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
if (typeof event !== 'undefined') { if (typeof event !== 'undefined') {
event.preventDefault(); event.preventDefault();
} }
}; }
/** /**
* get the state of the preview * get the state of the preview
@ -1740,7 +1740,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
$prettyPrint.css('word-break', 'normal'); $prettyPrint.css('word-break', 'normal');
$prettyPrint.removeClass('prettyprint'); $prettyPrint.removeClass('prettyprint');
} }
}; }
/** /**
* displays the paste * displays the paste
@ -1769,7 +1769,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
$prettyMessage.removeClass('hidden'); $prettyMessage.removeClass('hidden');
break; break;
} }
}; }
/** /**
* sets the format in which the text is shown * sets the format in which the text is shown
@ -2124,7 +2124,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// cache jQuery elements // cache jQuery elements
$commentTail = Model.getTemplate('commenttail'); $commentTail = Model.getTemplate('commenttail');
}; }
/** /**
* open the comment entry when clicking the "Reply" button of a comment * open the comment entry when clicking the "Reply" button of a comment
@ -2153,7 +2153,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
$replyMessage.focus(); $replyMessage.focus();
event.preventDefault(); event.preventDefault();
}; }
/** /**
* custom handler for displaying notifications in own status message area * custom handler for displaying notifications in own status message area
@ -2427,7 +2427,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
pasteExpiration = target.data('expiration'); pasteExpiration = target.data('expiration');
event.preventDefault(); event.preventDefault();
}; }
/** /**
* set the format on bootstrap templates in dropdown * set the format on bootstrap templates in dropdown
@ -2453,7 +2453,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
* when "burn after reading" is checked, disable discussion * when "burn after reading" is checked, disable discussion
@ -2473,7 +2473,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
} else { } else {
$openDiscussionOption.removeClass('buttondisabled'); $openDiscussionOption.removeClass('buttondisabled');
} }
}; }
/** /**
* when discussion is checked, disable "burn after reading" * when discussion is checked, disable "burn after reading"
@ -2493,7 +2493,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
} else { } else {
$burnAfterReadingOption.removeClass('buttondisabled'); $burnAfterReadingOption.removeClass('buttondisabled');
} }
}; }
/** /**
* return raw text * return raw text
@ -2528,7 +2528,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
} }
newDoc.write('</head><body><pre>' + DOMPurify.sanitize(paste) + '</pre></body></html>'); newDoc.write('</head><body><pre>' + DOMPurify.sanitize(paste) + '</pre></body></html>');
newDoc.close(); newDoc.close();
}; }
/** /**
* saves the language in a cookie and reloads the page * saves the language in a cookie and reloads the page
@ -2542,7 +2542,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
{ {
document.cookie = 'lang=' + $(event.target).data('lang'); document.cookie = 'lang=' + $(event.target).data('lang');
UiHelper.reloadHome(); UiHelper.reloadHome();
}; }
/** /**
* hides all messages and creates a new paste * hides all messages and creates a new paste
@ -2556,7 +2556,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
{ {
Controller.hideStatusMessages(); Controller.hideStatusMessages();
Controller.newPaste(); Controller.newPaste();
}; }
/** /**
* removes the existing attachment * removes the existing attachment
@ -2580,7 +2580,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// pevent '#' from appearing in the URL // pevent '#' from appearing in the URL
event.preventDefault(); event.preventDefault();
}; }
/** /**
* Shows the QR code of the current paste (URL). * Shows the QR code of the current paste (URL).
@ -2596,7 +2596,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
text: window.location.href text: window.location.href
}); });
$('#qrcode-display').html(qrCanvas); $('#qrcode-display').html(qrCanvas);
}; }
/** /**
* Shows all elements belonging to viwing an existing pastes * Shows all elements belonging to viwing an existing pastes
@ -2989,7 +2989,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
throw 'symmetricKey is invalid, probably the module was not prepared'; throw 'symmetricKey is invalid, probably the module was not prepared';
} }
// password is optional // password is optional
}; }
/** /**
* called after successful upload * called after successful upload
@ -3009,7 +3009,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
if (successFunc !== null) { if (successFunc !== null) {
successFunc(status, result); successFunc(status, result);
} }
}; }
/** /**
* called after a upload failure * called after a upload failure
@ -3025,7 +3025,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
if (failureFunc !== null) { if (failureFunc !== null) {
failureFunc(status, result); failureFunc(status, result);
} }
}; }
/** /**
* actually uploads the data * actually uploads the data
@ -3264,7 +3264,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
requirementsChecked = true; requirementsChecked = true;
return true; return true;
}; }
/** /**
* called after successful paste upload * called after successful paste upload
@ -3296,7 +3296,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// parse and show text // parse and show text
// (preparation already done in me.sendPaste()) // (preparation already done in me.sendPaste())
PasteViewer.run(); PasteViewer.run();
}; }
/** /**
* called after successful comment upload * called after successful comment upload
@ -3318,7 +3318,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// reset error handler // reset error handler
Alert.setCustomHandler(null); Alert.setCustomHandler(null);
}); });
}; }
/** /**
* adds attachments to the Uploader * adds attachments to the Uploader
@ -3362,7 +3362,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
// if there are no attachments, this is of course still successful // if there are no attachments, this is of course still successful
return callback(); return callback();
} }
}; }
/** /**
* send a reply in a discussion * send a reply in a discussion
@ -3581,7 +3581,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
} }
return plaindata; return plaindata;
}; }
/** /**
* decrypt the actual paste text * decrypt the actual paste text
@ -3619,7 +3619,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
PasteViewer.run(); PasteViewer.run();
return true; return true;
}; }
/** /**
* decrypts any attachment * decrypts any attachment
@ -3663,7 +3663,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
AttachmentViewer.showAttachment(); AttachmentViewer.showAttachment();
return true; return true;
}; }
/** /**
* decrypts all comments and shows them * decrypts all comments and shows them
@ -3694,7 +3694,7 @@ jQuery.PrivateBin = (function($, sjcl, Base64, RawDeflate) {
DiscussionViewer.finishDiscussion(); DiscussionViewer.finishDiscussion();
return true; return true;
}; }
/** /**
* show decrypted text in the display area, including discussion (if open) * show decrypted text in the display area, including discussion (if open)

2
tpl/bootstrap.php
View File

@ -75,7 +75,7 @@ if ($MARKDOWN):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-cDLxHXCWvHJVduLTnrefONCCzuRC0Jzx7AMAELzGaUizCKPN85RNtZx3r/T4pTnwNwDkUVUlEjFa0VCe12P/HQ==" crossorigin="anonymous"></script> <script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-Htj3KgcsEq7pDJx0/qjvEfICFerLY9G/r8XBQ0QAdTKBAXYUNNh8pDun3IIVPyZSqEQf+A3M+DfUZGPNWgrMwg==" 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]-->

2
tpl/page.php
View File

@ -54,7 +54,7 @@ if ($QRCODE):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-cDLxHXCWvHJVduLTnrefONCCzuRC0Jzx7AMAELzGaUizCKPN85RNtZx3r/T4pTnwNwDkUVUlEjFa0VCe12P/HQ==" crossorigin="anonymous"></script> <script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-Htj3KgcsEq7pDJx0/qjvEfICFerLY9G/r8XBQ0QAdTKBAXYUNNh8pDun3IIVPyZSqEQf+A3M+DfUZGPNWgrMwg==" 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]-->