LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Fix history logic #504

Closed
btzr-io wants to merge 5 commits from patch-2 into master
pull from: patch-2
merge into: LBRYCommunity:master
Conversation 4 Commits 5 Files changed 5 +5 -13
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b3c4f4369e - Show all commits

18
ui/js/reducers/app.js
View file

@ -172,27 +172,19 @@ reducers[types.WINDOW_FOCUSED] = function(state, action) {
};
reducers[types.HISTORY_NAVIGATE] = (state, action) => {
let page = false;
let location = false;
// Get history from state
const { history } = state;
if (action.data.page) {
// Get page
page = action.data.page;
} else if (action.data.location) {
// Get new location
location = action.data.location;
}
let { location, page } = action.data;
// Add new location to stack
if (location) {
const lastItem = history.stack.length - 1;
const lastIndex = history.stack.length - 1;
const lastPage = history.stack[lastIndex].location;
// Check for duplicated
let is_duplicate = lastItem > -1
? history.stack[lastItem].location === location
let is_duplicate = lastIndex > -1
? lastPage.replace(/[?]$/, "") === location.replace(/[?]$/, "")
: false;
if (!is_duplicate) {