Skip to content

Commit

Permalink
Revert "Bugfix when baseurl is missing or empty in json (#371)"
Browse files Browse the repository at this point in the history
This reverts commit 3c70635.
  • Loading branch information
tobias-93 committed Jan 13, 2020
1 parent ce486b6 commit 2865a7c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Resources/js/router.js
Expand Up @@ -46,7 +46,7 @@ class Router {
* @param {Object} data
*/
setRoutingData(data) {
this.setBaseUrl((data['base_url'] && data['base_url'].length > 0) ? data['base_url'] : window.location.host);
this.setBaseUrl(data['base_url']);
this.setRoutes(data['routes']);

if ('prefix' in data) {
Expand Down
2 changes: 1 addition & 1 deletion Resources/public/js/router.js
Expand Up @@ -67,7 +67,7 @@ var Router = function () {
* @param {Object} data
*/
value: function setRoutingData(data) {
this.setBaseUrl(data['base_url'] && data['base_url'].length > 0 ? data['base_url'] : window.location.host);
this.setBaseUrl(data['base_url']);
this.setRoutes(data['routes']);

if ('prefix' in data) {
Expand Down
2 changes: 1 addition & 1 deletion Resources/public/js/router.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2865a7c

Please sign in to comment.