Fix #3141 — stop calling baguetteBox.run twice

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Sep 3, 2018 · 20a0acb · 20a0acb
1 parent 42a3245
commit 20a0acb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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']()}