[Merge] lp:~osomon/webbrowser-app/no-loadingChanged into lp:webbrowser-app

[Alexandre Abreu]

Review: Approve

one small comment, but otherwise +1

Diff comments:

> === modified file 'src/app/ChromeController.qml'
> --- src/app/ChromeController.qml	2015-11-04 16:47:37 +0000
> +++ src/app/ChromeController.qml	2016-01-27 10:37:18 +0000
> @@ -55,28 +59,33 @@
>  
>      Connections {
>          target: webview
> +
>          onFullscreenChanged: {
>              if (webview.fullscreen) {
> -                webview.locationBarController.mode = Oxide.LocationBarController.ModeHidden
> +                webview.locationBarController.mode = internal.modeHidden
>              } else if (!forceHide && !forceShow) {
>                  webview.locationBarController.mode = defaultMode
> -                if (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto) {
> +                if (webview.locationBarController.mode == internal.modeAuto) {
>                      webview.locationBarController.show(true)
>                  }
> +            } else if (!forceHide && forceShow) {

you might want to group this with the if() above:

if (!forceHide) {
  // forceShow?
}

> +                webview.locationBarController.mode = internal.modeShown
>              }
>          }
> -        onLoadingChanged: {
> +
> +        onLoadingStateChanged: {
>              if (webview.loading && !webview.fullscreen && !forceHide && !forceShow &&
> -                (webview.locationBarController.mode == Oxide.LocationBarController.ModeAuto)) {
> +                (webview.locationBarController.mode == internal.modeAuto)) {
>                  webview.locationBarController.show(true)
>              }
>          }
> +
>          onLoadEvent: {
>              // When loading, force ModeShown until the load is committed or stopped,
>              // to work around https://launchpad.net/bugs/1453908.
>              if (forceHide || forceShow) return
>              if (event.type == Oxide.LoadEvent.TypeStarted) {
> -                webview.locationBarController.mode = Oxide.LocationBarController.ModeShown
> +                webview.locationBarController.mode = internal.modeShown
>              } else if ((event.type == Oxide.LoadEvent.TypeCommitted) ||
>                         (event.type == Oxide.LoadEvent.TypeStopped)) {
>                  webview.locationBarController.mode = defaultMode


-- 
https://code.launchpad.net/~osomon/webbrowser-app/no-loadingChanged/+merge/283997
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.