blitzwing/bintzwing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git@github.com:elrido/ZeroBin.git

Browse source 
Conflicts:
	js/zerobin.js
This commit is contained in:
El RIDO 2015-09-05 17:21:05 +02:00
commit b883d5eb4c
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/zerobin.js
View file

@ -623,6 +623,7 @@ $(function(){
var url = parent.scriptLocation() + '?' + data.id + '#' + randomkey; var url = parent.scriptLocation() + '?' + data.id + '#' + randomkey;
var deleteUrl = parent.scriptLocation() + '?pasteid=' + data.id + '&deletetoken=' + data.deletetoken; var deleteUrl = parent.scriptLocation() + '?pasteid=' + data.id + '&deletetoken=' + data.deletetoken;
parent.showStatus('', false); parent.showStatus('', false);
parent.errorMessage.addClass('hidden');
$('#pastelink').html('Your paste is <a id="pasteurl" href="' + url + '">' + url + '</a> <span id="copyhint">(Hit CTRL+C to copy)</span>'); $('#pastelink').html('Your paste is <a id="pasteurl" href="' + url + '">' + url + '</a> <span id="copyhint">(Hit CTRL+C to copy)</span>');
$('#deletelink').html('<a href="' + deleteUrl + '">Delete data</a>'); $('#deletelink').html('<a href="' + deleteUrl + '">Delete data</a>');
@ -786,7 +787,9 @@ $(function(){
} }
else else
{ {
this.errorMessage.removeClass('hidden').append(message); this.errorMessage.removeClass('hidden');
var content = this.errorMessage.contents();
content[content.length - 1].nodeValue = message;
} }
this.replyStatus.addClass('errorMessage').text(message); this.replyStatus.addClass('errorMessage').text(message);
}, },