Merge lp:~osomon/webapps-core/remove-formFactor into lp:webapps-core

[Olivier Tilloy]

Remove all references to the 'formFactor' context property (it’s being removed).

[David Barth (dbarth)]

review: Approve

=== modified file 'webapp-googleplus/lib/WebViewImpl.qml'
--- webapp-googleplus/lib/WebViewImpl.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/WebViewImpl.qml	2016-02-10 15:26:18 +0000
@@ -37,7 +37,7 @@
     confirmDialog: ConfirmDialog {}
     promptDialog: PromptDialog {}
     beforeUnloadDialog: BeforeUnloadDialog {}
-    filePicker: filePickerLoader.item
+    filePicker: contentPickerLoader.item || filePickerLoader.item
 
     onDownloadRequested: {
         if (downloadLoader.status == Loader.Ready) {
@@ -54,14 +54,20 @@
     }
 
     Loader {
+        id: contentPickerLoader
+        source: "ContentPickerDialog.qml"
+        asynchronous: true
+    }
+
+    Loader {
         id: filePickerLoader
-        source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml"
+        source: "FilePickerDialog.qml"
         asynchronous: true
     }
 
     Loader {
         id: downloadLoader
-        source: formFactor == "desktop" ? "" : "Downloader.qml"
+        source: "Downloader.qml"
         asynchronous: true
     }
 

=== modified file 'webapp-googleplus/webview-override.qml'
--- webapp-googleplus/webview-override.qml	2015-09-21 14:43:14 +0000
+++ webapp-googleplus/webview-override.qml	2016-02-10 15:26:18 +0000
@@ -215,10 +215,6 @@
         StateSaver.properties: "url"
         StateSaver.enabled: !runningLocalApplication
 
-        function shouldOpenPopupsInDefaultBrowser() {
-            return formFactor !== "desktop";
-        }
-
         function isRunningAsANamedWebapp() {
             return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
         }
@@ -326,12 +322,9 @@
                     return
                 }
 
-                if (shouldOpenPopupsInDefaultBrowser()) {
-                    console.debug('Opening popup window ' + targetUrl + ' in the browser window.')
-                    request.action = Oxide.NavigationRequest.ActionReject
-                    openUrlExternally(targetUrl)
-                    return;
-                }
+                console.debug('Opening popup window ' + targetUrl + ' in the browser window.')
+                request.action = Oxide.NavigationRequest.ActionReject
+                openUrlExternally(targetUrl)
                 return
             }
 
@@ -455,13 +448,10 @@
         }
 
         onGeolocationPermissionRequested: {
-            if (formFactor == "desktop") {
+            if (request.origin == request.embedder) {
+                request.accept()
+            } else {
                 requestGeolocationPermission(request)
-            } else {
-                // On devices where webapps are confined, trying to access the
-                // location service will trigger a system prompt from the trust
-                // store, so we don’t need a custom prompt.
-                request.accept()
             }
         }
     }