From defe4f9036e2a95a522d8775b9e8f2bb1d8a9371 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Sun, 21 Aug 2016 18:59:51 +0200 Subject: [PATCH] site: chrome 52+ workaround for broken algo redirect Since recently Chrome doesnt refresh anymore the page on goback(); --- web/yaamp/modules/site/SiteController.php | 6 +++++- web/yaamp/modules/site/index.php | 2 +- web/yaamp/modules/site/miners.php | 2 +- web/yaamp/modules/site/wallet.php | 15 +++------------ web/yaamp/modules/stats/index.php | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/web/yaamp/modules/site/SiteController.php b/web/yaamp/modules/site/SiteController.php index 745975a..1d60e74 100644 --- a/web/yaamp/modules/site/SiteController.php +++ b/web/yaamp/modules/site/SiteController.php @@ -1022,7 +1022,11 @@ class SiteController extends CommonController else user()->setState('yaamp-algo', 'all'); - $this->goback(); + $route = getparam('r'); + if (!empty($route)) + $this->redirect($route); + else + $this->goback(); } public function actionGomining() diff --git a/web/yaamp/modules/site/index.php b/web/yaamp/modules/site/index.php index 372ecb3..b4d8406 100644 --- a/web/yaamp/modules/site/index.php +++ b/web/yaamp/modules/site/index.php @@ -133,7 +133,7 @@ function page_refresh() function select_algo(algo) { - window.location.href = '/site/algo?algo='+algo; + window.location.href = '/site/algo?algo='+algo+'&r=/'; } //////////////////////////////////////////////////// diff --git a/web/yaamp/modules/site/miners.php b/web/yaamp/modules/site/miners.php index 1169e80..0690fbe 100644 --- a/web/yaamp/modules/site/miners.php +++ b/web/yaamp/modules/site/miners.php @@ -48,7 +48,7 @@ function page_refresh() function select_algo(algo) { - window.location.href = '/site/algo?algo='+algo; + window.location.href = '/site/algo?algo='+algo+'&r=/site/miners'; } //////////////////////////////////////////////////// diff --git a/web/yaamp/modules/site/wallet.php b/web/yaamp/modules/site/wallet.php index 0fd13ed..0b1c673 100644 --- a/web/yaamp/modules/site/wallet.php +++ b/web/yaamp/modules/site/wallet.php @@ -1,7 +1,5 @@ getState('yaamp-algo'); - JavascriptFile("/extensions/jqplot/jquery.jqplot.js"); JavascriptFile("/extensions/jqplot/plugins/jqplot.dateAxisRenderer.js"); JavascriptFile("/extensions/jqplot/plugins/jqplot.barRenderer.js"); @@ -18,9 +16,8 @@ if($user) $coin = getdbo('db_coins', $user->coinid); if($coin) echo << - $(function() - { +