Pass on event

Thus the receiving function also had to be adjusted, so the right data is passed on.
This commit is contained in:
rugk 2017-04-11 22:36:25 +02:00
parent 7eb77e90e5
commit 073b52ce96
No known key found for this signature in database
GPG key ID: 05D40A636AFAB34D
3 changed files with 8 additions and 7 deletions

View file

@ -2690,7 +2690,7 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/ */
function clickRetryButton(event) function clickRetryButton(event)
{ {
retryButtonCallback(); retryButtonCallback(event);
} }
/** /**
@ -3862,9 +3862,6 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/ */
me.run = function(paste) me.run = function(paste)
{ {
// in case the button has been there previously
TopNav.hideRetryButton();
Alert.hideMessages(); Alert.hideMessages();
Alert.showLoading('Decrypting paste…', 0, 'cloud-download'); // @TODO icon maybe rotation-lock, but needs full Glyphicons Alert.showLoading('Decrypting paste…', 0, 'cloud-download'); // @TODO icon maybe rotation-lock, but needs full Glyphicons
@ -3917,7 +3914,11 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
Alert.showError('Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.'); Alert.showError('Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.');
// reset password, so it can be re-entered and sow retry button // reset password, so it can be re-entered and sow retry button
Prompt.reset(); Prompt.reset();
TopNav.setRetryCallback(me.run); TopNav.setRetryCallback(function () {
TopNav.hideRetryButton();
me.run(paste);
});
TopNav.showRetryButton(); TopNav.showRetryButton();
} }
} }

View file

@ -69,7 +69,7 @@ if ($MARKDOWN):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tGE0CigbTPqWg1xkIeJrdAT3U9QsTTI2k/8qviRyBVbyuevBiyM3XBlmpARRjHwv075QSK4h4TuI8TlU9ScS2Q==" crossorigin="anonymous"></script> <script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-fkW9atVxkKFf2q0zX8hWvuR1wTcQQIsIbjPsI5MxxFOn1i5ib1KMDrsjmf5tDuhGHRDa3nF/tQUzQUyirGm+lA==" 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]-->

View file

@ -47,7 +47,7 @@ if ($MARKDOWN):
<?php <?php
endif; endif;
?> ?>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-tGE0CigbTPqWg1xkIeJrdAT3U9QsTTI2k/8qviRyBVbyuevBiyM3XBlmpARRjHwv075QSK4h4TuI8TlU9ScS2Q==" crossorigin="anonymous"></script> <script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-fkW9atVxkKFf2q0zX8hWvuR1wTcQQIsIbjPsI5MxxFOn1i5ib1KMDrsjmf5tDuhGHRDa3nF/tQUzQUyirGm+lA==" 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]-->