Add static() equivalent on client-side.

and make sure the code uses it.

r2/Makefile

@@ -22,7 +22,7 @@
 
 # Javascript files to be compressified
 js_libs              = $(addprefix lib/,json2.js jquery.cookie.js jquery.url.js ui.core.js ui.datepicker.js jquery.flot.js jquery.lazyload.js)
-js_sources           = $(js_libs) jquery.reddit.js reddit.js login.js ui.js base.js sponsored.js compact.js blogbutton.js flair.js analytics.js
+js_sources           = $(js_libs) jquery.reddit.js reddit.js login.js ui.js base.js sponsored.js compact.js blogbutton.js flair.js analytics.js utils.js
 js_targets           = button.js jquery.flot.js sponsored.js
 localized_js_targets = reddit.js mobile.js
 localized_js_outputs = $(localized_js_targets:.js=.*.js)

r2/r2/lib/js.py

@@ -190,6 +190,7 @@ module["reddit"] = LocalizedModule("reddit.js",
     "analytics.js",
     "flair.js",
     "reddit.js",
+    "utils.js",
 )
 
 module["mobile"] = LocalizedModule("mobile.js",

r2/r2/lib/template_helpers.py

@@ -160,7 +160,8 @@ def js_config():
         "is_fake": isinstance(c.site, FakeSubreddit),
         "tracking_domain": g.tracking_domain,
         "adtracker_url": g.adtracker_url,
-        "clicktracker_url": g.clicktracker_url
+        "clicktracker_url": g.clicktracker_url,
+        "static_root": static(''),
     }
     return config
 

r2/r2/public/static/js/compact.js

@@ -164,7 +164,7 @@ function show_edit_usertext(form) {
 }
 
 function fetch_more() {
-    $("#siteTable").after($("<div class='loading'><img src='/static/reddit_loading.png'/></div>"));
+    $("#siteTable").after($("<div class='loading'><img src='" + r.utils.staticURL('reddit_loading.png') + "'/></div>"));
 
 
     var o = document.location;

r2/r2/public/static/js/flair.js

@@ -154,7 +154,7 @@ $(function() {
         }
 
         $(selector)
-            .html('<img class="flairthrobber" src="/static/throbber.gif" />')
+            .html('<img class="flairthrobber" src="' + r.utils.staticURL('throbber.gif') + '" />')
             .addClass("active")
             .height(18).width(18)
             .css("padding-left", 4)

r2/r2/public/static/js/utils.js

@@ -0,0 +1,5 @@
+r.utils = {
+    staticURL: function (item) {
+        return r.config.static_root + '/' + item
+    }
+}