[serendipity_event_lightbox] Update bundled lightbox scripts

- Update colorbox to 1.6.4 - Update lightbox2 to 2.9.0 - Update prettyPhoto to 3.1.6 (the uncompressed version was still at v3.1.4)
2017-04-27 16:56:01 +02:00 · 2017-04-27 16:56:01 +02:00 · 2c288d2292
parent 9eafd45f98
commit 2c288d2292
22 changed files with 1238 additions and 1073 deletions
--- a/serendipity_event_lightbox/ChangeLog
+++ b/serendipity_event_lightbox/ChangeLog
@ -1,3 +1,10 @@
+2.5.1:
+    * colorbox update v.1.6.4
+    * lightbox2-jquery update v.2.9.0
+    * prettyPhoto update v.3.1.6 (the uncompressed version was still at
+      v.3.1.4)
+
+------------------------------------------------------------------------
 2.5.0:
    * Magnific Popup update v.1.1.0 - 2016-02-20

@ -117,4 +124,4 @@ Version 1.3 (brockhaus):
      blogpage, if needed.

 ------------------------------------------------------------------------
-Version 1.2: earlier versions..
+Version 1.2: earlier versions..
--- a/serendipity_event_lightbox/colorbox/README.md
+++ b/serendipity_event_lightbox/colorbox/README.md
@ -3,6 +3,10 @@ A customizable lightbox plugin for jQuery.  See the [project page](http://jacklm

 ## Changelog:

+##### Version 1.6.4 - 2016/05/10
+
+* Fixed bug where using the inline property would duplicate target elements, if the selector matched multiple elements.
+
 ##### Version 1.6.3 - 2015/07/27

 * Fixed regression that caused error in IE8 when the calculated initial size was negative. Fixes #741
--- a/serendipity_event_lightbox/colorbox/colorbox.css
+++ b/serendipity_event_lightbox/colorbox/colorbox.css
@ -2,7 +2,7 @@
    Colorbox Core Style:
    The following CSS is consistent between example themes and should not be altered.
 */
-#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden; -webkit-transform: translate3d(0,0,0);}
 #cboxWrapper {max-width:none;}
 #cboxOverlay{position:fixed; width:100%; height:100%;}
 #cboxMiddleLeft, #cboxBottomLeft{clear:left;}
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-fa.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-fa.js
@ -1,18 +1,18 @@
-/*
-	jQuery Colorbox language configuration
-	language: Persian (Farsi)
-	translated by: Mahdi Jaberzadeh Ansari (MJZSoft)
-	site: www.mjzsoft.ir
-	email: mahdijaberzadehansari (at) yahoo.co.uk
-	Please note : Persian language is right to left like arabic.
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "تصویر {current} از {total}",
-	previous: "قبلی",
-	next: "بعدی",
-	close: "بستن",
-	xhrError: "متاسفانه محتویات مورد نظر قابل نمایش نیست.",
-	imgError: "متاسفانه بارگذاری این عکس با مشکل مواجه شده است.",
-	slideshowStart: "آغاز نمایش خودکار",
-	slideshowStop: "توقف نمایش خودکار"
-});
+/*
+	jQuery Colorbox language configuration
+	language: Persian (Farsi)
+	translated by: Mahdi Jaberzadeh Ansari (MJZSoft)
+	site: www.mjzsoft.ir
+	email: mahdijaberzadehansari (at) yahoo.co.uk
+	Please note : Persian language is right to left like arabic.
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "تصویر {current} از {total}",
+	previous: "قبلی",
+	next: "بعدی",
+	close: "بستن",
+	xhrError: "متاسفانه محتویات مورد نظر قابل نمایش نیست.",
+	imgError: "متاسفانه بارگذاری این عکس با مشکل مواجه شده است.",
+	slideshowStart: "آغاز نمایش خودکار",
+	slideshowStop: "توقف نمایش خودکار"
+});
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-hr.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-hr.js
@ -1,15 +1,15 @@
-/*
-	jQuery Colorbox language configuration
-	language: Croatian (hr)
-	translated by: Mladen Bicanic (base.hr)
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "Slika {current} od {total}",
-	previous: "Prethodna",
-	next: "Sljedeća",
-	close: "Zatvori",
-	xhrError: "Neuspješno učitavanje sadržaja.",
-	imgError: "Neuspješno učitavanje slike.",
-	slideshowStart: "Pokreni slideshow",
-	slideshowStop: "Zaustavi slideshow"
+/*
+	jQuery Colorbox language configuration
+	language: Croatian (hr)
+	translated by: Mladen Bicanic (base.hr)
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Slika {current} od {total}",
+	previous: "Prethodna",
+	next: "Sljedeća",
+	close: "Zatvori",
+	xhrError: "Neuspješno učitavanje sadržaja.",
+	imgError: "Neuspješno učitavanje slike.",
+	slideshowStart: "Pokreni slideshow",
+	slideshowStop: "Zaustavi slideshow"
 });
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-ja.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-ja.js
@ -1,15 +1,15 @@
-/*
-  jQuery Colorbox language configuration
-  language: Japanaese (ja)
-  translated by: Hajime Fujimoto
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "{total}枚中{current}枚目",
-	previous: "前",
-	next: "次",
-	close: "閉じる",
-	xhrError: "コンテンツの読み込みに失敗しました",
-	imgError: "画像の読み込みに失敗しました",
-	slideshowStart: "スライドショー開始",
-	slideshowStop: "スライドショー終了"
-});
+/*
+  jQuery Colorbox language configuration
+  language: Japanaese (ja)
+  translated by: Hajime Fujimoto
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{total}枚中{current}枚目",
+	previous: "前",
+	next: "次",
+	close: "閉じる",
+	xhrError: "コンテンツの読み込みに失敗しました",
+	imgError: "画像の読み込みに失敗しました",
+	slideshowStart: "スライドショー開始",
+	slideshowStop: "スライドショー終了"
+});
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-pl.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-pl.js
@ -1,16 +1,16 @@
-/*
-	jQuery Colorbox language configuration
-	language: Polski (pl)
-	translated by: Tomasz Wasiński
-	site: 2bevisible.pl
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "{current}. obrazek z {total}",
-	previous: "Poprzedni",
-	next: "Następny",
-	close: "Zamknij",
-	xhrError: "Nie udało się załadować treści.",
-	imgError: "Nie udało się załadować obrazka.",
-	slideshowStart: "rozpocznij pokaz slajdów",
-	slideshowStop: "zatrzymaj pokaz slajdów"
+/*
+	jQuery Colorbox language configuration
+	language: Polski (pl)
+	translated by: Tomasz Wasiński
+	site: 2bevisible.pl
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "{current}. obrazek z {total}",
+	previous: "Poprzedni",
+	next: "Następny",
+	close: "Zamknij",
+	xhrError: "Nie udało się załadować treści.",
+	imgError: "Nie udało się załadować obrazka.",
+	slideshowStart: "rozpocznij pokaz slajdów",
+	slideshowStop: "zatrzymaj pokaz slajdów"
 });
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-ru.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-ru.js
@ -1,16 +1,16 @@
-/*
-	jQuery Colorbox language configuration
-	language: Russian (ru)
-	translated by: Marfa
-	site: themarfa.name
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "изображение {current} из {total}",
-	previous: "назад",
-	next: "вперёд",
-	close: "закрыть",
-	xhrError: "Не удалось загрузить содержимое.",
-	imgError: "Не удалось загрузить изображение.",
-	slideshowStart: "начать слайд-шоу",
-	slideshowStop: "остановить слайд-шоу"
+/*
+	jQuery Colorbox language configuration
+	language: Russian (ru)
+	translated by: Marfa
+	site: themarfa.name
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "изображение {current} из {total}",
+	previous: "назад",
+	next: "вперёд",
+	close: "закрыть",
+	xhrError: "Не удалось загрузить содержимое.",
+	imgError: "Не удалось загрузить изображение.",
+	slideshowStart: "начать слайд-шоу",
+	slideshowStop: "остановить слайд-шоу"
 });
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-si.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-si.js
@ -1,15 +1,15 @@
-/*
-	jQuery Colorbox language configuration
-	language: Slovenian (si)
-	translated by: Boštjan Pišler (pisler.si)
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "Slika {current} od {total}",
-	previous: "Prejšnja",
-	next: "Naslednja",
-	close: "Zapri",
-	xhrError: "Vsebine ni bilo mogoče naložiti.",
-	imgError: "Slike ni bilo mogoče naložiti.",
-	slideshowStart: "Zaženi prezentacijo",
-	slideshowStop: "Zaustavi prezentacijo"
+/*
+	jQuery Colorbox language configuration
+	language: Slovenian (si)
+	translated by: Boštjan Pišler (pisler.si)
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "Slika {current} od {total}",
+	previous: "Prejšnja",
+	next: "Naslednja",
+	close: "Zapri",
+	xhrError: "Vsebine ni bilo mogoče naložiti.",
+	imgError: "Slike ni bilo mogoče naložiti.",
+	slideshowStart: "Zaženi prezentacijo",
+	slideshowStop: "Zaustavi prezentacijo"
 });
--- a/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-zh-CN.js
+++ b/serendipity_event_lightbox/colorbox/i18n/jquery.colorbox-zh-CN.js
@ -1,15 +1,15 @@
-/*
-	jQuery Colorbox language configuration
-	language: Chinese Simplified (zh-CN)
-	translated by: zhao weiming
-*/
-jQuery.extend(jQuery.colorbox.settings, {
-	current: "当前图像 {current} 总共 {total}",
-	previous: "前一页",
-	next: "后一页",
-	close: "关闭",
-	xhrError: "此内容无法加载",
-	imgError: "此图片无法加载",
-	slideshowStart: "开始播放幻灯片",
-	slideshowStop: "停止播放幻灯片"
+/*
+	jQuery Colorbox language configuration
+	language: Chinese Simplified (zh-CN)
+	translated by: zhao weiming
+*/
+jQuery.extend(jQuery.colorbox.settings, {
+	current: "当前图像 {current} 总共 {total}",
+	previous: "前一页",
+	next: "后一页",
+	close: "关闭",
+	xhrError: "此内容无法加载",
+	imgError: "此图片无法加载",
+	slideshowStart: "开始播放幻灯片",
+	slideshowStop: "停止播放幻灯片"
 });
--- a/serendipity_event_lightbox/colorbox/jquery.colorbox-min.js
+++ b/serendipity_event_lightbox/colorbox/jquery.colorbox-min.js
--- a/serendipity_event_lightbox/colorbox/jquery.colorbox.js
+++ b/serendipity_event_lightbox/colorbox/jquery.colorbox.js
@ -1,5 +1,5 @@
 /*!
-	Colorbox 1.6.3
+	Colorbox 1.6.4
 	license: MIT
 	http://www.jacklmoore.com/colorbox
 */
@ -484,7 +484,7 @@
 				$current = $tag(div, "Current"),
 				$prev = $('<button type="button"/>').attr({id:prefix+'Previous'}),
 				$next = $('<button type="button"/>').attr({id:prefix+'Next'}),
-				$slideshow = $tag('button', "Slideshow"),
+				$slideshow = $('<button type="button"/>').attr({id:prefix+'Slideshow'}),
 				$loadingOverlay
 			);

@ -950,7 +950,7 @@
 		}, 100);

 		if (settings.get('inline')) {
-			var $target = $(href);
+			var $target = $(href).eq(0);
 			// Inserts an empty placeholder where inline content is being pulled from.
 			// An event is bound to put inline content back when Colorbox closes or loads new content.
 			$inline = $('<div>').hide().insertBefore($target);
--- a/serendipity_event_lightbox/lightbox2-jquery/README.md
+++ b/serendipity_event_lightbox/lightbox2-jquery/README.md
@ -13,32 +13,69 @@ by [Lokesh Dhakar](http://www.lokeshdhakar.com)

 ### Actively being worked on

- **Maintenance.** Get open Issues and PRs number down.
+- **Maintenance.** Geting open Issues and PRs number down. Not working on new features for v2.x.

-### Not on the roadmap
+### Features *NOT* on the roadmap

- **HTML or video content.** The goal of the script from the start has been to provide a better image viewing experience and I am planning on staying focused on that vision. Don't worry though there are plenty of alternative scripts a google away for those who need HTML or video content support.
+The goal of this script from it's beginnings till today is to to provide a better *image viewing experience*.
+
+- **HTML or video content.**  If you need to show html or video content, I recommend googling for an alternative script as there are many options.
+- **Social sharing buttons.** 

 ### v3.0 - In Brainstorming Phase

+**Interactions**
 - Add touch gesture support.
- Rewrite animations for performance and flexibility.
+- Exploring using tilt gesture on mobile devices with extra-wide images.
+- If user attempts to go forward when at end of image set, animation (shake?) indicating the end or option to close Lightbox.
+- Make sure right-click/long pressing works to access the image's context menu.
+
+**Layout**
+- Allow vertical centering.
+- Update sizing on window resize.
+- Should the dev be able to choose the position of the caption, close button, and nav controls?
 - Optimize layout for mobile.
 - Optimize layout for screens of varying densities.
+- Should the close button still live in the bottom right corner?
+
+**Animations**
+- Evaluate start, end, and transition animations.
+- Rewrite animations for performance and flexibility.
+
+**Assets**
 - Use inline SVG for UI elements.
+
+**Caching**
+- Review if and how images should be preloaded
+
+**Accessibility**
+- Should opening lightbox update the url? and should this url be parsed on page load to show Lightbox automatically?
+- Review alt attributes.
+- Review ARIA roles.
+- Review constrast ratios.
+- Review keyboard input and tabbing.
+- Review click/touch target size.
+- Test with screen reader.
+
+**API**
 - Do not initialize automatically and allow multiple instances.
 - Add event handlers.
- Allow the setting of options from HTML.
+- Allow setting options on the fly.
+- Allow the setting of options from HTML?
 - Allow instantiation with jQuery plugin syntax.
- If one of the two options, maxWidth or maxHeight, is set, maintain aspect ratio.
- Evaluate start, end, and transition animations.
 - Evaluate preloading and caching.
 - Evaluate droppping jQuery requirement.
- If user attempts to go forward when at end of image set, animation (shake?) indicating the end or option to close Lightbox.
-
+- Allow placement inside of a specified element? Orig feature requester was dealing with iframe.

 ## Changelog

+### v2.9.0 - 2016-10-30
+
+- [Fix] Allow loading of lightbox.js anywhere on page. Prev requirement was at the end of the body tag. [Commit](https://github.com/lokesh/lightbox2/commit/7047214f77cfc8f892e8513426b57d45bf29e9cd)
+- [Add] Add imageFadeDuration option. [Commit](https://github.com/lokesh/lightbox2/commit/6d5f99a65f189a5d2bd7bbfac4682fe36e62871e)
+- [Change] Right-clicking image now shows context menu for image. [Commit](https://github.com/lokesh/lightbox2/commit/363c3cb8af8fae1b6f95d6679df976022290f878)
+- [Change] Allow controlling of image border with a simpler css border vs a parent container padding _hack_. [Commit](https://github.com/lokesh/lightbox2/commit/214361297f1dd5f0c19c1d80ff37c398cdda55cb)
+
 ### v2.8.2 - 2015-12-13

 - [Add] npm support. ```npm install --save lightbox2```
--- a/serendipity_event_lightbox/lightbox2-jquery/css/lightbox.css
+++ b/serendipity_event_lightbox/lightbox2-jquery/css/lightbox.css
@ -33,7 +33,11 @@ body.lb-disable-scrolling {
  display: block;
  height: auto;
  max-width: inherit;
+  max-height: none;
  border-radius: 3px;
+
+  /* Image border */
+  border: 4px solid white;
 }

 .lightbox a img {
@ -42,12 +46,15 @@ body.lb-disable-scrolling {

 .lb-outerContainer {
  position: relative;
-  background-color: white;
  *zoom: 1;
  width: 250px;
  height: 250px;
  margin: 0 auto;
  border-radius: 4px;
+
+  /* Background color behind image.
+     This is visible during transitions. */
+  background-color: white;
 }

 .lb-outerContainer:after {
@ -56,10 +63,6 @@ body.lb-disable-scrolling {
  clear: both;
 }

-.lb-container {
-  padding: 4px;
-}
-
 .lb-loader {
  position: absolute;
  top: 43%;
@ -175,6 +178,10 @@ body.lb-disable-scrolling {
  line-height: 1em;
 }

+.lb-data .lb-caption a {
+  color: #4ae;
+}
+
 .lb-data .lb-number {
  display: block;
  clear: left;
--- a/serendipity_event_lightbox/lightbox2-jquery/js/lightbox-plus-jquery.js
+++ b/serendipity_event_lightbox/lightbox2-jquery/js/lightbox-plus-jquery.js
@ -9210,7 +9210,7 @@ return jQuery;
 }));

 /*!
- * Lightbox v2.8.2
+ * Lightbox v2.9.0
 * by Lokesh Dhakar
 *
 * More info:
@ -9252,15 +9252,25 @@ return jQuery;
  Lightbox.defaults = {
    albumLabel: 'Image %1 of %2',
    alwaysShowNavOnTouchDevices: false,
-    fadeDuration: 500,
+    fadeDuration: 600,
    fitImagesInViewport: true,
+    imageFadeDuration: 600,
    // maxWidth: 800,
    // maxHeight: 600,
    positionFromTop: 50,
    resizeDuration: 700,
    showImageNumberLabel: true,
    wrapAround: false,
-    disableScrolling: false
+    disableScrolling: false,
+    /*
+    Sanitize Title
+    If the caption data is trusted, for example you are hardcoding it in, then leave this to false.
+    This will free you to add html tags, such as links, in the caption.
+
+    If the caption data is user submitted or from some other untrusted source, then set this to true
+    to prevent xss and other injection attacks.
+     */
+    sanitizeTitle: false
  };

  Lightbox.prototype.option = function(options) {
@ -9272,8 +9282,12 @@ return jQuery;
  };

  Lightbox.prototype.init = function() {
-    this.enable();
-    this.build();
+    var self = this;
+    // Both enable and build methods require the body tag to be in the DOM.
+    $(document).ready(function() {
+      self.enable();
+      self.build();
+    });
  };

  // Loop through anchors and areamaps looking for either data-lightbox attributes or rel attributes
@ -9297,12 +9311,23 @@ return jQuery;
    this.$overlay        = $('#lightboxOverlay');
    this.$outerContainer = this.$lightbox.find('.lb-outerContainer');
    this.$container      = this.$lightbox.find('.lb-container');
+    this.$image          = this.$lightbox.find('.lb-image');
+    this.$nav            = this.$lightbox.find('.lb-nav');

    // Store css values for future lookup
-    this.containerTopPadding = parseInt(this.$container.css('padding-top'), 10);
-    this.containerRightPadding = parseInt(this.$container.css('padding-right'), 10);
-    this.containerBottomPadding = parseInt(this.$container.css('padding-bottom'), 10);
-    this.containerLeftPadding = parseInt(this.$container.css('padding-left'), 10);
+    this.containerPadding = {
+      top: parseInt(this.$container.css('padding-top'), 10),
+      right: parseInt(this.$container.css('padding-right'), 10),
+      bottom: parseInt(this.$container.css('padding-bottom'), 10),
+      left: parseInt(this.$container.css('padding-left'), 10)
+    };
+
+    this.imageBorderWidth = {
+      top: parseInt(this.$image.css('border-top-width'), 10),
+      right: parseInt(this.$image.css('border-right-width'), 10),
+      bottom: parseInt(this.$image.css('border-bottom-width'), 10),
+      left: parseInt(this.$image.css('border-left-width'), 10)
+    };

    // Attach event handlers to the newly minted DOM elements
    this.$overlay.hide().on('click', function() {
@ -9342,6 +9367,32 @@ return jQuery;
      return false;
    });

+    /*
+      Show context menu for image on right-click
+
+      There is a div containing the navigation that spans the entire image and lives above of it. If
+      you right-click, you are right clicking this div and not the image. This prevents users from
+      saving the image or using other context menu actions with the image.
+
+      To fix this, when we detect the right mouse button is pressed down, but not yet clicked, we
+      set pointer-events to none on the nav div. This is so that the upcoming right-click event on
+      the next mouseup will bubble down to the image. Once the right-click/contextmenu event occurs
+      we set the pointer events back to auto for the nav div so it can capture hover and left-click
+      events as usual.
+     */
+    this.$nav.on('mousedown', function(event) {
+      if (event.which === 3) {
+        self.$nav.css('pointer-events', 'none');
+
+        self.$lightbox.one('contextmenu', function() {
+          setTimeout(function() {
+              this.$nav.css('pointer-events', 'auto');
+          }.bind(self), 0);
+        });
+      }
+    });
+
+
    this.$lightbox.find('.lb-loader, .lb-close').on('click', function() {
      self.end();
      return false;
@ -9453,8 +9504,8 @@ return jQuery;

        windowWidth    = $(window).width();
        windowHeight   = $(window).height();
-        maxImageWidth  = windowWidth - self.containerLeftPadding - self.containerRightPadding - 20;
-        maxImageHeight = windowHeight - self.containerTopPadding - self.containerBottomPadding - 120;
+        maxImageWidth  = windowWidth - self.containerPadding.left - self.containerPadding.right - self.imageBorderWidth.left - self.imageBorderWidth.right - 20;
+        maxImageHeight = windowHeight - self.containerPadding.top - self.containerPadding.bottom - self.imageBorderWidth.top - self.imageBorderWidth.bottom - 120;

        // Check if image size is larger then maxWidth|maxHeight in settings
        if (self.options.maxWidth && self.options.maxWidth < maxImageWidth) {
@ -9499,8 +9550,8 @@ return jQuery;

    var oldWidth  = this.$outerContainer.outerWidth();
    var oldHeight = this.$outerContainer.outerHeight();
-    var newWidth  = imageWidth + this.containerLeftPadding + this.containerRightPadding;
-    var newHeight = imageHeight + this.containerTopPadding + this.containerBottomPadding;
+    var newWidth  = imageWidth + this.containerPadding.left + this.containerPadding.right + this.imageBorderWidth.left + this.imageBorderWidth.right;
+    var newHeight = imageHeight + this.containerPadding.top + this.containerPadding.bottom + this.imageBorderWidth.top + this.imageBorderWidth.bottom;

    function postResize() {
      self.$lightbox.find('.lb-dataContainer').width(newWidth);
@ -9524,7 +9575,7 @@ return jQuery;
  // Display the image and its details and begin preload neighboring images.
  Lightbox.prototype.showImage = function() {
    this.$lightbox.find('.lb-loader').stop(true).hide();
-    this.$lightbox.find('.lb-image').fadeIn('slow');
+    this.$lightbox.find('.lb-image').fadeIn(this.options.imageFadeDuration);

    this.updateNav();
    this.updateDetails();
@ -9576,9 +9627,13 @@ return jQuery;
    // Thanks Nate Wright for the fix. @https://github.com/NateWr
    if (typeof this.album[this.currentImageIndex].title !== 'undefined' &&
      this.album[this.currentImageIndex].title !== '') {
-      this.$lightbox.find('.lb-caption')
-        .html(this.album[this.currentImageIndex].title)
-        .fadeIn('fast')
+      var $caption = this.$lightbox.find('.lb-caption');
+      if (this.options.sanitizeTitle) {
+        $caption.text(this.album[this.currentImageIndex].title);
+      } else {
+        $caption.html(this.album[this.currentImageIndex].title);
+      }
+      $caption.fadeIn('fast')
        .find('a').on('click', function(event) {
          if ($(this).attr('target') !== undefined) {
            window.open($(this).attr('href'), $(this).attr('target'));
--- a/serendipity_event_lightbox/lightbox2-jquery/js/lightbox-plus-jquery.min.js
+++ b/serendipity_event_lightbox/lightbox2-jquery/js/lightbox-plus-jquery.min.js
--- a/serendipity_event_lightbox/lightbox2-jquery/js/lightbox-plus-jquery.min.map
+++ b/serendipity_event_lightbox/lightbox2-jquery/js/lightbox-plus-jquery.min.map
--- a/serendipity_event_lightbox/lightbox2-jquery/js/lightbox.js
+++ b/serendipity_event_lightbox/lightbox2-jquery/js/lightbox.js
@ -1,5 +1,5 @@
 /*!
- * Lightbox v2.8.2
+ * Lightbox v2.9.0
 * by Lokesh Dhakar
 *
 * More info:
@ -41,15 +41,25 @@
  Lightbox.defaults = {
    albumLabel: 'Image %1 of %2',
    alwaysShowNavOnTouchDevices: false,
-    fadeDuration: 500,
+    fadeDuration: 600,
    fitImagesInViewport: true,
+    imageFadeDuration: 600,
    // maxWidth: 800,
    // maxHeight: 600,
    positionFromTop: 50,
    resizeDuration: 700,
    showImageNumberLabel: true,
    wrapAround: false,
-    disableScrolling: false
+    disableScrolling: false,
+    /*
+    Sanitize Title
+    If the caption data is trusted, for example you are hardcoding it in, then leave this to false.
+    This will free you to add html tags, such as links, in the caption.
+
+    If the caption data is user submitted or from some other untrusted source, then set this to true
+    to prevent xss and other injection attacks.
+     */
+    sanitizeTitle: false
  };

  Lightbox.prototype.option = function(options) {
@ -61,8 +71,12 @@
  };

  Lightbox.prototype.init = function() {
-    this.enable();
-    this.build();
+    var self = this;
+    // Both enable and build methods require the body tag to be in the DOM.
+    $(document).ready(function() {
+      self.enable();
+      self.build();
+    });
  };

  // Loop through anchors and areamaps looking for either data-lightbox attributes or rel attributes
@ -86,12 +100,23 @@
    this.$overlay        = $('#lightboxOverlay');
    this.$outerContainer = this.$lightbox.find('.lb-outerContainer');
    this.$container      = this.$lightbox.find('.lb-container');
+    this.$image          = this.$lightbox.find('.lb-image');
+    this.$nav            = this.$lightbox.find('.lb-nav');

    // Store css values for future lookup
-    this.containerTopPadding = parseInt(this.$container.css('padding-top'), 10);
-    this.containerRightPadding = parseInt(this.$container.css('padding-right'), 10);
-    this.containerBottomPadding = parseInt(this.$container.css('padding-bottom'), 10);
-    this.containerLeftPadding = parseInt(this.$container.css('padding-left'), 10);
+    this.containerPadding = {
+      top: parseInt(this.$container.css('padding-top'), 10),
+      right: parseInt(this.$container.css('padding-right'), 10),
+      bottom: parseInt(this.$container.css('padding-bottom'), 10),
+      left: parseInt(this.$container.css('padding-left'), 10)
+    };
+
+    this.imageBorderWidth = {
+      top: parseInt(this.$image.css('border-top-width'), 10),
+      right: parseInt(this.$image.css('border-right-width'), 10),
+      bottom: parseInt(this.$image.css('border-bottom-width'), 10),
+      left: parseInt(this.$image.css('border-left-width'), 10)
+    };

    // Attach event handlers to the newly minted DOM elements
    this.$overlay.hide().on('click', function() {
@ -131,6 +156,32 @@
      return false;
    });

+    /*
+      Show context menu for image on right-click
+
+      There is a div containing the navigation that spans the entire image and lives above of it. If
+      you right-click, you are right clicking this div and not the image. This prevents users from
+      saving the image or using other context menu actions with the image.
+
+      To fix this, when we detect the right mouse button is pressed down, but not yet clicked, we
+      set pointer-events to none on the nav div. This is so that the upcoming right-click event on
+      the next mouseup will bubble down to the image. Once the right-click/contextmenu event occurs
+      we set the pointer events back to auto for the nav div so it can capture hover and left-click
+      events as usual.
+     */
+    this.$nav.on('mousedown', function(event) {
+      if (event.which === 3) {
+        self.$nav.css('pointer-events', 'none');
+
+        self.$lightbox.one('contextmenu', function() {
+          setTimeout(function() {
+              this.$nav.css('pointer-events', 'auto');
+          }.bind(self), 0);
+        });
+      }
+    });
+
+
    this.$lightbox.find('.lb-loader, .lb-close').on('click', function() {
      self.end();
      return false;
@ -242,8 +293,8 @@

        windowWidth    = $(window).width();
        windowHeight   = $(window).height();
-        maxImageWidth  = windowWidth - self.containerLeftPadding - self.containerRightPadding - 20;
-        maxImageHeight = windowHeight - self.containerTopPadding - self.containerBottomPadding - 120;
+        maxImageWidth  = windowWidth - self.containerPadding.left - self.containerPadding.right - self.imageBorderWidth.left - self.imageBorderWidth.right - 20;
+        maxImageHeight = windowHeight - self.containerPadding.top - self.containerPadding.bottom - self.imageBorderWidth.top - self.imageBorderWidth.bottom - 120;

        // Check if image size is larger then maxWidth|maxHeight in settings
        if (self.options.maxWidth && self.options.maxWidth < maxImageWidth) {
@ -288,8 +339,8 @@

    var oldWidth  = this.$outerContainer.outerWidth();
    var oldHeight = this.$outerContainer.outerHeight();
-    var newWidth  = imageWidth + this.containerLeftPadding + this.containerRightPadding;
-    var newHeight = imageHeight + this.containerTopPadding + this.containerBottomPadding;
+    var newWidth  = imageWidth + this.containerPadding.left + this.containerPadding.right + this.imageBorderWidth.left + this.imageBorderWidth.right;
+    var newHeight = imageHeight + this.containerPadding.top + this.containerPadding.bottom + this.imageBorderWidth.top + this.imageBorderWidth.bottom;

    function postResize() {
      self.$lightbox.find('.lb-dataContainer').width(newWidth);
@ -313,7 +364,7 @@
  // Display the image and its details and begin preload neighboring images.
  Lightbox.prototype.showImage = function() {
    this.$lightbox.find('.lb-loader').stop(true).hide();
-    this.$lightbox.find('.lb-image').fadeIn('slow');
+    this.$lightbox.find('.lb-image').fadeIn(this.options.imageFadeDuration);

    this.updateNav();
    this.updateDetails();
@ -365,9 +416,13 @@
    // Thanks Nate Wright for the fix. @https://github.com/NateWr
    if (typeof this.album[this.currentImageIndex].title !== 'undefined' &&
      this.album[this.currentImageIndex].title !== '') {
-      this.$lightbox.find('.lb-caption')
-        .html(this.album[this.currentImageIndex].title)
-        .fadeIn('fast')
+      var $caption = this.$lightbox.find('.lb-caption');
+      if (this.options.sanitizeTitle) {
+        $caption.text(this.album[this.currentImageIndex].title);
+      } else {
+        $caption.html(this.album[this.currentImageIndex].title);
+      }
+      $caption.fadeIn('fast')
        .find('a').on('click', function(event) {
          if ($(this).attr('target') !== undefined) {
            window.open($(this).attr('href'), $(this).attr('target'));
--- a/serendipity_event_lightbox/lightbox2-jquery/js/lightbox.min.js
+++ b/serendipity_event_lightbox/lightbox2-jquery/js/lightbox.min.js
--- a/serendipity_event_lightbox/lightbox2-jquery/js/lightbox.min.map
+++ b/serendipity_event_lightbox/lightbox2-jquery/js/lightbox.min.map
--- a/serendipity_event_lightbox/prettyphoto/js/jquery.prettyPhoto.js
+++ b/serendipity_event_lightbox/prettyphoto/js/jquery.prettyPhoto.js
--- a/serendipity_event_lightbox/serendipity_event_lightbox.php
+++ b/serendipity_event_lightbox/serendipity_event_lightbox.php
@ -25,7 +25,7 @@ class serendipity_event_lightbox extends serendipity_event
        $propbag->add('name',           PLUGIN_EVENT_LIGHTBOX_NAME);
        $propbag->add('description',    PLUGIN_EVENT_LIGHTBOX_DESC);
        $propbag->add('author',         'Thomas Nesges, Andy Hopkins, Lokesh Dhakar, Cody Lindley, Stephan Manske, Grischa Brockhaus, Ian');
-        $propbag->add('version',        '2.5.0');
+        $propbag->add('version',        '2.5.1');
        $propbag->add('requirements',  array(
            'serendipity' => '1.6',
            'php'         => '5.3.0'
@ -393,4 +393,4 @@ class serendipity_event_lightbox extends serendipity_event

 }

-?>
+?>