Merge pull request #386 from ralphbean/excise-tw2

Exorcise tw2.
fedora-infra · Apr 11, 2018 · 8225354 · 8225354
2 parents b8bbfdf + 84c1373
commit 8225354
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 14 deletions.
diff --git a/apache/tahrir.ini b/apache/tahrir.ini
@@ -5,7 +5,6 @@ port = 80
 
 [pipeline:main]
 pipeline =
-    egg:tw2.core#middleware
     pyramid
 
 [app:pyramid]

diff --git a/development.ini.example b/development.ini.example
@@ -5,12 +5,8 @@ port = 8000
 
 [pipeline:main]
 pipeline =
-    tw2
     pyramid
 
-[filter:tw2]
-use = egg:tw2.core#middleware
-
 [app:pyramid]
 
 use = egg:tahrir

diff --git a/production.ini b/production.ini
@@ -5,12 +5,8 @@ port = 80
 
 [pipeline:main]
 pipeline =
-    tw2
     pyramid
 
-[filter:tw2]
-use = egg:tw2.core#middleware
-
 [app:pyramid]
 
 use = egg:tahrir

diff --git a/tahrir/events.py b/tahrir/events.py
@@ -10,8 +10,6 @@
 
 from pyramid.settings import asbool
 
-import tw2.jquery
-
 import tahrir.views
 
 from pkg_resources import get_distribution
@@ -52,6 +50,3 @@ def inject_globals(event):
     event['gplus'] = asbool(settings.get('tahrir.social.gplus'))
 
     event['auth_principals'] = effective_principals(request)
-
-    # Cause jquery.js to be injected into the page.
-    tw2.jquery.jquery_js.display()
diff --git a/tahrir/static/js/jquery-3.3.1.min.js b/tahrir/static/js/jquery-3.3.1.min.js
diff --git a/tahrir/templates/master.mak b/tahrir/templates/master.mak
@@ -15,6 +15,7 @@ import json
     <link rel="stylesheet" media="mobile" href="${request.static_url('%s:static/css/unsemantic-grid-mobile.css' % theme_name)}" />
     <link rel="stylesheet" media="screen" href="${request.static_url('%s:static/css/unsemantic-grid-responsive.css' % theme_name)}" />
     <link rel="shortcut icon" href="${request.static_url('%s:static/img/favicon.ico' % theme_name)}" />
+    <script src="${request.static_url('%s:static/js/jquery-3.1.1.min.js' % theme_name)}"></script>
     <script src="${request.static_url('%s:static/js/social.js' % theme_name)}"></script>
     <script src="${request.static_url('%s:static/js/favico-0.3.4.min.js' % theme_name)}"></script>
     <script>