From 8da1680aec9d7d1b0ba75cf4c6e0f7a39f6317d9 Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Mon, 21 Mar 2016 11:25:17 +0000 Subject: [PATCH] Bug 1257804 - avoid copy-pasting about:reader and copy-paste the URL instead, r=dolske MozReview-Commit-ID: IzBVSG4ZUte --HG-- extra : rebase_source : 7d752e42ae22902e4a45e3d62b56f1af624c1087 --- browser/base/content/test/general/browser_readerMode.js | 9 +++++++++ browser/base/content/urlbarBindings.xml | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/browser/base/content/test/general/browser_readerMode.js b/browser/base/content/test/general/browser_readerMode.js index 46648e6240d7..164461ff31e6 100644 --- a/browser/base/content/test/general/browser_readerMode.js +++ b/browser/base/content/test/general/browser_readerMode.js @@ -60,6 +60,15 @@ add_task(function* test_reader_button() { is(gURLBar.value, readerUrl, "gURLBar value is about:reader URL"); is(gURLBar.textValue, url.substring("http://".length), "gURLBar is displaying original article URL"); + // Check selected value for URL bar + yield new Promise((resolve, reject) => { + waitForClipboard(url, function () { + gURLBar.focus(); + gURLBar.select(); + goDoCommand("cmd_copy"); + }, resolve, reject); + }); + // Switch page back out of reader mode. readerButton.click(); yield promiseTabLoadEvent(tab); diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index 0e33d3844950..e78c80a6cb52 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -612,6 +612,12 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. return selectedVal; } + // Avoid copying 'about:reader?url=', and always provide the original URI: + let readerOriginalURL = ReaderMode.getOriginalUrl(uri.spec); + if (readerOriginalURL) { + uri = uriFixup.createFixupURI(readerOriginalURL, Ci.nsIURIFixup.FIXUP_FLAG_NONE); + } + // Only copy exposable URIs try { uri = uriFixup.createExposableURI(uri);