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

[Chris Coulson]

I've added a comment to this

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-26 16:22:35 +0000
> @@ -65,16 +66,17 @@
>                  }
>              }
>          }
> -        onLoadingChanged: {
> -            if (webview.loading && !webview.fullscreen && !forceHide && !forceShow &&
> +
> +        onLoadEvent: {
> +            if (forceHide || forceShow) return
> +
> +            if (webview.loading && !webview.fullscreen &&

It seems you actually want onLoadingStateChanged rather than onLoadEvent here. onLoadEvent will have the same problem. I've updated the warning accordingly in http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/revision/1326

>                  (webview.locationBarController.mode == Oxide.LocationBarController.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
>              } else if ((event.type == Oxide.LoadEvent.TypeCommitted) ||


-- 
https://code.launchpad.net/~osomon/webbrowser-app/no-loadingChanged/+merge/283997
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~osomon/webbrowser-app/no-loadingChanged into lp:webbrowser-app.