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

lazy session, fix: active entry is not the end of the history

Browse Source
This commit is contained in:
mhm@mhm.com 2017-11-18 14:12:37 +01:00
parent 2debeafe1b
commit cf8130bd22
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/html/back.html
View File

@ -6,9 +6,17 @@ window.onload = function() {
var node = document.getElementsByTagName('h1')[0]; var node = document.getElementsByTagName('h1')[0];
node.innerText = document.title = title; node.innerText = document.title = title;
}; };
window.onfocus = function() { setTimeout(function() {
window.history.back(); /* drop first focus event, to avoid problems
}; (allow to go easily to newer history entries) */
var triggered = false;
window.onfocus = function() {
if (! triggered) {
triggered = true;
window.history.back();
}
};
}, 1000);
{% endblock %} {% endblock %}
{% block content %} {% block content %}

26
qutebrowser/misc/sessions.py
View File

@ -206,7 +206,9 @@ class SessionManager(QObject):
qtutils.ensure_valid(item) qtutils.ensure_valid(item)
item_data = self._save_tab_item(tab, idx, item) item_data = self._save_tab_item(tab, idx, item)
if item_data['url'].startswith('qute://back'): if item_data['url'].startswith('qute://back'):
# dont add qute://back to the session file
if item_data.get('active', False) and data['history']: if item_data.get('active', False) and data['history']:
# mark entry before qute://back as active
data['history'][-1]['active'] = True data['history'][-1]['active'] = True
else: else:
data['history'].append(item_data) data['history'].append(item_data)
@ -331,15 +333,7 @@ class SessionManager(QObject):
if config.val.session_lazy_restore and data['history']: if config.val.session_lazy_restore and data['history']:
last = data['history'][-1] last = data['history'][-1]
if not last['url'].startswith('qute://'): for i, histentry in enumerate(data['history']):
data['history'].append({
'title': last['title'],
'url': 'qute://back#' + last['title'],
'active': last.get('active', False)
})
last['active'] = False
for histentry in data['history']:
user_data = {} user_data = {}
if 'zoom' in data: if 'zoom' in data:
@ -363,6 +357,20 @@ class SessionManager(QObject):
if 'pinned' in histentry: if 'pinned' in histentry:
new_tab.data.pinned = histentry['pinned'] new_tab.data.pinned = histentry['pinned']
if (config.val.session_lazy_restore and
histentry.get('active', False) and
not histentry['url'].startswith('qute://back')):
# remove "active" mark and insert back page marked as active
data['history'].insert(
i + 1,
{
'title': histentry['title'],
'url': 'qute://back#' + histentry['title'],
'active': True
})
histentry['active'] = False
print(histentry)
active = histentry.get('active', False) active = histentry.get('active', False)
url = QUrl.fromEncoded(histentry['url'].encode('ascii')) url = QUrl.fromEncoded(histentry['url'].encode('ascii'))
if 'original-url' in histentry: if 'original-url' in histentry: