Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-02-18 13:12:04 +01:00
commit 807a0824ea
2 changed files with 8 additions and 1 deletions

View File

@ -2,6 +2,11 @@
FelisCatus <catusx@gmail.com>
# SwitchyOmega translators:
Filip <filip@havlin.cz>
Michal Čihař <michal@cihar.com>
# SwitchyOmega includes or links to (unchanged):
# * jQuery UI (custom build)
# => omega-web/lib/jquery-ui-*.js

View File

@ -74,7 +74,9 @@ module.exports = class WebRequestMonitor
callback('ongoing', req)
_requestRedirected: (req) ->
if req.url.indexOf('data:') == 0
url = req.redirectUrl
return unless url
if url.indexOf('data:') == 0 || url.indexOf('about:') == 0
@_requestDone(req)
_requestError: (req) ->