Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Setting location for a frame will now set loading=true #5502

Closed
wants to merge 1 commit into from
Closed

Setting location for a frame will now set loading=true #5502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions js/stores/windowStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,17 @@ const doAction = (action) => {
currentLocation.substring(0, 6).toLowerCase() !== 'about:') {
windowState = windowState.mergeIn(frameStatePath(action.key), {
activeShortcut: 'load-non-navigatable-url',
activeShortcutDetails: action.location
activeShortcutDetails: action.location,
loading: true
})
}
updateNavBarInput(frame.get('location'), frameStatePath(action.key))
} else if (currentLocation === action.location) {
// reload if the url is unchanged
windowState = windowState.mergeIn(frameStatePath(action.key), {
audioPlaybackActive: false,
activeShortcut: 'reload'
activeShortcut: 'reload',
loading: true
})
windowState = windowState.mergeIn(tabStatePath(action.key), {
audioPlaybackActive: false
Expand All @@ -292,7 +294,8 @@ const doAction = (action) => {
windowState = windowState.mergeIn(frameStatePath(action.key), {
src: action.location,
location: action.location,
activeShortcut
activeShortcut,
loading: true
})
windowState = windowState.mergeIn(tabStatePath(action.key), {
location: action.location
Expand Down