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

updated jquery to 1.11.3

This commit is contained in:
El RIDO 2015-08-16 11:20:06 +02:00
parent 3aa4911991
commit 769768d25e
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

22
js/zerobin.js
View File

@ -51,7 +51,7 @@ function hashToParameterString(associativeArray)
} }
//padding for URL shorteners //padding for URL shorteners
parameterString += "&p=p"; parameterString += "&p=p";
return parameterString; return parameterString;
} }
@ -72,7 +72,7 @@ function parameterStringToHash(parameterString)
var value = decodeURIComponent(pair[1]); var value = decodeURIComponent(pair[1]);
parameterHash[key] = value; parameterHash[key] = value;
} }
return parameterHash; return parameterHash;
} }
@ -88,7 +88,7 @@ function getParameterHash()
return parameterStringToHash(window.location.href.substring(hashIndex + 1)); return parameterStringToHash(window.location.href.substring(hashIndex + 1));
} else { } else {
return {}; return {};
} }
} }
/** /**
@ -323,10 +323,10 @@ function send_data() {
if (!sjcl.random.isReady()) if (!sjcl.random.isReady())
{ {
showStatus('Sending paste (Please move your mouse for more entropy)...', spin=true); showStatus('Sending paste (Please move your mouse for more entropy)...', spin=true);
sjcl.random.addEventListener('seeded', function(){ send_data(); }); sjcl.random.addEventListener('seeded', function(){ send_data(); });
return; return;
} }
showStatus('Sending paste...', spin=true); showStatus('Sending paste...', spin=true);
var randomkey = sjcl.codec.base64.fromBits(sjcl.random.randomWords(8, 0), 0); var randomkey = sjcl.codec.base64.fromBits(sjcl.random.randomWords(8, 0), 0);
@ -375,13 +375,13 @@ function selectText(element) {
var doc = document var doc = document
, text = doc.getElementById(element) , text = doc.getElementById(element)
, range, selection , range, selection
; ;
if (doc.body.createTextRange) { //ms if (doc.body.createTextRange) { //ms
range = doc.body.createTextRange(); range = doc.body.createTextRange();
range.moveToElementText(text); range.moveToElementText(text);
range.select(); range.select();
} else if (window.getSelection) { //all others } else if (window.getSelection) { //all others
selection = window.getSelection(); selection = window.getSelection();
range = doc.createRange(); range = doc.createRange();
range.selectNodeContents(text); range.selectNodeContents(text);
selection.removeAllRanges(); selection.removeAllRanges();
@ -450,10 +450,10 @@ function rawText()
*/ */
function clonePaste() { function clonePaste() {
stateNewPaste(); stateNewPaste();
//Erase the id and the key in url //Erase the id and the key in url
history.replaceState(document.title, document.title, scriptLocation()); history.replaceState(document.title, document.title, scriptLocation());
showStatus(''); showStatus('');
$('textarea#message').text($('div#cleartext').text()); $('textarea#message').text($('div#cleartext').text());
} }
@ -550,7 +550,7 @@ $(function() {
// If "burn after reading" is checked, disable discussion. // If "burn after reading" is checked, disable discussion.
$('input#burnafterreading').change(function() { $('input#burnafterreading').change(function() {
if ($(this).is(':checked') ) { if ($(this).is(':checked') ) {
$('div#opendisc').addClass('buttondisabled'); $('div#opendisc').addClass('buttondisabled');
$('input#opendiscussion').attr({checked: false}); $('input#opendiscussion').attr({checked: false});
$('input#opendiscussion').attr('disabled',true); $('input#opendiscussion').attr('disabled',true);

2
lib/zerobin.php
View File

@ -198,7 +198,7 @@ class zerobin
} }
if ($expire > 0) $meta['expire_date'] = time() + $expire; if ($expire > 0) $meta['expire_date'] = time() + $expire;
} }
// Destroy the paste when it is read. // Destroy the paste when it is read.
if (!empty($_POST['burnafterreading'])) if (!empty($_POST['burnafterreading']))
{ {