From f8581210864a3076ccca0fca8cf48c64165951de Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Wed, 12 Sep 2012 11:09:33 -0700 Subject: [PATCH] wiki: Move state variables out of inline JS. --- r2/r2/lib/template_helpers.py | 4 ++++ r2/r2/public/static/js/wiki.js | 4 ++-- r2/r2/templates/wikipagerevisions.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/r2/r2/lib/template_helpers.py b/r2/r2/lib/template_helpers.py index 4f01caea9..268c0dc3e 100755 --- a/r2/r2/lib/template_helpers.py +++ b/r2/r2/lib/template_helpers.py @@ -150,6 +150,10 @@ def js_config(): "uitracker_url": g.uitracker_url, "static_root": static(''), } + + if c.page: + config["wiki_page"] = c.page + return config diff --git a/r2/r2/public/static/js/wiki.js b/r2/r2/public/static/js/wiki.js index 20f15a234..01be19c16 100644 --- a/r2/r2/public/static/js/wiki.js +++ b/r2/r2/public/static/js/wiki.js @@ -98,10 +98,10 @@ r.wiki = { }) }, - goCompare: function(page, base) { + goCompare: function() { v1 = $('input:radio[name=v1]:checked').val() v2 = $('input:radio[name=v2]:checked').val() - url = base + '/' + page + '?v=' + v1 + url = r.wiki.baseUrl() + '/' + r.config.wiki_page + '?v=' + v1 if (v2 != v1) { url += '&v2=' + v2 } diff --git a/r2/r2/templates/wikipagerevisions.html b/r2/r2/templates/wikipagerevisions.html index 4f3eb375b..efbb6e5a1 100644 --- a/r2/r2/templates/wikipagerevisions.html +++ b/r2/r2/templates/wikipagerevisions.html @@ -22,6 +22,6 @@ ${thing.revisions} %if c.page and thing.revisions.things: - + %endif