Merge lp:~abreu-alexandre/webapps-core/link-share-webpage-title into lp:webapps-core

[Alexandre Abreu]

Add web page title as part of the Links sharing operation

Add web page title as part of the Links sharing operation

[David Barth (dbarth)]

review: Approve

=== modified file 'webapp-facebook/unity-webapps-facebook/HubSharer.qml'
--- webapp-facebook/unity-webapps-facebook/HubSharer.qml	2016-04-29 20:17:48 +0000
+++ webapp-facebook/unity-webapps-facebook/HubSharer.qml	2016-06-13 15:06:03 +0000
@@ -26,6 +26,7 @@
 
     property string contentType
     property string fileToShare
+    property string text
 
     function _callback(accessToken,
                        fileToShare,
@@ -79,6 +80,7 @@
         visible: true
 
         fileToShare: main.fileToShare
+        text: main.text
         contentType: main.contentType
         callback: _callback
 
 
=== modified file 'webapp-facebook/unity-webapps-facebook/Share.qml'
--- webapp-facebook/unity-webapps-facebook/Share.qml	2016-02-26 18:47:52 +0000
+++ webapp-facebook/unity-webapps-facebook/Share.qml	2016-06-13 15:06:03 +0000
@@ -27,6 +27,7 @@
     anchors.fill: parent
 
     property string fileToShare
+    property string text
     property string contentType
     property var callback
 
@@ -61,6 +62,7 @@
 
         resourceToShare: root.fileToShare
         contentType: root.contentType
+        text: root.text
 
         onCancelled: root.cancelled()
         onShare: callback(root.accessToken,
 
=== modified file 'webapp-facebook/unity-webapps-facebook/ShareComponent.qml'
--- webapp-facebook/unity-webapps-facebook/ShareComponent.qml	2016-02-26 18:47:52 +0000
+++ webapp-facebook/unity-webapps-facebook/ShareComponent.qml	2016-06-13 15:06:03 +0000
@@ -26,6 +26,7 @@
     property string accountProviderDisplayName
     property string contentType
     property string resourceToShare
+    property string text
 
     signal cancelled()
     signal share(string userMessage)
@@ -169,6 +170,8 @@
                     font.pixelSize: FontUtils.sizeToPixels("medium")
                     font.weight: Font.Light
                     focus: true
+
+                    text: shareComponent.text
                 }
             }
         }
 
=== modified file 'webapp-facebook/unity-webapps-facebook/facebook.user.js'
--- webapp-facebook/unity-webapps-facebook/facebook.user.js	2016-02-26 18:58:26 +0000
+++ webapp-facebook/unity-webapps-facebook/facebook.user.js	2016-06-13 15:06:03 +0000
@@ -36,7 +36,7 @@
 	        api.launchEmbeddedUI(
                     "HubSharer",
                     uploadLink,
-                    {"fileToShare": items[0], contentType: type});
+                    {"fileToShare": items[0].url, text: items[0].text, contentType: type});
             });
         }
     });
 
=== modified file 'webapp-twitter/unity-webapps-twitter/share.user.js'
--- webapp-twitter/unity-webapps-twitter/share.user.js	2015-04-16 14:59:02 +0000
+++ webapp-twitter/unity-webapps-twitter/share.user.js	2016-06-13 15:06:03 +0000
@@ -47,7 +47,7 @@
             });
         } else if (type === hub.ContentType.Links) {
             transfer.items(function(items) {
-                uploadLink(items[0].url)
+                uploadLink(items[0].url, items[0].text)
             });
         }
     });
@@ -55,8 +55,8 @@
 hub.onShareRequested(_shareRequested);
 
 
-function uploadLink(url) {
-    window.location.href = 'https://www.twitter.com/share?url=' + url
+function uploadLink(url, text) {
+    window.location.href = 'https://www.twitter.com/share?url=' + url + '&text=' + text
     if (activeTransfer) {
         activeTransfer.setState(
             hub.ContentTransfer.State.Finalized)