[Merge] lp:~fboucault/webbrowser-app/startup_time into lp:webbrowser-app

[Florian Boucault]

Diff comments:

> 
> === modified file 'src/app/webbrowser/Browser.qml'
> --- src/app/webbrowser/Browser.qml	2016-08-26 09:18:47 +0000
> +++ src/app/webbrowser/Browser.qml	2016-08-26 09:18:47 +0000
> @@ -222,12 +217,16 @@
>                  fill: tabContainer
>                  topMargin: (chrome.state == "shown") ? chrome.height : 0
>              }
> -            sourceComponent: ErrorSheet {
> -                visible: currentWebview ? currentWebview.lastLoadFailed : false
> -                url: currentWebview ? currentWebview.url : ""
> +            Component.onCompleted: setSource("../ErrorSheet.qml", {
> +                                                 "visible": Qt.binding(function(){ return currentWebview ? currentWebview.lastLoadFailed : false }),
> +                                                 "url": Qt.binding(function(){ return currentWebview ? currentWebview.url : "" })
> +                                             })
> +            Connections {
> +                target: errorSheetLoader.item ? errorSheetLoader.item : null

Fixed in rev 1510

>                  onRefreshClicked: currentWebview.reload()
>              }
> -            focus: item.visible
> +
> +            focus: item ? item.visible : false
>              asynchronous: true
>          }
>  
> @@ -237,9 +236,12 @@
>                  fill: tabContainer
>                  topMargin: (chrome.state == "shown") ? chrome.height : 0
>              }
> -            sourceComponent: InvalidCertificateErrorSheet {
> -                visible: currentWebview && currentWebview.certificateError != null
> -                certificateError: currentWebview ? currentWebview.certificateError : null
> +            Component.onCompleted: setSource("../InvalidCertificateErrorSheet.qml", {
> +                                                 "visible": Qt.binding(function(){ return currentWebview && currentWebview.certificateError != null }),
> +                                                 "certificateError": Qt.binding(function(){ return currentWebview ? currentWebview.certificateError : null })
> +                                             })
> +            Connections {
> +                target: invalidCertificateErrorSheetLoader.item ? invalidCertificateErrorSheetLoader.item : null

Fixed in rev 1510

>                  onAllowed: {
>                      // Automatically allow future requests involving this
>                      // certificate for the duration of the session.


-- 
https://code.launchpad.net/~fboucault/webbrowser-app/startup_time/+merge/300730
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.