From 4c9aaf0802043eb1505512c2cfd65b4512399276 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 8 Nov 2016 18:28:33 -0700 Subject: [PATCH] Setting location for a frame will now set loading=true Is this OK? Usually, it gets set to true in WindowStore:: WINDOW_WEBVIEW_LOAD_START The only places I see this used are: - navigationBar (which binds to urlBar, which then binds to urlBarIcon (where the problem is)) - tabs (used to show the loading spinner) Auditors: @diracdeltas, @bridiver --- js/stores/windowStore.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js index dcc4662908a..8fc69e95779 100644 --- a/js/stores/windowStore.js +++ b/js/stores/windowStore.js @@ -266,7 +266,8 @@ 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)) @@ -274,7 +275,8 @@ const doAction = (action) => { // 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 @@ -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