Skip to content

Commit

Permalink
Merge pull request #260 from emielmolenaar/fix-ssr
Browse files Browse the repository at this point in the history
Allow usage of the generated routes in SSR-enabled environments
  • Loading branch information
bakerkretzmar committed May 8, 2020
2 parents e03198f + cf5a113 commit c77f169
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/CommandRouteGenerator.php
Expand Up @@ -60,7 +60,7 @@ public function generate($group = false)
defaultParameters: $defaultParameters
};
if (typeof window.Ziggy !== 'undefined') {
if (typeof window !== 'undefined' && typeof window.Ziggy !== 'undefined') {
for (var name in window.Ziggy.namedRoutes) {
Ziggy.namedRoutes[name] = window.Ziggy.namedRoutes[name];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/assets/js/admin.js
Expand Up @@ -7,7 +7,7 @@
defaultParameters: []
};

if (typeof window.Ziggy !== 'undefined') {
if (typeof window !== 'undefined' && typeof window.Ziggy !== 'undefined') {
for (var name in window.Ziggy.namedRoutes) {
Ziggy.namedRoutes[name] = window.Ziggy.namedRoutes[name];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/assets/js/custom-url.js
Expand Up @@ -7,7 +7,7 @@
defaultParameters: []
};

if (typeof window.Ziggy !== 'undefined') {
if (typeof window !== 'undefined' && typeof window.Ziggy !== 'undefined') {
for (var name in window.Ziggy.namedRoutes) {
Ziggy.namedRoutes[name] = window.Ziggy.namedRoutes[name];
}
Expand Down
2 changes: 1 addition & 1 deletion tests/assets/js/ziggy.js
Expand Up @@ -7,7 +7,7 @@
defaultParameters: []
};

if (typeof window.Ziggy !== 'undefined') {
if (typeof window !== 'undefined' && typeof window.Ziggy !== 'undefined') {
for (var name in window.Ziggy.namedRoutes) {
Ziggy.namedRoutes[name] = window.Ziggy.namedRoutes[name];
}
Expand Down

0 comments on commit c77f169

Please sign in to comment.