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

Fix some lint warnings. Enable caret tests

Browse Source
This commit is contained in:
Artur Shaikhullin 2017-11-30 20:38:38 +06:00
parent c7a5dd6abb
commit 4eda328a61
5 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/browsertab.py
View File

@ -392,7 +392,7 @@ class AbstractCaret(QObject):
def has_selection(self): def has_selection(self):
raise NotImplementedError raise NotImplementedError
def selection(self, html=False, selection=None): def selection(self, html=False, callback=None):
raise NotImplementedError raise NotImplementedError
def follow_selected(self, *, tab=False): def follow_selected(self, *, tab=False):

19
qutebrowser/browser/commands.py
View File

@ -839,9 +839,9 @@ class CommandDispatcher:
keep: Stay in visual mode after yanking the selection. keep: Stay in visual mode after yanking the selection.
""" """
self.yank_object = { self.yank_object = {
'sel': sel, 'sel': sel,
'what': what, 'what': what,
'keep': keep 'keep': keep
} }
if what == 'title': if what == 'title':
s = self._tabbed_browser.page_title(self._current_index()) s = self._tabbed_browser.page_title(self._current_index())
@ -877,7 +877,8 @@ class CommandDispatcher:
utils.set_clipboard(s, selection=self.yank_object['sel']) utils.set_clipboard(s, selection=self.yank_object['sel'])
if self.yank_object['what'] != 'selection': if self.yank_object['what'] != 'selection':
message.info("Yanked {} to {}: {}".format(self.yank_object['what'], target, s)) message.info("Yanked {} to {}: {}".format(
self.yank_object['what'], target, s))
else: else:
message.info("{} {} yanked to {}".format( message.info("{} {} yanked to {}".format(
len(s), "char" if len(s) == 1 else "chars", target)) len(s), "char" if len(s) == 1 else "chars", target))
@ -1222,9 +1223,9 @@ class CommandDispatcher:
# until it fixed or blocked async call implemented: # until it fixed or blocked async call implemented:
# https://github.com/qutebrowser/qutebrowser/issues/3327 # https://github.com/qutebrowser/qutebrowser/issues/3327
self.userscript_object = { self.userscript_object = {
'cmd': cmd, 'cmd': cmd,
'args': args, 'args': args,
'verbose': verbose 'verbose': verbose
} }
caret = self._current_widget().caret caret = self._current_widget().caret
caret.selection(False, self._selection_callback) caret.selection(False, self._selection_callback)
@ -1280,8 +1281,8 @@ class CommandDispatcher:
try: try:
userscripts.run_async(tab, self.userscript_object['cmd'], userscripts.run_async(tab, self.userscript_object['cmd'],
*self.userscript_object['args'], win_id=self._win_id, *self.userscript_object['args'], win_id=self._win_id,
env=env, verbose=self.userscript_object['verbose']) env=env, verbose=self.userscript_object['verbose'])
except userscripts.Error as e: except userscripts.Error as e:
raise cmdexc.CommandError(e) raise cmdexc.CommandError(e)
finally: finally:

41
qutebrowser/browser/webengine/webenginetab.py
View File

@ -180,91 +180,91 @@ class WebEngineCaret(browsertab.AbstractCaret):
@pyqtSlot(usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode)
def _on_mode_entered(self, mode): def _on_mode_entered(self, mode):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'setInitialCursor')) javascript.assemble('caret', 'setInitialCursor'))
@pyqtSlot(usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode)
def _on_mode_left(self): def _on_mode_left(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'toggle')) javascript.assemble('caret', 'toggle'))
def move_to_next_line(self, count=1): def move_to_next_line(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveDown')) javascript.assemble('caret', 'moveDown'))
def move_to_prev_line(self, count=1): def move_to_prev_line(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveUp')) javascript.assemble('caret', 'moveUp'))
def move_to_next_char(self, count=1): def move_to_next_char(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveRight')) javascript.assemble('caret', 'moveRight'))
def move_to_prev_char(self, count=1): def move_to_prev_char(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveLeft')) javascript.assemble('caret', 'moveLeft'))
def move_to_end_of_word(self, count=1): def move_to_end_of_word(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToEndOfWord')) javascript.assemble('caret', 'moveToEndOfWord'))
def move_to_next_word(self, count=1): def move_to_next_word(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToNextWord')) javascript.assemble('caret', 'moveToNextWord'))
def move_to_prev_word(self, count=1): def move_to_prev_word(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToPreviousWord')) javascript.assemble('caret', 'moveToPreviousWord'))
def move_to_start_of_line(self): def move_to_start_of_line(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToStartOfLine')) javascript.assemble('caret', 'moveToStartOfLine'))
def move_to_end_of_line(self): def move_to_end_of_line(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToEndOfLine')) javascript.assemble('caret', 'moveToEndOfLine'))
def move_to_start_of_next_block(self, count=1): def move_to_start_of_next_block(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToStartOfNextBlock')) javascript.assemble('caret', 'moveToStartOfNextBlock'))
def move_to_start_of_prev_block(self, count=1): def move_to_start_of_prev_block(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToStartOfPrevBlock')) javascript.assemble('caret', 'moveToStartOfPrevBlock'))
def move_to_end_of_next_block(self, count=1): def move_to_end_of_next_block(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToEndOfNextBlock')) javascript.assemble('caret', 'moveToEndOfNextBlock'))
def move_to_end_of_prev_block(self, count=1): def move_to_end_of_prev_block(self, count=1):
for _ in range(count): for _ in range(count):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToEndOfPrevBlock')) javascript.assemble('caret', 'moveToEndOfPrevBlock'))
def move_to_start_of_document(self): def move_to_start_of_document(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToStartOfDocument')) javascript.assemble('caret', 'moveToStartOfDocument'))
def move_to_end_of_document(self): def move_to_end_of_document(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'moveToEndOfDocument')) javascript.assemble('caret', 'moveToEndOfDocument'))
def toggle_selection(self): def toggle_selection(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'toggleSelection')) javascript.assemble('caret', 'toggleSelection'))
def drop_selection(self): def drop_selection(self):
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'dropSelection')) javascript.assemble('caret', 'dropSelection'))
def has_selection(self): def has_selection(self):
if qtutils.version_check('5.10'): if qtutils.version_check('5.10'):
@ -283,7 +283,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
# WORKAROUND for # WORKAROUND for
# https://bugreports.qt.io/browse/QTBUG-53134 # https://bugreports.qt.io/browse/QTBUG-53134
self._tab.run_js_async( self._tab.run_js_async(
'window.getSelection().toString()', callback) 'window.getSelection().toString()', callback)
self.drop_selection() self.drop_selection()
def _follow_selected_cb(self, js_elem, tab=False): def _follow_selected_cb(self, js_elem, tab=False):
@ -328,6 +328,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
self._tab.run_js_async(js_code, lambda jsret: self._tab.run_js_async(js_code, lambda jsret:
self._follow_selected_cb(jsret, tab)) self._follow_selected_cb(jsret, tab))
class WebEngineScroller(browsertab.AbstractScroller): class WebEngineScroller(browsertab.AbstractScroller):
"""QtWebEngine implementations related to scrolling.""" """QtWebEngine implementations related to scrolling."""

3
qutebrowser/javascript/webengine_caret.js
View File

@ -1,8 +1,7 @@
"use strict"; "use strict";
window._qutebrowser.caret = (function() { window._qutebrowser.caret = (function() {
const axs = {};
var axs = {};
axs.dom = {}; axs.dom = {};

5
tests/end2end/features/test_caret_bdd.py
View File

@ -23,9 +23,4 @@ import pytest_bdd as bdd
# pylint: disable=unused-import # pylint: disable=unused-import
from end2end.features.test_yankpaste_bdd import init_fake_clipboard from end2end.features.test_yankpaste_bdd import init_fake_clipboard
pytestmark = pytest.mark.qtwebengine_todo("Caret mode is not implemented",
run=False)
bdd.scenarios('caret.feature') bdd.scenarios('caret.feature')