Merge branch 'blyxxyz-strip-mailto'

2017-02-04 17:49:41 +01:00 · 2017-02-04 17:49:41 +01:00 · b988c9d1cb
commit b988c9d1cb
parent 75eb547b3b 1144060ab9
5 changed files with 23 additions and 2 deletions
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@ -27,6 +27,7 @@ Changed

 - Scrolling with the scrollwheel while holding shift now scrolls sideways
 - New way of clicking hints with which solves various small issues
+- When yanking a mailto: link via hints, the mailto: prefix is now stripped

 Fixed
 -----
--- a/README.asciidoc
+++ b/README.asciidoc
@ -146,8 +146,8 @@ Contributors, sorted by the number of commits in descending order:
 * Florian Bruhin
 * Daniel Schadt
 * Ryan Roden-Corrent
-* Jakub Klinkovský
 * Jan Verbeek
+* Jakub Klinkovský
 * Antoni Boucher
 * Lamar Pavel
 * Marshall Lochbaum
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@ -235,7 +235,10 @@ class HintActions:
        sel = (context.target == Target.yank_primary and
               utils.supports_selection())

-        urlstr = url.toString(QUrl.FullyEncoded | QUrl.RemovePassword)
+        flags = QUrl.FullyEncoded | QUrl.RemovePassword
+        if url.scheme() == 'mailto':
+            flags |= QUrl.RemoveScheme
+        urlstr = url.toString(flags)
        utils.set_clipboard(urlstr, selection=sel)

        msg = "Yanked URL to {}: {}".format(
--- a/tests/end2end/data/email_address.html
+++ b/tests/end2end/data/email_address.html
@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>Email address</title>
+    </head>
+    <body>
+        <a href="mailto:nobody">Email address</a>
+    </body>
+</html>
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@ -99,6 +99,12 @@ Feature: Using hints
        And I hint with args "links yank-primary" and follow a
        Then the clipboard should contain "http://localhost:(port)/data/hello.txt"

+    Scenario: Yanking email address to clipboard
+        When I run :debug-set-fake-clipboard
+        And I open data/email_address.html
+        And I hint with args "links yank" and follow a
+        Then the clipboard should contain "nobody"
+
    Scenario: Rapid hinting
        When I open data/hints/rapid.html in a new tab
        And I run :tab-only