Skip to content

Commit

Permalink
Merge e54ec0b into d73e6bd
Browse files Browse the repository at this point in the history
  • Loading branch information
thostetler committed Oct 20, 2020
2 parents d73e6bd + e54ec0b commit d89234c
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions src/js/apps/discovery/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ define([
},

execute: function(callback, args) {
// only perform actions if history has started
if (Backbone.History.started) {
var route = Backbone.history.getFragment();
route = route === '' ? 'index' : route;

// Workaround for issue where hitting back button from the index page
// goes to an empty `search/` route, so capture that here and go back 2
if (route === 'search/' && _.isEmpty(_.reject(args, _.isUndefined))) {
return Backbone.history.history.go(-2);
}
}

if (_.isFunction(callback)) {
callback.apply(this, args);
Expand Down Expand Up @@ -71,7 +60,7 @@ define([
'paper-form(/)': 'paperForm',
'index/(:query)': 'index',
'search/(:query)(/)(:widgetName)': 'search',
'search(?:query)': 'search',
'search(/)(?:query)': 'search',
'execute-query/(:query)': 'executeQuery',
'abs/*path': 'view',
/*
Expand Down

0 comments on commit d89234c

Please sign in to comment.