From 554ae543b53436acb63cee2c8debac5a462609a8 Mon Sep 17 00:00:00 2001 From: Th3R3p0 Date: Thu, 24 Aug 2017 09:53:36 -0400 Subject: [PATCH 1/3] fixed encrypted paste on bootstrap theme - https://github.com/claudehohl/Stikked/issues/433 --- htdocs/themes/bootstrap/js/stikked.js | 47 +++++++++++++-------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/htdocs/themes/bootstrap/js/stikked.js b/htdocs/themes/bootstrap/js/stikked.js index 628e788..8db956c 100644 --- a/htdocs/themes/bootstrap/js/stikked.js +++ b/htdocs/themes/bootstrap/js/stikked.js @@ -38,24 +38,24 @@ ST.spamadmin = function() { return this.add(selector == null ? this.prevObject : this.prevObject.filter(selector)); } - $('.selectable>tbody').selectable({ - filter: 'tr', - cancel: 'a', - stop: function() { - var $deletestack = $(".paste_deletestack"); - var $input = $("input[name=pastes_to_delete]"); - $('.inv').show(); - $deletestack.empty(); - $input.empty(); - var res = []; - $(".ui-selected").each(function(i, el) { - var id = $('a', el).attr('href').split('view/')[1]; - res.push(id); - }); - $deletestack.text(res.join(' ')); - $input.val(res.join(' ')); - } - }); + // $('.selectable>tbody').selectable({ + // filter: 'tr', + // cancel: 'a', + // stop: function() { + // var $deletestack = $(".paste_deletestack"); + // var $input = $("input[name=pastes_to_delete]"); + // $('.inv').show(); + // $deletestack.empty(); + // $input.empty(); + // var res = []; + // $(".ui-selected").each(function(i, el) { + // var id = $('a', el).attr('href').split('view/')[1]; + // res.push(id); + // }); + // $deletestack.text(res.join(' ')); + // $input.val(res.join(' ')); + // } + // }); }; ST.line_highlighter = function() { @@ -128,9 +128,6 @@ ST.crypto = function() { $('#create_encrypted').on('click', function() { var $code = $('#code'); - // save CM into textarea - CM.editor.save(); - // encrypt the paste var key = ST.crypto_generate_key(32); var plaintext = $code.val(); @@ -190,14 +187,16 @@ ST.crypto = function() { .replace(/{{{breaking_space}}}/g, ' ') .replace(/\n/g, '
') - $('section blockquote.CodeMirror div').html(decrypted); + $('.row .span12 .CodeMirror').html(decrypted); // kick out potential dangerous and unnecessary stuff - $('section blockquote.CodeMirror div').css('background', '#efe'); + $('.text_formatted').css('background', '#efe'); $('.replies').hide(); - for (var i = 2; i <= 5; i++) { + for (var i = 2; i <= 7; i++) { $('.meta .detail:nth-child(' + i + ')').hide(); } + $('.meta .spacer:first').hide(); + $('.qr').hide(); } catch (e) {} } } From 3d901017fe4e77d8176ed4430fadd9c712c8bd25 Mon Sep 17 00:00:00 2001 From: Th3R3p0 Date: Thu, 24 Aug 2017 09:57:48 -0400 Subject: [PATCH 2/3] forgot to uncomment some lines from debugging. - however, this code may not be working anywqy and could potentially be removed --- htdocs/themes/bootstrap/js/stikked.js | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/themes/bootstrap/js/stikked.js b/htdocs/themes/bootstrap/js/stikked.js index 8db956c..000204d 100644 --- a/htdocs/themes/bootstrap/js/stikked.js +++ b/htdocs/themes/bootstrap/js/stikked.js @@ -38,24 +38,24 @@ ST.spamadmin = function() { return this.add(selector == null ? this.prevObject : this.prevObject.filter(selector)); } - // $('.selectable>tbody').selectable({ - // filter: 'tr', - // cancel: 'a', - // stop: function() { - // var $deletestack = $(".paste_deletestack"); - // var $input = $("input[name=pastes_to_delete]"); - // $('.inv').show(); - // $deletestack.empty(); - // $input.empty(); - // var res = []; - // $(".ui-selected").each(function(i, el) { - // var id = $('a', el).attr('href').split('view/')[1]; - // res.push(id); - // }); - // $deletestack.text(res.join(' ')); - // $input.val(res.join(' ')); - // } - // }); + $('.selectable>tbody').selectable({ + filter: 'tr', + cancel: 'a', + stop: function() { + var $deletestack = $(".paste_deletestack"); + var $input = $("input[name=pastes_to_delete]"); + $('.inv').show(); + $deletestack.empty(); + $input.empty(); + var res = []; + $(".ui-selected").each(function(i, el) { + var id = $('a', el).attr('href').split('view/')[1]; + res.push(id); + }); + $deletestack.text(res.join(' ')); + $input.val(res.join(' ')); + } + }); }; ST.line_highlighter = function() { From d550535b612ef2ba0232f58be259036ce64316be Mon Sep 17 00:00:00 2001 From: Th3R3p0 Date: Fri, 25 Aug 2017 21:57:32 -0400 Subject: [PATCH 3/3] fixed js error '.selectable is not a function --- htdocs/themes/bootstrap/js/stikked.js | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/themes/bootstrap/js/stikked.js b/htdocs/themes/bootstrap/js/stikked.js index 000204d..8db956c 100644 --- a/htdocs/themes/bootstrap/js/stikked.js +++ b/htdocs/themes/bootstrap/js/stikked.js @@ -38,24 +38,24 @@ ST.spamadmin = function() { return this.add(selector == null ? this.prevObject : this.prevObject.filter(selector)); } - $('.selectable>tbody').selectable({ - filter: 'tr', - cancel: 'a', - stop: function() { - var $deletestack = $(".paste_deletestack"); - var $input = $("input[name=pastes_to_delete]"); - $('.inv').show(); - $deletestack.empty(); - $input.empty(); - var res = []; - $(".ui-selected").each(function(i, el) { - var id = $('a', el).attr('href').split('view/')[1]; - res.push(id); - }); - $deletestack.text(res.join(' ')); - $input.val(res.join(' ')); - } - }); + // $('.selectable>tbody').selectable({ + // filter: 'tr', + // cancel: 'a', + // stop: function() { + // var $deletestack = $(".paste_deletestack"); + // var $input = $("input[name=pastes_to_delete]"); + // $('.inv').show(); + // $deletestack.empty(); + // $input.empty(); + // var res = []; + // $(".ui-selected").each(function(i, el) { + // var id = $('a', el).attr('href').split('view/')[1]; + // res.push(id); + // }); + // $deletestack.text(res.join(' ')); + // $input.val(res.join(' ')); + // } + // }); }; ST.line_highlighter = function() {