diff --git a/r2/r2/lib/js.py b/r2/r2/lib/js.py index f04b07324..ee87efd54 100755 --- a/r2/r2/lib/js.py +++ b/r2/r2/lib/js.py @@ -342,6 +342,7 @@ module["reddit-init"] = Module("reddit-init.js", module["reddit"] = LocalizedModule("reddit.js", "lib/jquery.cookie.js", "lib/jquery.url.js", + "lib/backbone-0.9.10.js", "utils.js", "ui.js", "login.js", @@ -353,6 +354,7 @@ module["reddit"] = LocalizedModule("reddit.js", ) module["admin"] = Module("admin.js", + # include Backbone so it is available early to render admin bar fast. "lib/backbone-0.9.10.js", "adminbar.js", ) diff --git a/r2/r2/public/static/js/adminbar.js b/r2/r2/public/static/js/adminbar.js index fa8423bd5..a8c7066d1 100644 --- a/r2/r2/public/static/js/adminbar.js +++ b/r2/r2/public/static/js/adminbar.js @@ -1,5 +1,3 @@ -(function(Backbone) { - r.adminbar = {} r.adminbar.AdminBar = Backbone.View.extend({ @@ -236,5 +234,3 @@ $(function() { r.adminbar.browserTimings.fetch() }, 0) }) - -})(Backbone.noConflict())