Merge lp:~osomon/webbrowser-app/rtm-14.09-fix-1413964 into lp:webbrowser-app/rtm-14.09

Proposed by Olivier Tilloy on 2015-01-23
Status: Merged
Approved by: Olivier Tilloy on 2015-01-23
Approved revision: 783
Merged at revision: 784
Proposed branch: lp:~osomon/webbrowser-app/rtm-14.09-fix-1413964
Merge into: lp:webbrowser-app/rtm-14.09
Diff against target: 41 lines (+6/-4)
2 files modified
src/Ubuntu/Components/Extras/Browser/selection01.js (+3/-2)
src/Ubuntu/Web/selection02.js (+3/-2)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/rtm-14.09-fix-1413964
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-01-23 Pending
Review via email: mp+247448@code.launchpad.net

Commit message

Keep data URIs in their original form when retrieving image URLs

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/Extras/Browser/selection01.js'
2--- src/Ubuntu/Components/Extras/Browser/selection01.js 2014-04-23 12:30:01 +0000
3+++ src/Ubuntu/Components/Extras/Browser/selection01.js 2015-01-23 16:56:21 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright 2013-2014 Canonical Ltd.
7+ * Copyright 2013-2015 Canonical Ltd.
8 *
9 * This file is part of webbrowser-app.
10 *
11@@ -31,7 +31,8 @@
12 function getImgFullUri(uri) {
13 if ((uri.slice(0, 7) === 'http://') ||
14 (uri.slice(0, 8) === 'https://') ||
15- (uri.slice(0, 7) === 'file://')) {
16+ (uri.slice(0, 7) === 'file://') ||
17+ (uri.slice(0, 5) === 'data:')) {
18 return uri;
19 } else if (uri.slice(0, 1) === '/') {
20 var docuri = document.documentURI;
21
22=== modified file 'src/Ubuntu/Web/selection02.js'
23--- src/Ubuntu/Web/selection02.js 2014-06-19 07:40:21 +0000
24+++ src/Ubuntu/Web/selection02.js 2015-01-23 16:56:21 +0000
25@@ -1,5 +1,5 @@
26 /*
27- * Copyright 2013-2014 Canonical Ltd.
28+ * Copyright 2013-2015 Canonical Ltd.
29 *
30 * This file is part of webbrowser-app.
31 *
32@@ -25,7 +25,8 @@
33 function getImgFullUri(uri) {
34 if ((uri.slice(0, 7) === 'http://') ||
35 (uri.slice(0, 8) === 'https://') ||
36- (uri.slice(0, 7) === 'file://')) {
37+ (uri.slice(0, 7) === 'file://') ||
38+ (uri.slice(0, 5) === 'data:')) {
39 return uri;
40 } else if (uri.slice(0, 1) === '/') {
41 var docuri = document.documentURI;

Subscribers

People subscribed via source and target branches