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

Use original reload function for manual paste open link 

This fixes the issue where clicking on the link took you to the home page.
I seriously missed that this.reloadPage does not do the thing I thought it does,
so I updated the doc to make it clear and switched back to the correct function.

Basically reverts 86cd5e1c15
This commit is contained in:
rugk 2017-02-06 20:39:52 +01:00
parent e483d60eed
commit 5ad02a3d1c
No known key found for this signature in database
GPG Key ID: 05D40A636AFAB34D
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/privatebin.js
View File

@ -1350,6 +1350,8 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
/**
* reload the page
*
* This takes the user to the PrivateBin home page.
*
* @name controller.reloadPage
* @function
* @param {Event} event
@ -1552,8 +1554,8 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
{
// check if location is (already) shown in URL bar
if (window.location.href === this.pasteUrl.attr('href')) {
// if so we need to load link by reloading the site
this.reloadPage(event);
// if so we need to load link by reloading the current site
window.location.reload(true);
}
},

2
tpl/bootstrap.php
View File

@ -69,7 +69,7 @@ if ($MARKDOWN):
<?php
endif;
?>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-oojW5CP3H92XSLVeiMzHPgDrhxptPF8XzaQQrGp9SbGlBM9nDSlYMNtE2vH7wwXjYX+iL58pUCct29uEQtMvNw==" crossorigin="anonymous"></script>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-IPs+RdBDoPCC1Hv7DJbOf157BjPm5Xr/j+01BnZ0ZnwxqyfyM9NIZZjrCKpCsLHSIostuHjCkW8XgoHTPVPOTw==" crossorigin="anonymous"></script>
<!--[if lt IE 10]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]-->

2
tpl/page.php
View File

@ -47,7 +47,7 @@ if ($MARKDOWN):
<?php
endif;
?>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-oojW5CP3H92XSLVeiMzHPgDrhxptPF8XzaQQrGp9SbGlBM9nDSlYMNtE2vH7wwXjYX+iL58pUCct29uEQtMvNw==" crossorigin="anonymous"></script>
<script type="text/javascript" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-IPs+RdBDoPCC1Hv7DJbOf157BjPm5Xr/j+01BnZ0ZnwxqyfyM9NIZZjrCKpCsLHSIostuHjCkW8XgoHTPVPOTw==" crossorigin="anonymous"></script>
<!--[if lt IE 10]>
<style type="text/css">body {padding-left:60px;padding-right:60px;} #ienotice {display:block;} #oldienotice {display:block;}</style>
<![endif]-->