rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'kanikaa1234-develop'

Browse Source
This commit is contained in:
Florian Bruhin 2016-04-25 19:06:04 +02:00
commit dd2a7110e7
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,5 @@
__pycache__ __pycache__
*.py~
*.pyc *.pyc
*.swp *.swp
/build /build
@ -30,6 +31,7 @@ __pycache__
/.testmondata /.testmondata
/.hypothesis /.hypothesis
/prof /prof
/venv
TODO TODO
/scripts/testbrowser_cpp/Makefile /scripts/testbrowser_cpp/Makefile
/scripts/testbrowser_cpp/main.o /scripts/testbrowser_cpp/main.o

1
README.asciidoc
View File

@ -184,6 +184,7 @@ Contributors, sorted by the number of commits in descending order:
* Zach-Button * Zach-Button
* Halfwit * Halfwit
* rikn00 * rikn00
* kanikaa1234
* Michael Ilsaas * Michael Ilsaas
* Martin Zimmermann * Martin Zimmermann
* Brian Jackson * Brian Jackson

3
qutebrowser/browser/commands.py
View File

@ -430,6 +430,7 @@ class CommandDispatcher:
new_url = urlutils.incdec_number(url, incdec, segments=segments) new_url = urlutils.incdec_number(url, incdec, segments=segments)
except urlutils.IncDecError as error: except urlutils.IncDecError as error:
raise cmdexc.CommandError(error.msg) raise cmdexc.CommandError(error.msg)
self._open(new_url, tab, background, window) self._open(new_url, tab, background, window)
def _navigate_up(self, url, tab, background, window): def _navigate_up(self, url, tab, background, window):
@ -478,7 +479,7 @@ class CommandDispatcher:
cmdutils.check_exclusive((tab, bg, window), 'tbw') cmdutils.check_exclusive((tab, bg, window), 'tbw')
widget = self._current_widget() widget = self._current_widget()
frame = widget.page().currentFrame() frame = widget.page().currentFrame()
url = self._current_url() url = self._current_url().adjusted(QUrl.RemoveFragment)
if frame is None: if frame is None:
raise cmdexc.CommandError("No frame focused!") raise cmdexc.CommandError("No frame focused!")
hintmanager = objreg.get('hintmanager', scope='tab', tab='current') hintmanager = objreg.get('hintmanager', scope='tab', tab='current')

5
tests/integration/features/navigate.feature
View File

@ -38,6 +38,11 @@ Feature: Using :navigate
And I run :navigate next And I run :navigate next
Then the error "No forward links found!" should be shown Then the error "No forward links found!" should be shown
Scenario: Navigating to next page to a fragment
When I open data/navigate#fragment
And I run :navigate next
Then data/navigate/next.html should be loaded
# increment/decrement # increment/decrement
Scenario: Incrementing number in URL Scenario: Incrementing number in URL