[Merge] lp:~abreu-alexandre/webbrowser-app/container-handle-camera-access into lp:webbrowser-app

[David Barth]

Typo in the comment below? I didn't understand the phrase. See inline comment.

Diff comments:

> 
> === modified file 'src/app/webcontainer/PopupWindowOverlay.qml'
> --- src/app/webcontainer/PopupWindowOverlay.qml	2015-12-01 20:11:50 +0000
> +++ src/app/webcontainer/PopupWindowOverlay.qml	2016-03-09 21:50:04 +0000
> @@ -165,6 +167,19 @@
>  
>          onUrlChanged: webviewUrlChanged(popupWebview.url)
>  
> +
> +        Connections {
> +            target: popupWebview.visible ? popupWebview : null
> +
> +            /**
> +             * We are only connecting to the mediaAccessPermission signal is we are current

what does that mean?

> +             * visible overlay.
> +             *
> +             * See the browser's webbrowser/Browser.qml source for additional comments.
> +             */
> +            onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
> +        }
> +
>          anchors {
>              bottom: parent.bottom
>              left: parent.left
> 
> === modified file 'src/app/webcontainer/WebViewImplOxide.qml'
> --- src/app/webcontainer/WebViewImplOxide.qml	2016-02-10 12:55:31 +0000
> +++ src/app/webcontainer/WebViewImplOxide.qml	2016-03-09 21:50:04 +0000
> @@ -198,6 +199,20 @@
>      }
>      contextMenu: webview.wide ? contextMenuWideComponent : contextMenuNarrowComponent
>  
> +    Connections {
> +        target: webview.visible ? webview : null
> +
> +        /**
> +         * We are only connecting to the mediaAccessPermission signal is we are current

what does that mean?

> +         * the only view visible (no overlay present). In the case of an overlay,
> +         * the absence of a signal handler in the main view, oxide's default behavior
> +         * is triggered and the request is denied.
> +         *
> +         * See the browser's webbrowser/Browser.qml source for additional comments.
> +         */
> +        onMediaAccessPermissionRequested:PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
> +    }
> +
>      StateSaver.properties: "url"
>      StateSaver.enabled: !runningLocalApplication
>  


-- 
https://code.launchpad.net/~abreu-alexandre/webbrowser-app/container-handle-camera-access/+merge/288571
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~abreu-alexandre/webbrowser-app/container-handle-camera-access into lp:webbrowser-app.