From 20a0acb6f6ff3dd804d7443041bc96d7063c00d9 Mon Sep 17 00:00:00 2001
From: Chris Warrick <kwpolska@gmail.com>
Date: Mon, 3 Sep 2018 18:04:32 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20#3141=20=E2=80=94=C2=A0stop=20calling=20b?=
 =?UTF-8?q?aguetteBox.run=20twice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
---
 CHANGES.txt                                            | 2 ++
 nikola/data/themes/base/assets/js/gallery.js           | 4 ----
 nikola/data/themes/base/assets/js/gallery.min.js       | 2 +-
 nikola/data/themes/bootblog4-jinja/templates/base.tmpl | 7 ++-----
 nikola/data/themes/bootblog4/templates/base.tmpl       | 7 ++-----
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ae88cd9956..a051e6046b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,8 @@ Bugfixes
 
 * Enforce trailing slash for directories in ``nikola auto``
   (Issue #3140)
+* Galleries with baguetteBox don’t glitch out on the first image
+  anymore (Issue #3141)
 
 Removed features
 ----------------
diff --git a/nikola/data/themes/base/assets/js/gallery.js b/nikola/data/themes/base/assets/js/gallery.js
index bf87cddfc5..af29f4780b 100644
--- a/nikola/data/themes/base/assets/js/gallery.js
+++ b/nikola/data/themes/base/assets/js/gallery.js
@@ -28,9 +28,5 @@ function renderGallery(jsonContent, thumbnailSize) {
         div.appendChild(link);
         container.appendChild(div);
     }
-    baguetteBox.run('#gallery_container', {
-        captions: function(element) {
-            return element.getElementsByTagName('img')[0].alt;
-    }});
 }
 
diff --git a/nikola/data/themes/base/assets/js/gallery.min.js b/nikola/data/themes/base/assets/js/gallery.min.js
index c0618e3f57..c434155095 100644
--- a/nikola/data/themes/base/assets/js/gallery.min.js
+++ b/nikola/data/themes/base/assets/js/gallery.min.js
@@ -1 +1 @@
-function renderGallery(t,e){var i=document.getElementById("gallery_container");i.innerHTML="";var l=require("justified-layout")(t,{containerWidth:i.offsetWidth,targetRowHeight:.6*e,boxSpacing:5});i.style.height=l.containerHeight+"px";for(var n=l.boxes,r=0;r<n.length;r++){var a=document.createElement("img");a.setAttribute("src",t[r].url_thumb),a.setAttribute("alt",t[r].title),a.style.width=n[r].width+"px",a.style.height=n[r].height+"px",link=document.createElement("a"),link.setAttribute("href",t[r].url),link.setAttribute("class","image-reference"),div=document.createElement("div"),div.setAttribute("class","image-block"),div.setAttribute("title",t[r].title),div.setAttribute("data-toggle","tooltip"),div.style.width=n[r].width+"px",div.style.height=n[r].height+"px",div.style.top=n[r].top+"px",div.style.left=n[r].left+"px",link.appendChild(a),div.appendChild(link),i.appendChild(div)}baguetteBox.run("#gallery_container",{captions:function(t){return t.getElementsByTagName("img")[0].alt}})}
+function renderGallery(t,e){var i=document.getElementById("gallery_container");i.innerHTML="";var l=require("justified-layout")(t,{containerWidth:i.offsetWidth,targetRowHeight:.6*e,boxSpacing:5});i.style.height=l.containerHeight+"px";for(var n=l.boxes,r=0;r<n.length;r++){var a=document.createElement("img");a.setAttribute("src",t[r].url_thumb),a.setAttribute("alt",t[r].title),a.style.width=n[r].width+"px",a.style.height=n[r].height+"px",link=document.createElement("a"),link.setAttribute("href",t[r].url),link.setAttribute("class","image-reference"),div=document.createElement("div"),div.setAttribute("class","image-block"),div.setAttribute("title",t[r].title),div.setAttribute("data-toggle","tooltip"),div.style.width=n[r].width+"px",div.style.height=n[r].height+"px",div.style.top=n[r].top+"px",div.style.left=n[r].left+"px",link.appendChild(a),div.appendChild(link),i.appendChild(div)}}
diff --git a/nikola/data/themes/bootblog4-jinja/templates/base.tmpl b/nikola/data/themes/bootblog4-jinja/templates/base.tmpl
index 3ba30b4e2b..ce8d584587 100644
--- a/nikola/data/themes/bootblog4-jinja/templates/base.tmpl
+++ b/nikola/data/themes/bootblog4-jinja/templates/base.tmpl
@@ -90,14 +90,11 @@
     <!-- end fancy dates -->
     {% block extra_js %}{% endblock %}
     <script>
-    baguetteBox.run('a.reference:not(.islink)', {
+    baguetteBox.run('div#content', {
+        ignoreClass: 'islink',
         captions: function(element) {
             return element.getElementsByTagName('img')[0].alt;
     }});
-    baguetteBox.run('img:not(.islink)', {
-        captions: function(element) {
-            return element.alt;
-    }});
     </script>
 {{ body_end }}
 {{ template_hooks['body_end']() }}
diff --git a/nikola/data/themes/bootblog4/templates/base.tmpl b/nikola/data/themes/bootblog4/templates/base.tmpl
index f11df17bcf..9e17880663 100644
--- a/nikola/data/themes/bootblog4/templates/base.tmpl
+++ b/nikola/data/themes/bootblog4/templates/base.tmpl
@@ -90,14 +90,11 @@ ${base.late_load_js()}
     <!-- end fancy dates -->
     <%block name="extra_js"></%block>
     <script>
-    baguetteBox.run('a.reference:not(.islink)', {
+    baguetteBox.run('div#content', {
+        ignoreClass: 'islink',
         captions: function(element) {
             return element.getElementsByTagName('img')[0].alt;
     }});
-    baguetteBox.run('img:not(.islink)', {
-        captions: function(element) {
-            return element.alt;
-    }});
     </script>
 ${body_end}
 ${template_hooks['body_end']()}