Merge pull request #2883 from kartik-v/patch-14

Simplify inline script code
This commit is contained in:
Alexander Makarov
2014-03-26 14:28:20 +03:00

View File

@@ -5,8 +5,11 @@ use yii\helpers\Json;
/* @var $this \yii\base\View */
/* @var $url string */
/* @var $enforceRedirect boolean */
$redirectJavaScript = <<<EOL
?>
<!DOCTYPE html>
<html>
<head>
<script>
function popupWindowRedirect(url, enforceRedirect)
{
if (window.opener && !window.opener.closed) {
@@ -19,15 +22,8 @@ function popupWindowRedirect(url, enforceRedirect)
window.location = url;
}
}
EOL;
$redirectJavaScript .= 'popupWindowRedirect(' . Json::encode($url) . ', ' . Json::encode($enforceRedirect) . ');';
?>
<!DOCTYPE html>
<html>
<head>
<?= Html::script($redirectJavaScript) ?>
popupWindowRedirect(<?= Json::encode($url) ?>, <?= Json::encode($enforceRedirect) ?>);
</script>
</head>
<body>
<h2 id="title" style="display:none;">Redirecting back to the &quot;<?= Yii::$app->name ?>&quot;...</h2>