diff --git a/Changelog.md b/Changelog.md index ed116bc7e09ef60b5208eea0b6d3a2a6d938dc69..1cadfb86b01a3275c53024bf3a7c6cae49e923a2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ * Fix pagination for people list on the tag stream page [#4245](https://github.com/diaspora/diaspora/pull/4245) * Fix missing timeago tooltip in conversations [#4257](https://github.com/diaspora/diaspora/issues/4257) * Fix link to background image [#4289](https://github.com/diaspora/diaspora/pull/4289) +* Fix Facebox icons 404s when called from Backbone ## Features * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252) diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index 240c44f3e3096cb26526c55708373b89bb41dc81..10275e8d68d2c6a78a57bd65e6c15d3c7aa5f8f8 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -40,25 +40,17 @@ var app = { app.currentUser = app.user(window.gon.user) || new app.models.User(); - if(app.currentUser.authenticated()){ + this.setupFacebox(); + this.setupHovercards(); + + if(app.currentUser.authenticated()) { app.header = new app.views.Header(); $("header").prepend(app.header.el); app.header.render(); } - Backbone.history.start({pushState: true}); - // there's probably a better way to do this... - $("a[rel=backbone]").live("click", function(evt){ - evt.preventDefault(); - var link = $(this); - - $(".stream_title").text(link.text()) - app.router.navigate(link.attr("href").substring(1) ,true) - }); - - app.hovercard = new app.views.Hovercard(); app.aspectMemberships = new app.views.AspectMembership(); }, @@ -80,6 +72,25 @@ var app = { return(preload) }, + setupFacebox: function() { + $.facebox.settings.closeImage = app.baseImageUrl()+'facebox/closelabel.png'; + $.facebox.settings.loadingImage = app.baseImageUrl()+'facebox/loading.gif'; + $.facebox.settings.opacity = 0.75; + }, + + setupHovercards: function() { + // there's probably a better way to do this... + $("a[rel=backbone]").live("click", function(evt){ + evt.preventDefault(); + var link = $(this); + + $(".stream_title").text(link.text()) + app.router.navigate(link.attr("href").substring(1) ,true) + }); + + app.hovercard = new app.views.Hovercard(); + }, + /* mixpanel wrapper function */ instrument : function(type, name, object, callback) { if(!window.mixpanel) { return } diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js index 6bc5cc3e774bf34876548d3856ad9d3e32596f92..2e9cdf3d27935022cb737f0a1e54d77abf40dc22 100644 --- a/app/assets/javascripts/view.js +++ b/app/assets/javascripts/view.js @@ -63,11 +63,6 @@ var View = { $(document.body).click(this.dropdowns.removeFocus); - /* facebox */ - $.facebox.settings.closeImage = app.baseImageUrl()+'facebox/closelabel.png'; - $.facebox.settings.loadingImage = app.baseImageUrl()+'facebox/loading.gif'; - $.facebox.settings.opacity = 0.75; - $('a[rel*=facebox]').facebox(); $(document).bind('reveal.facebox', function() { Diaspora.page.directionDetector.updateBinds();