Merge lp:~abreu-alexandre/webapps-core/fb-cleanup-sharing-div-creation into lp:webapps-core

Proposed by Alexandre Abreu
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 133
Merged at revision: 134
Proposed branch: lp:~abreu-alexandre/webapps-core/fb-cleanup-sharing-div-creation
Merge into: lp:webapps-core
Diff against target: 59 lines (+28/-15)
1 file modified
webapp-facebook/unity-webapps-facebook/facebook.user.js (+28/-15)
To merge this branch: bzr merge lp:~abreu-alexandre/webapps-core/fb-cleanup-sharing-div-creation
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
Review via email: mp+287353@code.launchpad.net

Commit message

Facebook cleanup div node creation when sharing data

Description of the change

Facebook cleanup div node creation when sharing data

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'webapp-facebook/unity-webapps-facebook/facebook.user.js'
2--- webapp-facebook/unity-webapps-facebook/facebook.user.js 2015-04-17 18:57:59 +0000
3+++ webapp-facebook/unity-webapps-facebook/facebook.user.js 2016-02-26 18:59:42 +0000
4@@ -72,15 +72,22 @@
5
6 var div = document.createElement('div');
7 div.innerHTML = '<form enctype="multipart/form-data" method="post" id="uploadForm"><textarea id="message" name="message"></textarea></form>';
8- document.getElementsByTagName('body')[0].appendChild(div);
9-
10- var blob = new Blob([byteArray], {type: contentType});
11-
12- var uploadForm = document.forms.namedItem("uploadForm");
13- var formData = new FormData(uploadForm);
14- formData.append('source', blob);
15- formData.append('message', results.message);
16- xhr.send(formData);
17+
18+ var body = document.getElementsByTagName('body')[0]
19+ body.appendChild(div);
20+ try {
21+ var blob = new Blob([byteArray], {type: contentType});
22+
23+ var uploadForm = document.forms.namedItem("uploadForm");
24+ var formData = new FormData(uploadForm);
25+ formData.append('source', blob);
26+ formData.append('message', results.message);
27+ xhr.send(formData);
28+
29+ body.removeChild(div);
30+ } catch(e) {
31+ console.log('Error while sending picture data: ' + e.toString());
32+ }
33 }
34
35 function uploadLink(res, onResourceUploadedCallback) {
36@@ -113,12 +120,18 @@
37 </textarea> \
38 </form>';
39
40- document.getElementsByTagName('body')[0].appendChild(div);
41+ var body = document.getElementsByTagName('body')[0]
42+ body.appendChild(div);
43+ try {
44+ var uploadForm = document.forms.namedItem("uploadForm");
45+ var formData = new FormData(uploadForm);
46+ formData.append('message', results.message);
47+ formData.append('link', results.fileToShare);
48+ xhr.send(formData);
49
50- var uploadForm = document.forms.namedItem("uploadForm");
51- var formData = new FormData(uploadForm);
52- formData.append('message', results.message);
53- formData.append('link', results.fileToShare);
54- xhr.send(formData);
55+ body.removeChild(div);
56+ } catch(e) {
57+ console.log('Error while sending link data: ' + e.toString());
58+ }
59 }
60

Subscribers

People subscribed via source and target branches

to all changes: