Merge pull request #616 from lokesh/release-2-10-0

v2.10.0

Author: lokesh

bower.json

@@ -7,11 +7,7 @@
   "description": "The original Lightbox script. Uses jQuery.",
   "main": [
     "./dist/js/lightbox.js",
-    "./dist/css/lightbox.css",
-    "./dist/images/close.png",
-    "./dist/images/loading.gif",
-    "./dist/images/next.png",
-    "./dist/images/prev.png"
+    "./dist/css/lightbox.css"
   ],
   "keywords": [
     "lightbox",
@@ -28,6 +24,6 @@
     "bower_components"
   ],
   "dependencies": {
-    "jquery": "~2"
+    "jquery": ">2"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightbox2",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "author": "Lokesh Dhakar <lokesh.dhakar@gmail.com>",
   "description": "The original Lightbox script. Uses jQuery.",
   "keywords": [

src/css/lightbox.css

@@ -1,11 +1,9 @@
-/* Preload images */
-body:after {
-  content: url(../images/close.png) url(../images/loading.gif) url(../images/prev.png) url(../images/next.png);
-  display: none;
-}
-
-body.lb-disable-scrolling {
+html.lb-disable-scrolling {
   overflow: hidden;
+  /* Position fixed required for iOS. Just putting overflow: hidden; on the body is not enough. */
+  position: fixed;
+  height: 100vh;
+  width: 100vw;
 }
 
 .lightboxOverlay {
@@ -146,11 +144,7 @@ body.lb-disable-scrolling {
   padding-top: 5px;
   *zoom: 1;
   width: 100%;
-  -moz-border-radius-bottomleft: 4px;
-  -webkit-border-bottom-left-radius: 4px;
   border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -webkit-border-bottom-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
 

src/js/lightbox.js

@@ -1,11 +1,11 @@
 /*!
- * Lightbox v2.9.0
+ * Lightbox v2.10.0
  * by Lokesh Dhakar
  *
  * More info:
  * http://lokeshdhakar.com/projects/lightbox2/
  *
- * Copyright 2007, 2015 Lokesh Dhakar
+ * Copyright 2007, 2018 Lokesh Dhakar
  * Released under the MIT license
  * https://github.com/lokesh/lightbox2/blob/master/LICENSE
  *
@@ -94,6 +94,10 @@
   // Build html for the lightbox and the overlay.
   // Attach event handlers to the new DOM elements. click click click
   Lightbox.prototype.build = function() {
+    if ($('#lightbox').length > 0) {
+        return;
+    }
+
     var self = this;
     $('<div id="lightboxOverlay" class="lightboxOverlay"></div><div id="lightbox" class="lightbox"><div class="lb-outerContainer"><div class="lb-container"><img class="lb-image" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" /><div class="lb-nav"><a class="lb-prev" href="" ></a><a class="lb-next" href="" ></a></div><div class="lb-loader"><a class="lb-cancel"></a></div></div></div><div class="lb-dataContainer"><div class="lb-data"><div class="lb-details"><span class="lb-caption"></span><span class="lb-number"></span></div><div class="lb-closeContainer"><a class="lb-close"></a></div></div></div></div>').appendTo($('body'));
 
@@ -208,6 +212,7 @@
 
     function addToAlbum($link) {
       self.album.push({
+        alt: $link.attr('data-alt'),
         link: $link.attr('href'),
         title: $link.attr('data-title') || $link.attr('title')
       });
@@ -251,7 +256,7 @@
 
     // Disable scrolling of the page while open
     if (this.options.disableScrolling) {
-      $('body').addClass('lb-disable-scrolling');
+      $('html').addClass('lb-disable-scrolling');
     }
 
     this.changeImage(imageNumber);
@@ -282,7 +287,10 @@
       var windowHeight;
       var windowWidth;
 
-      $image.attr('src', self.album[imageNumber].link);
+      $image.attr({
+        'alt': self.album[imageNumber].alt,
+        'src': self.album[imageNumber].link
+      });
 
       $preloader = $(preloader);
 
@@ -503,7 +511,7 @@
       visibility: 'visible'
     });
     if (this.options.disableScrolling) {
-      $('body').removeClass('lb-disable-scrolling');
+      $('html').removeClass('lb-disable-scrolling');
     }
   };