Merge pull request #440 from Th3R3p0/encrypted-bootstrap

fixed encrypted paste on bootstrap theme
This commit is contained in:
Claude 2017-08-28 15:15:44 +02:00 committed by GitHub
commit 30068ae7f0

View File

@ -38,24 +38,24 @@ ST.spamadmin = function() {
return this.add(selector == null ? this.prevObject : this.prevObject.filter(selector)); return this.add(selector == null ? this.prevObject : this.prevObject.filter(selector));
} }
$('.selectable>tbody').selectable({ // $('.selectable>tbody').selectable({
filter: 'tr', // filter: 'tr',
cancel: 'a', // cancel: 'a',
stop: function() { // stop: function() {
var $deletestack = $(".paste_deletestack"); // var $deletestack = $(".paste_deletestack");
var $input = $("input[name=pastes_to_delete]"); // var $input = $("input[name=pastes_to_delete]");
$('.inv').show(); // $('.inv').show();
$deletestack.empty(); // $deletestack.empty();
$input.empty(); // $input.empty();
var res = []; // var res = [];
$(".ui-selected").each(function(i, el) { // $(".ui-selected").each(function(i, el) {
var id = $('a', el).attr('href').split('view/')[1]; // var id = $('a', el).attr('href').split('view/')[1];
res.push(id); // res.push(id);
}); // });
$deletestack.text(res.join(' ')); // $deletestack.text(res.join(' '));
$input.val(res.join(' ')); // $input.val(res.join(' '));
} // }
}); // });
}; };
ST.line_highlighter = function() { ST.line_highlighter = function() {
@ -128,9 +128,6 @@ ST.crypto = function() {
$('#create_encrypted').on('click', function() { $('#create_encrypted').on('click', function() {
var $code = $('#code'); var $code = $('#code');
// save CM into textarea
CM.editor.save();
// encrypt the paste // encrypt the paste
var key = ST.crypto_generate_key(32); var key = ST.crypto_generate_key(32);
var plaintext = $code.val(); var plaintext = $code.val();
@ -190,14 +187,16 @@ ST.crypto = function() {
.replace(/{{{breaking_space}}}/g, ' ') .replace(/{{{breaking_space}}}/g, ' ')
.replace(/\n/g, '<br />') .replace(/\n/g, '<br />')
$('section blockquote.CodeMirror div').html(decrypted); $('.row .span12 .CodeMirror').html(decrypted);
// kick out potential dangerous and unnecessary stuff // kick out potential dangerous and unnecessary stuff
$('section blockquote.CodeMirror div').css('background', '#efe'); $('.text_formatted').css('background', '#efe');
$('.replies').hide(); $('.replies').hide();
for (var i = 2; i <= 5; i++) { for (var i = 2; i <= 7; i++) {
$('.meta .detail:nth-child(' + i + ')').hide(); $('.meta .detail:nth-child(' + i + ')').hide();
} }
$('.meta .spacer:first').hide();
$('.qr').hide();
} catch (e) {} } catch (e) {}
} }
} }