From 82888cfe5342a04487081e4d0e00addecc22f3e1 Mon Sep 17 00:00:00 2001 From: lyaohe Date: Fri, 2 Dec 2016 11:53:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?error=E6=96=B9=E6=B3=95=E5=9C=A8ajax?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E?= =?UTF-8?q?url=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/traits/controller/Jump.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/traits/controller/Jump.php b/library/traits/controller/Jump.php index 0fad996d..1ea788bb 100644 --- a/library/traits/controller/Jump.php +++ b/library/traits/controller/Jump.php @@ -80,8 +80,9 @@ trait Jump $code = $msg; $msg = ''; } + $isAjax = Request::instance()->isAjax(); if (is_null($url)) { - $url = 'javascript:history.back(-1);'; + $url = $isAjax ? '':'javascript:history.back(-1);'; } elseif ('' !== $url) { $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); } From 39ea6f812c8c0b873352a4495b47e32cb9cedcf4 Mon Sep 17 00:00:00 2001 From: lyaohe Date: Fri, 2 Dec 2016 15:11:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?error=E6=96=B9=E6=B3=95=E5=9C=A8ajax?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9Eurl?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/traits/controller/Jump.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/traits/controller/Jump.php b/library/traits/controller/Jump.php index 1ea788bb..51f4281f 100644 --- a/library/traits/controller/Jump.php +++ b/library/traits/controller/Jump.php @@ -80,9 +80,8 @@ trait Jump $code = $msg; $msg = ''; } - $isAjax = Request::instance()->isAjax(); if (is_null($url)) { - $url = $isAjax ? '':'javascript:history.back(-1);'; + $url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);'; } elseif ('' !== $url) { $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); }