From 9a7fe9e528c72d39efb1954275e1e588b2bb541c Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 21 Sep 2008 12:19:30 -0400 Subject: made jquery really optional, also switched to using google to serve jquery --- debug_toolbar/middleware.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py index bb8dbbc..c17c424 100644 --- a/debug_toolbar/middleware.py +++ b/debug_toolbar/middleware.py @@ -12,7 +12,16 @@ _HTML_TYPES = ('text/html', 'application/xhtml+xml') _END_HEAD_RE = re.compile(r'', re.IGNORECASE) _START_BODY_RE = re.compile(r'', re.IGNORECASE) _END_BODY_RE = re.compile(r'', re.IGNORECASE) -_CONTAINS_JQUERY_RE = re.compile("src=(?:(\"(.*?)jquery(.*?)\.js\")|('(.*?)jquery(.*?)\.js'))", re.IGNORECASE) + + +_JQUERY_OPTIONAL = """ + +""" class DebugToolbarMiddleware(object): """ @@ -58,7 +67,6 @@ class DebugToolbarMiddleware(object): # Saving this here in case we ever need to inject into #response.content = _END_HEAD_RE.sub(smart_str(self.debug_toolbar.render_styles() + "%s" % match.group()), response.content) response.content = _START_BODY_RE.sub(smart_str('' + self.debug_toolbar.render_toolbar()), response.content) - if not _CONTAINS_JQUERY_RE.search(response.content): - response.content = _END_BODY_RE.sub(smart_str('' % script_loc), response.content) + response.content = _END_BODY_RE.sub(smart_str('%s' % _JQUERY_OPTIONAL), response.content) response.content = _END_BODY_RE.sub(smart_str('' % script_loc), response.content) return response -- cgit v1.2.3