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

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
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 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
=== modified file 'src/Ubuntu/Components/Extras/Browser/selection01.js'
--- src/Ubuntu/Components/Extras/Browser/selection01.js 2014-04-23 12:30:01 +0000
+++ src/Ubuntu/Components/Extras/Browser/selection01.js 2015-01-23 16:56:21 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013-2014 Canonical Ltd.2 * Copyright 2013-2015 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -31,7 +31,8 @@
31 function getImgFullUri(uri) {31 function getImgFullUri(uri) {
32 if ((uri.slice(0, 7) === 'http://') ||32 if ((uri.slice(0, 7) === 'http://') ||
33 (uri.slice(0, 8) === 'https://') ||33 (uri.slice(0, 8) === 'https://') ||
34 (uri.slice(0, 7) === 'file://')) {34 (uri.slice(0, 7) === 'file://') ||
35 (uri.slice(0, 5) === 'data:')) {
35 return uri;36 return uri;
36 } else if (uri.slice(0, 1) === '/') {37 } else if (uri.slice(0, 1) === '/') {
37 var docuri = document.documentURI;38 var docuri = document.documentURI;
3839
=== modified file 'src/Ubuntu/Web/selection02.js'
--- src/Ubuntu/Web/selection02.js 2014-06-19 07:40:21 +0000
+++ src/Ubuntu/Web/selection02.js 2015-01-23 16:56:21 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013-2014 Canonical Ltd.2 * Copyright 2013-2015 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -25,7 +25,8 @@
25function getImgFullUri(uri) {25function getImgFullUri(uri) {
26 if ((uri.slice(0, 7) === 'http://') ||26 if ((uri.slice(0, 7) === 'http://') ||
27 (uri.slice(0, 8) === 'https://') ||27 (uri.slice(0, 8) === 'https://') ||
28 (uri.slice(0, 7) === 'file://')) {28 (uri.slice(0, 7) === 'file://') ||
29 (uri.slice(0, 5) === 'data:')) {
29 return uri;30 return uri;
30 } else if (uri.slice(0, 1) === '/') {31 } else if (uri.slice(0, 1) === '/') {
31 var docuri = document.documentURI;32 var docuri = document.documentURI;

Subscribers

People subscribed via source and target branches