Bump lightbox to 2.11.4

readme.md

@@ -22,6 +22,7 @@
 4. Copy settings-sample.php to settings.php and populate
 5. Go to #admin and create a new project, feed & maps
 6. Add a GPX file named <project_codename>.gpx to /geo/
+7. Run composer install
 ## To Do List
 * ECMA import/export
 * Add mail frequency slider

script/lightbox.js

@@ -1,5 +1,5 @@
 /*!
- * Lightbox v2.11.3
+ * Lightbox v2.11.4
  * by Lokesh Dhakar
  *
  * More info:
@@ -46,8 +46,6 @@
     fadeDuration: 600,
     fitImagesInViewport: true,
     imageFadeDuration: 600,
-    // maxWidth: 800,
-    // maxHeight: 600,
     positionFromTop: 50,
     resizeDuration: 700,
     showImageNumberLabel: true,
@@ -62,10 +60,8 @@
     to prevent xss and other injection attacks.
      */
     sanitizeTitle: false
-    //ADDED-START
 	, hasVideo: true
 	, onMediaChange: (oMedia) => {}
-    //ADDED-END
   };
 
   Lightbox.prototype.option = function(options) {
@@ -147,7 +143,6 @@
 		</div>\
 	').appendTo($('body'));
 
-
     // Cache jQuery objects
     this.$lightbox       = $('#lightbox');
     this.$overlay        = $('#lightboxOverlay');
@@ -156,7 +151,6 @@
     this.$image          = this.$lightbox.find('.lb-image');
     this.$nav            = this.$lightbox.find('.lb-nav');
 	
-    //ADDED-START
 	if(self.options.hasVideo) {
 		this.$video = $('<video class="lb-video" controls autoplay></video>');
 		this.$image.after(this.$video);
@@ -167,7 +161,6 @@
 			left: parseInt(this.$video.css('border-left-width'), 10)
 		};
 	}
-    //ADDED-END
 
     // Store css values for future lookup
     this.containerPadding = {
@@ -185,10 +178,7 @@
     };
 
     // Attach event handlers to the newly minted DOM elements
-    //ADDED-START
-    //this.$overlay.hide().on('click', function() {
 	this.$overlay.hide().add(this.$lightbox.find('.lb-dataContainer')).on('click', function() {
-    //ADDED-END
 	  self.end();
       return false;
     });
@@ -250,9 +240,13 @@
     });
 
 
-    this.$lightbox.find('.lb-loader, .lb-close').on('click', function() {
+    this.$lightbox.find('.lb-loader, .lb-close').on('click keyup', function(e) {
+      // If mouse click OR 'enter' or 'space' keypress, close LB
+      if (
+        e.type === 'click' || (e.type === 'keyup' && (e.which === 13 || e.which === 32))) {
         self.end();
         return false;
+      }
     });
   };
 
@@ -265,7 +259,6 @@
 
     this.sizeOverlay();
 
-    //ADDED-START
 	//Manage Zoom Event
     this.$nav.mousewheel((e) => {
     	var asImg = self.album[this.currentImageIndex];
@@ -324,11 +317,25 @@
 		self.$image.css('--translate-x', fTransX + 'px');
 		self.$image.css('--translate-y', fTransY + 'px');
 	}
-    //ADDED-END
 
     this.album = [];
     var imageNumber = 0;
 
+    function addToAlbum($link) {
+      self.album.push({
+        alt: $link.attr('data-alt'),
+        link: $link.attr('href'),
+        title: $link.attr('data-title') || $link.attr('title')
+		, orientation: $link.attr('data-orientation')
+		, type: $link.attr('data-type')
+		, id: $link.attr('data-id')
+		, $Media: $link.attr('data-type')=='video'?self.$video:self.$image
+		, width: $link.find('img').attr('width')
+		, height: $link.find('img').attr('height')
+		, set: $link.attr('data-lightbox') || $link.attr('rel')
+      });
+    }
+
     // Support both data-lightbox attribute and rel attribute implementations
     var dataLightboxValue = $link.attr('data-lightbox');
     var $links;
@@ -336,7 +343,7 @@
     if (dataLightboxValue) {
       $links = $($link.prop('tagName') + '[data-lightbox="' + dataLightboxValue + '"]');
       for (var i = 0; i < $links.length; i = ++i) {
-        this.addToAlbum($($links[i]));
+        addToAlbum($($links[i]));
         if ($links[i] === $link[0]) {
           imageNumber = i;
         }
@@ -344,12 +351,12 @@
     } else {
       if ($link.attr('rel') === 'lightbox') {
         // If image is not part of a set
-        this.addToAlbum($link);
+        addToAlbum($link);
       } else {
         // If image is part of a set
         $links = $($link.prop('tagName') + '[rel="' + $link.attr('rel') + '"]');
         for (var j = 0; j < $links.length; j = ++j) {
-          this.addToAlbum($($links[j]));
+          addToAlbum($($links[j]));
           if ($links[j] === $link[0]) {
             imageNumber = j;
           }
@@ -358,14 +365,7 @@
     }
 
     // Position Lightbox
-    //ADDED-START
+    this.$lightbox.fadeIn(this.options.fadeDuration);
-    //var top  = $window.scrollTop() + this.options.positionFromTop;
-    //var left = $window.scrollLeft();
-    this.$lightbox/*.css({
-      top: top + 'px',
-      left: left + 'px'
-    })*/.fadeIn(this.options.fadeDuration);
-    //ADDED-END
 
     // Disable scrolling of the page while open
     if (this.options.disableScrolling) {
@@ -375,24 +375,6 @@
     this.changeImage(imageNumber);
   };
   
-  Lightbox.prototype.addToAlbum = function($link) {
-	this.album.push({
-	  alt: $link.attr('data-alt'),
-	  link: $link.attr('href'),
-	  title: $link.attr('data-title') || $link.attr('title')
-	  //ADDED-START
-	  , orientation: $link.attr('data-orientation')
-	  , type: $link.attr('data-type')
-	  , id: $link.attr('data-id')
-	  , $Media: $link.attr('data-type')=='video'?this.$video:this.$image
-	  , width: $link.find('img').attr('width')
-	  , height: $link.find('img').attr('height')
-	  , set: $link.attr('data-lightbox') || $link.attr('rel')
-	  //ADDED-END
-	});
-  }
-
-  //ADDED-START
   Lightbox.prototype.getMaxSizes = function(iMediaWidth, iMediaHeight, sMediaType) {
 	var iWindowWidth = $(window).width();
 	var iWindowHeight = $(window).height();
@@ -536,12 +518,9 @@
 
     this.currentImageIndex = imageNumber;
   };
-  //ADDED-END
 
   // Stretch overlay to fit the viewport
   Lightbox.prototype.sizeOverlay = function(e) {
-    //var self = this;
-
     /*
     We use a setTimeout 0 to pause JS execution and let the rendering catch-up.
     Why do this? If the `disableScrolling` option is set to true, a class is added to the body
@@ -549,15 +528,6 @@
     hidden before we measure the document width, as the presence of the scrollbar will affect the
     number.
     */
-    //ADDED-START
-	/*
-    setTimeout(function() {
-      self.$overlay
-        .width($(document).width())
-        .height($(document).height());
-
-    }, 0);
-	*/
 	if(e) {
 		if(typeof oResizeTimer != 'undefined') clearTimeout(oResizeTimer);
 		oResizeTimer = setTimeout(
@@ -574,7 +544,6 @@
 			200
 		);
 	}
-    //ADDED-END
   };
 
   // Animate the size of the lightbox to fit the image we are showing
@@ -597,19 +566,13 @@
     //ADDED-END
 
     function postResize() {
-      //ADDED-START
-      //self.$lightbox.find('.lb-dataContainer').width(newWidth);
       if(self.$lightbox.hasClass('vertical')) self.$lightbox.find('.lb-dataContainer').width(newWidth);
       else self.$lightbox.find('.lb-dataContainer').height(newHeight);
-      //ADDED-END
       self.$lightbox.find('.lb-prevLink').height(newHeight);
       self.$lightbox.find('.lb-nextLink').height(newHeight);
 
       // Set focus on one of the two root nodes so keyboard events are captured.
-      //ADDED-START
-      //self.$overlay.focus();
       self.$overlay.trigger('focus');
-      //ADDED-END
 
       self.showImage();
     }
@@ -630,11 +593,8 @@
   Lightbox.prototype.showImage = function() {
     this.$lightbox.find('.lb-loader').stop(true).hide();
 
-    //ADDED-START
-    //this.$lightbox.find('.lb-image').fadeIn(this.options.imageFadeDuration);
     if(this.options.hasVideo && this.album[this.currentImageIndex].type == 'video') this.$lightbox.find('.lb-video').fadeIn(this.options.imageFadeDuration);
     else this.$lightbox.find('.lb-image').fadeIn(this.options.imageFadeDuration);
-    //ADDED-END
 
     this.updateNav();
     this.updateDetails();
@@ -692,28 +652,9 @@
       } else {
         $caption.html(this.album[this.currentImageIndex].title);
 	  }
-      //ADDED-START
-      //$caption.fadeIn('fast');
       $caption.add(this.$lightbox.find('.lb-close')).fadeIn('fast');
-      //ADDED-END
     }
 
-	//ADDED-START
-	/*
-	//ADDED-END
-	if (this.album.length > 1 && this.options.showImageNumberLabel) {
-      var labelText = this.imageCountLabel(this.currentImageIndex + 1, this.album.length);
-      //ADDED-START
-      //this.$lightbox.find('.lb-number').text(labelText).fadeIn('fast');
-      this.$lightbox.find('.lb-number').empty().append(labelText).fadeIn('fast');
-      //ADDED-END
-    } else {
-      this.$lightbox.find('.lb-number').hide();
-    }
-	//ADDED-START
-	*/
-	//ADDED-END
-
     this.$outerContainer.removeClass('animating');
 
     this.$lightbox.find('.lb-dataContainer').fadeIn(this.options.resizeDuration, function() {
@@ -734,9 +675,7 @@
   };
 
   Lightbox.prototype.enableKeyboardNav = function() {
-    //ADDED-START
 	this.disableKeyboardNav();
-    //ADDED-END
     this.$lightbox.on('keyup.keyboard', $.proxy(this.keyboardAction, this));
     this.$overlay.on('keyup.keyboard', $.proxy(this.keyboardAction, this));
   };
@@ -775,7 +714,6 @@
   Lightbox.prototype.end = function() {
     this.disableKeyboardNav();
 
-    //ADDED-START
 	if(this.options.hasVideo) {
 		var $lbContainer = this.$lightbox.find('.lb-container');
 		var $hasVideoNav = $lbContainer.hasClass('lb-video-nav');
@@ -784,7 +722,6 @@
 		if($hasVideoNav) $lbContainer.removeClass('lb-video-nav');
 	}
 	oSpot.flushHash();
-    //ADDED-END
 
     $(window).off('resize', this.sizeOverlay);
 	this.$nav.off('mousewheel');