Merge pull request #31 from victordieggo/dev

Bug fixes and improvements

Author: victordieggo

lightbox/lightbox.css

@@ -1,7 +1,7 @@
 /*
 =======================================================
 Lightbox.js
-Version: 0.0.5
+Version: 0.0.6
 Author: Victor Diego <victordieggo@gmail.com>
 License: MIT
 =======================================================
@@ -18,6 +18,10 @@ License: MIT
 -------------------------------------------------------
 */
 
+.remove-scroll {
+  overflow: hidden;
+}
+
 .lightbox-hide {
   top: -9999px;
   left: -9999px;
@@ -46,6 +50,7 @@ License: MIT
 }
 
 .lightbox-image {
+  max-height: 100vh;
   vertical-align: middle;
 }
 

lightbox/lightbox.js

@@ -1,16 +1,15 @@
 /* =====================================================================
  * Lightbox.js
- * Version: 0.0.5
+ * Version: 0.0.6
  * Author: Victor Diego <victordieggo@gmail.com>
  * License: MIT
  * ================================================================== */
-/*global document, setTimeout*/
 
 (function () {
 
     'use strict';
 
-    var animation, body, btnClose, btnNav, currentItem, container, content, wrapper, trigger;
+    var animation, body, btnClose, btnNav, currentItem, container, content, wrapper, trigger, currentTrigger;
 
     body = document.body;
 
@@ -23,6 +22,10 @@
         scaleOut: 'deleteBox .3s'
     };
 
+    function toggleScroll() {
+      body.classList.toggle('remove-scroll');
+    }
+
     function sortContent(content) {
         var image, video, href = content.getAttribute('href');
 
@@ -94,6 +97,7 @@
         container = content.cloneNode(false);
         container.className = 'lightbox-container';
         container.style.animation = animation.fadeIn;
+        container.onclick = function() {};
         container.appendChild(wrapper);
 
         if (element.getAttribute('data-lightbox') === 'gallery') {
@@ -111,7 +115,7 @@
         }
 
         body.appendChild(container);
-        body.style.overflow = 'hidden';
+        toggleScroll();
     }
 
     function galleryNavigation(position) {
@@ -140,23 +144,24 @@
         wrapper.style.animation = [animation.scaleOut, animation.fadeOut];
         setTimeout(function () {
             if (body.contains(container)) {
-                body.removeAttribute('style');
                 body.removeChild(container);
-                currentItem.focus();
+                currentTrigger.focus();
                 currentItem.classList.remove('current-lightbox-item');
+                toggleScroll();
             }
         }, 200);
     }
 
     Array.prototype.forEach.call(trigger, function (element) {
         element.addEventListener('click', function (event) {
             event.preventDefault();
-            buildLightbox(this);
+            buildLightbox(element);
+            currentTrigger = element;
         });
     });
 
-    Array.prototype.forEach.call(['click', 'keyup'], function (event) {
-        body.addEventListener(event, function (event) {
+    ['click', 'keyup'].forEach( function (eventType) {
+        body.addEventListener(eventType, function (event) {
             if (body.contains(container)) {
                 var target = event.target,
                     key = event.keyCode,