Skip to content
This repository has been archived by the owner on May 22, 2020. It is now read-only.

Added new configuration options that allow specifying which attribute… #276

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added new configuration options that allow specifying which attribute… #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 32 additions & 17 deletions dist/ekko-lightbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
* Lightbox for Bootstrap by @ashleydw
* https://github.com/ashleydw/lightbox
*
* License: https://github.com/ashleydw/lightbox/blob/master/LICENSE
*/
+function ($) {

/*!
* Lightbox for Bootstrap by @ashleydw
* https://github.com/ashleydw/lightbox
*
* License: https://github.com/ashleydw/lightbox/blob/master/LICENSE
*/
+function ($) {
'use strict';

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
Expand Down Expand Up @@ -34,6 +34,9 @@ var Lightbox = (function ($) {
fail: 'Failed to load image:',
type: 'Could not detect remote target type. Force the type using data-type'
},
dataSrc: 'data-remote',
titleSrc: 'data-title',
footerSrc: 'data-footer',
doc: document, // if in an iframe can specify top.document
onShow: function onShow() {},
onShown: function onShown() {},
Expand Down Expand Up @@ -261,6 +264,17 @@ var Lightbox = (function ($) {

return type;
}
}, {
key: '_getAttr',
value: function _getAttr(element, attr) {
if (typeof attr === 'function') {
return attr.call(element);
} else if (0 === attr.toString().indexOf("data-")) {
return $(element).data(attr.replace("data-", ""));
} else {
return $(element).attr(attr);
}
}
}, {
key: '_isImage',
value: function _isImage(string) {
Expand Down Expand Up @@ -296,8 +310,9 @@ var Lightbox = (function ($) {
var $toUse = this._containerToUse();
this._updateTitleAndFooter();

var currentRemote = this._$element.attr('data-remote') || this._$element.attr('href');
var currentType = this._detectRemoteType(currentRemote, this._$element.attr('data-type') || false);
var currentRemote = this._getAttr(this._$element, this._config.dataSrc) || this._getAttr(this._$element, 'href');

var currentType = this._detectRemoteType(currentRemote, this._getAttr(this._$element, 'data-type') || false);

if (['image', 'youtube', 'vimeo', 'instagram', 'video', 'url'].indexOf(currentType) < 0) return this._error(this._config.strings.type);

Expand Down Expand Up @@ -388,8 +403,8 @@ var Lightbox = (function ($) {
}, {
key: '_updateTitleAndFooter',
value: function _updateTitleAndFooter() {
var title = this._$element.data('title') || "";
var caption = this._$element.data('footer') || "";
var title = this._getAttr(this._$element, this._config.titleSrc) || "";
var caption = this._getAttr(this._$element, this._config.footerSrc) || "";

this._titleIsShown = false;
if (title || this._config.alwaysShowClose) {
Expand Down Expand Up @@ -519,8 +534,8 @@ var Lightbox = (function ($) {
var next = $(this._$galleryItems.get(startIndex), false);
if (typeof next == 'undefined') return;

var src = next.attr('data-remote') || next.attr('href');
if (next.attr('data-type') === 'image' || this._isImage(src)) this._preloadImage(src, false);
var src = this._getAttr(next, this._config.dataSrc) || this._getAttr(next, 'href');
if (this._getAttr(next, 'data-type') === 'image' || this._isImage(src)) this._preloadImage(src, false);

if (numberOfTimes > 0) return this._preloadImageByIndex(startIndex + 1, numberOfTimes - 1);
}
Expand Down Expand Up @@ -663,6 +678,6 @@ var Lightbox = (function ($) {

return Lightbox;
})(jQuery);
//# sourceMappingURL=ekko-lightbox.js.map

}(jQuery);
//# sourceMappingURL=ekko-lightbox.js.map
}(jQuery);
2 changes: 1 addition & 1 deletion dist/ekko-lightbox.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ekko-lightbox.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ekko-lightbox.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 20 additions & 6 deletions ekko-lightbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ const Lightbox = (($) => {
fail: 'Failed to load image:',
type: 'Could not detect remote target type. Force the type using data-type',
},
dataSrc: 'data-remote',
titleSrc: 'data-title',
footerSrc: 'data-footer',
doc: document, // if in an iframe can specify top.document
onShow() {},
onShown() {},
Expand Down Expand Up @@ -268,6 +271,16 @@ const Lightbox = (($) => {
return type;
}

_getAttr(element,attr){
if(typeof attr === 'function') {
return attr.call(element);
} else if(0 === attr.toString().indexOf("data-")) {
return $(element).data(attr.replace("data-", ""));
} else {
return $(element).attr(attr);
}
}

_isImage(string) {
return string && string.match(/(^data:image\/.*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg)((\?|#).*)?$)/i)
}
Expand Down Expand Up @@ -299,8 +312,9 @@ const Lightbox = (($) => {
let $toUse = this._containerToUse()
this._updateTitleAndFooter()

let currentRemote = this._$element.attr('data-remote') || this._$element.attr('href')
let currentType = this._detectRemoteType(currentRemote, this._$element.attr('data-type') || false)
let currentRemote = this._getAttr(this._$element,this._config.dataSrc) || this._getAttr(this._$element,'href')

let currentType = this._detectRemoteType(currentRemote, this._getAttr(this._$element,'data-type') || false)

if(['image', 'youtube', 'vimeo', 'instagram', 'video', 'url'].indexOf(currentType) < 0)
return this._error(this._config.strings.type)
Expand Down Expand Up @@ -386,8 +400,8 @@ const Lightbox = (($) => {
}

_updateTitleAndFooter() {
let title = this._$element.data('title') || ""
let caption = this._$element.data('footer') || ""
let title = this._getAttr(this._$element,this._config.titleSrc) || ""
let caption = this._getAttr(this._$element,this._config.footerSrc) || ""

this._titleIsShown = false
if (title || this._config.alwaysShowClose) {
Expand Down Expand Up @@ -520,8 +534,8 @@ const Lightbox = (($) => {
if(typeof next == 'undefined')
return

let src = next.attr('data-remote') || next.attr('href')
if (next.attr('data-type') === 'image' || this._isImage(src))
let src = this._getAttr(next,this._config.dataSrc) || this._getAttr(next,'href')
if (this._getAttr(next,'data-type') === 'image' || this._isImage(src))
this._preloadImage(src, false)

if(numberOfTimes > 0)
Expand Down