From 418d8c7377fb6b077e1ff5a9f00129d14fa4cb5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 22 Jul 2013 01:21:43 +0200
Subject: [PATCH] FIX: lightbox is not closed when using the back button

---
 app/assets/javascripts/discourse/components/lightbox.js  | 9 +++------
 .../javascripts/discourse/routes/discourse_route.js      | 2 ++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/lightbox.js b/app/assets/javascripts/discourse/components/lightbox.js
index fb128c53d0..cbd406d63c 100644
--- a/app/assets/javascripts/discourse/components/lightbox.js
+++ b/app/assets/javascripts/discourse/components/lightbox.js
@@ -8,12 +8,9 @@
 Discourse.Lightbox = {
   apply: function($elem) {
     var _this = this;
-    $('a.lightbox', $elem).each(function(i, e) {
-      $LAB.script("/javascripts/jquery.magnific-popup-min.js").wait(function() {
-        $(e).magnificPopup({
-          type: 'image',
-          closeOnContentClick: true
-        });
+    $LAB.script("/javascripts/jquery.magnific-popup-min.js").wait(function() {
+      $('a.lightbox', $elem).each(function(i, e) {
+        $(e).magnificPopup({ type: 'image', closeOnContentClick: true });
       });
     });
   }
diff --git a/app/assets/javascripts/discourse/routes/discourse_route.js b/app/assets/javascripts/discourse/routes/discourse_route.js
index 55043edf6f..efcb970de3 100644
--- a/app/assets/javascripts/discourse/routes/discourse_route.js
+++ b/app/assets/javascripts/discourse/routes/discourse_route.js
@@ -23,6 +23,8 @@ Discourse.Route = Em.Route.extend({
     $('.d-dropdown').hide();
     $('header ul.icons li').removeClass('active');
     $('[data-toggle="dropdown"]').parent().removeClass('open');
+    // close the lightbox
+    if ($.magnificPopup && $.magnificPopup.instance) { $.magnificPopup.instance.close(); }
 
     Discourse.set('notifyCount',0);