From 8ddd5c51bfd16abde6acd00ae896a1f3f2f57675 Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 21 Feb 2013 17:06:49 -0800 Subject: [PATCH] Load admin bar backbone with noConflict. This is to avoid conflicts with Backbone on the about pages until Backbone is in the main JS lib. --- r2/r2/public/static/js/adminbar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/r2/r2/public/static/js/adminbar.js b/r2/r2/public/static/js/adminbar.js index edc126f4f..6507cbef9 100644 --- a/r2/r2/public/static/js/adminbar.js +++ b/r2/r2/public/static/js/adminbar.js @@ -1,3 +1,5 @@ +(function(Backbone) { + r.adminbar = {} r.adminbar.AdminBar = Backbone.View.extend({ @@ -209,3 +211,5 @@ $(function() { r.adminbar.browserTimings.fetch() }, 0) }) + +})(Backbone.noConflict())