Merge lp:~michael-sheldon/webbrowser-app/fix-1413964 into lp:webbrowser-app

[Michael Sheldon]

Keep data URIs in their original form when retrieving image URLs

Keep data URIs in their original form when retrieving image URLs

[Olivier Tilloy (osomon)]

Looks good, and I verified that it fixes bug #1413964.

review: Approve

=== 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 13:29:33 +0000
@@ -31,7 +31,8 @@
     function getImgFullUri(uri) {
         if ((uri.slice(0, 7) === 'http://') ||
             (uri.slice(0, 8) === 'https://') ||
-            (uri.slice(0, 7) === 'file://')) {
+            (uri.slice(0, 7) === 'file://') || 
+            (uri.slice(0, 5) === 'data:')) {
             return uri;
         } else if (uri.slice(0, 1) === '/') {
             var docuri = document.documentURI;

=== 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 13:29:33 +0000
@@ -25,7 +25,8 @@
 function getImgFullUri(uri) {
     if ((uri.slice(0, 7) === 'http://') ||
         (uri.slice(0, 8) === 'https://') ||
-        (uri.slice(0, 7) === 'file://')) {
+        (uri.slice(0, 7) === 'file://') ||
+        (uri.slice(0, 5) === 'data:')) {
         return uri;
     } else if (uri.slice(0, 1) === '/') {
         var docuri = document.documentURI;