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

Additional fixes

Browse Source
This commit is contained in:
Artur Shaikhullin 2017-12-06 13:58:23 +06:00
parent ed1d036077
commit 890e26b2b5
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/browser/commands.py
View File

@ -65,6 +65,8 @@ class CommandDispatcher:
def __init__(self, win_id, tabbed_browser): def __init__(self, win_id, tabbed_browser):
self._win_id = win_id self._win_id = win_id
self._tabbed_browser = tabbed_browser self._tabbed_browser = tabbed_browser
self.yank_object = {}
self.userscript_object = {}
def __repr__(self): def __repr__(self):
return utils.get_repr(self) return utils.get_repr(self)
@ -883,6 +885,7 @@ class CommandDispatcher:
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))
if not self.yank_object['keep']: if not self.yank_object['keep']:
log.procs.debug(self.yank_object['keep'])
modeman.leave(self._win_id, KeyMode.caret, "yank selected", modeman.leave(self._win_id, KeyMode.caret, "yank selected",
maybe=True) maybe=True)
self.yank_object = None self.yank_object = None

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

@ -184,6 +184,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
@pyqtSlot(usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode)
def _on_mode_left(self): def _on_mode_left(self):
self.drop_selection()
self._tab.run_js_async( self._tab.run_js_async(
javascript.assemble('caret', 'toggle')) javascript.assemble('caret', 'toggle'))
@ -284,7 +285,6 @@ class WebEngineCaret(browsertab.AbstractCaret):
# 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()
def _follow_selected_cb(self, js_elem, tab=False): def _follow_selected_cb(self, js_elem, tab=False):
"""Callback for javascript which clicks the selected element. """Callback for javascript which clicks the selected element.

1
qutebrowser/browser/webkit/webkittab.py
View File

@ -338,6 +338,7 @@ class WebKitCaret(browsertab.AbstractCaret):
def selection(self, html=False, callback=False): def selection(self, html=False, callback=False):
if html: if html:
callback(self._widget.selectedHtml()) callback(self._widget.selectedHtml())
else:
callback(self._widget.selectedText()) callback(self._widget.selectedText())
def follow_selected(self, *, tab=False): def follow_selected(self, *, tab=False):

1
qutebrowser/javascript/webengine_caret.js
View File

@ -1051,6 +1051,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
funcs.moveToEndOfDocument = () => { funcs.moveToEndOfDocument = () => {
CaretBrowsing.move("forward", "documentboundary"); CaretBrowsing.move("forward", "documentboundary");
window.scrollTo(0, document.body.scrollHeight);
}; };
funcs.dropSelection = () => { funcs.dropSelection = () => {

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

@ -17,10 +17,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>. # along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
# pylint: disable=unused-import
import pytest import pytest
import pytest_bdd as bdd import pytest_bdd as bdd
# pylint: disable=unused-import
from end2end.features.test_yankpaste_bdd import init_fake_clipboard from end2end.features.test_yankpaste_bdd import init_fake_clipboard
bdd.scenarios('caret.feature') bdd.scenarios('caret.feature')