URL bar updating improvements

js/actions/appActions.js

@@ -18,7 +18,18 @@ const AppActions = {
     })
   },
 
-  setNavBarInput: function (location) {
+  setLocation: function (loc, key) {
+    if (UrlUtil.isURL(loc)) {
+      loc = UrlUtil.getUrlFromInput(loc)
+    }
+    AppDispatcher.dispatch({
+      actionType: AppConstants.APP_SET_LOCATION,
+      location: loc,
+      key: key
+    })
+  },
+
+  setNavBarUserInput: function (location) {
     AppDispatcher.dispatch({
       actionType: AppConstants.APP_SET_NAVBAR_INPUT,
       location

js/components/frame.js

@@ -80,14 +80,21 @@ class Frame extends ImmutableComponent {
     this.webview.addEventListener('dom-ready', () => {
       console.log('dom is ready')
     })
-    this.webview.addEventListener('did-get-redirect-request', (oldUrl, newUrl) => {
-      console.log('got redirect', newUrl)
-      AppActions.setNavBarInput(newUrl)
+    this.webview.addEventListener('did-get-redirect-request', (event) => {
+      // Update the url bar for top-level location changes
+      if (event.isMainFrame) {
+        let key = this.props.frame.get('key')
+        console.log('got redirect', event.oldURL, event.newURL, key)
+        AppActions.setLocation(event.newURL, key)
+      }
     })
     this.webview.addEventListener('did-start-loading', () => {
-      console.log('spinner start loading')
+      let key = this.props.frame.get('key')
+      let location = this.props.frame.get('location')
+      console.log('spinner start loading', location, key)
       AppActions.onWebviewLoadStart(
         this.props.frame)
+      AppActions.setLocation(location, key)
     })
     this.webview.addEventListener('did-stop-loading', () => {
       console.log('spinner stop loading')
@@ -126,7 +133,7 @@ class Frame extends ImmutableComponent {
         })}>
       <webview
         ref='webview'
-        src={this.props.frame.get('location')}
+        src={this.props.frame.get('src')}
         preload='content/webviewPreload.js'/>
     </div>
   }

js/components/urlBar.js

@@ -55,14 +55,21 @@ class UrlBar extends ImmutableComponent {
   }
 
   onChange (e) {
-    AppActions.setNavBarInput(e.target.value)
+    AppActions.setNavBarUserInput(e.target.value)
   }
 
   onFocus (e) {
     this.select()
     AppActions.setNavBarFocused(true)
   }
 
+ componentWillReceiveProps (newProps) {
+   let location = newProps.activeFrameProps.get('location')
+   if (location !== this.props.activeFrameProps.get('location')) {
+     AppActions.setLocation(location)
+   }
+ }
+
   render () {
     return <form
       action='#'

js/components/urlBarSuggestions.js

@@ -92,7 +92,7 @@ class UrlBarSuggestions extends ImmutableComponent {
 
     let navigateClickHandler = formatUrl => site => {
       let location = formatUrl(site)
-      AppActions.setNavBarInput(location)
+      AppActions.setNavBarUserInput(location)
       AppActions.loadUrl(location)
       this.blur()
     }

js/constants/appConstants.js

@@ -19,5 +19,6 @@ module.exports = {
   APP_SET_URL_BAR_PREVIEW: 18,
   APP_SET_URL_BAR_SUGGESTION_SEARCH_RESULTS: 19,
   APP_WEBVIEW_LOAD_START: 20,
-  APP_SET_FRAME_TITLE: 21
+  APP_SET_FRAME_TITLE: 21,
+  APP_SET_LOCATION: 22 // sets location of a frame
 }

js/constants/config.js

@@ -17,7 +17,7 @@ export default {
     height: 100
   },
   defaultLocale: 'en-US',
-  defaultUrl: 'http://www.brave.com',
+  defaultUrl: 'about:blank',
   urlBarSuggestions: {
     maxTopSites: 5,
     maxSearch: 3,

js/stores/appStore.js

@@ -40,6 +40,18 @@ const updateUrl = (loc) =>
     title: ''
   })
 
+const setLocation = (loc, key) => {
+  key = key || appState.get('activeFrameKey')
+  console.log('updating location', loc, key)
+  appState = appState.mergeIn(['frames', FrameStateUtil.findIndexForFrameKey(appState.get('frames'), key)], {
+    location: loc
+  })
+  // Update the displayed location in the urlbar
+  if (key === appState.get('activeFrameKey')) {
+    updateNavBarInput(loc)
+  }
+}
+
 const updateNavBarInput = (loc) => {
   appState = appState.setIn(['ui', 'navbar', 'urlbar', 'location'], loc)
   appState = appState.setIn(['ui', 'navbar', 'urlbar', 'urlPreview'], null)
@@ -79,6 +91,10 @@ AppDispatcher.register((action) => {
       updateUrl(action.location)
       appStore.emitChange()
       break
+    case AppConstants.APP_SET_LOCATION:
+      setLocation(action.location, action.key)
+      appStore.emitChange()
+      break
     case AppConstants.APP_SET_NAVBAR_INPUT:
       updateNavBarInput(action.location)
       appStore.emitChange()
@@ -96,10 +112,6 @@ AppDispatcher.register((action) => {
       appStore.emitChange()
       break
     case AppConstants.APP_WEBVIEW_LOAD_END:
-      // Only update for the active frame.
-      if (action.frameProps === appState.getIn(['frames', FrameStateUtil.findIndexForFrameKey(appState.get('frames'), appState.get('activeFrameKey'))])) {
-        updateNavBarInput(action.location)
-      }
       appState = appState.mergeIn(['frames', FrameStateUtil.getFramePropsIndex(appState.get('frames'), action.frameProps)], {
         loading: false
       })