Merge branch 'master' of ssh://lupin/qutebrowser

This commit is contained in:
Florian Bruhin 2014-08-20 18:34:34 +02:00
commit 1e8b43e3b1
2 changed files with 6 additions and 2 deletions

View File

@ -227,7 +227,8 @@ def _is_editable_div(elem):
"""
# Beginnings of div-classes which are actually some kind of editor.
div_classes = ('CodeMirror', # Javascript editor over a textarea
'kix-') # Google Docs editor
'kix-', # Google Docs editor
'ace_') # http://ace.c9.io/
for klass in elem.classes():
if any([klass.startswith(e) for e in div_classes]):
return True

View File

@ -47,7 +47,10 @@ try:
['qutebrowser = qutebrowser.qutebrowser:main']},
test_suite='qutebrowser.test',
zip_safe=True,
extras_require={'nice-debugging': ['colorlog', 'colorama']},
install_requires=['pypeg2'],
extras_require={'nice-debugging': ['colorlog', 'colorama'],
'checks': ['flake8', 'pylint', 'check-manifest',
'pyroma']},
**setupdata
)
finally: