Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow routing to apps installed in subfolders #302

Merged
merged 8 commits into from
Jun 26, 2020
Merged

Allow routing to apps installed in subfolders #302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d0198d
Extract params from window.location.href instead of window.location.p…
bakerkretzmar Jun 12, 2020
b438ae9
Fix tests to set href explicitly
bakerkretzmar Jun 12, 2020
ea964d7
Add test for routing to app in a subfolder
bakerkretzmar Jun 12, 2020
9de1f90
Assets
bakerkretzmar Jun 12, 2020
c4f5150
Use window.location.pathname and a regex
bakerkretzmar Jun 12, 2020
6b977e1
Rebuild assets
bakerkretzmar Jun 16, 2020
037ebaa
Merge branch 'master' into jbk/subfolder-issue-295
bakerkretzmar Jun 16, 2020
0a7a64b
Assets
bakerkretzmar Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rebuild assets
  • Loading branch information
@bakerkretzmar
bakerkretzmar committed Jun 16, 2020
commit 6b977e1b37976bb12b6bd790a0285206efaf6821
4 changes: 1 addition & 3 deletions dist/js/route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,9 +1250,7 @@ var route_Router = /*#__PURE__*/function (_String) {
key: "params",
get: function get() {
var namedRoute = this.ziggy.namedRoutes[this.current()];
var baseUrlPathname = this.ziggy.baseUrl.split(this.ziggy.baseDomain)[1];
var hrefPathname = window.location.href.split(this.ziggy.baseDomain)[1];
var pathname = hrefPathname.replace(baseUrlPathname, '');
var pathname = window.location.pathname.replace(this.ziggy.baseUrl.split('://')[1].split('/')[1], '').replace(/^\/+/, '');
return _extends(this.extractParams(window.location.hostname, namedRoute.domain || '', '.'), this.extractParams(pathname, namedRoute.uri, '/'));
}
}]);
Expand Down
Loading