Update Magnific Popup to v1.1.0
This commit is contained in:
Michael Rose
parent
7845654225
commit
1570e85fb1
2 changed files with 1764 additions and 1953 deletions
8
assets/js/main.min.js
vendored
8
assets/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,7 +1,18 @@
|
|||
/*! Magnific Popup - v0.9.9 - 2013-12-27
|
||||
/*! Magnific Popup - v1.1.0 - 2016-02-20
|
||||
* http://dimsemenov.com/plugins/magnific-popup/
|
||||
* Copyright (c) 2013 Dmitry Semenov; */
|
||||
;(function($) {
|
||||
* Copyright (c) 2016 Dmitry Semenov; */
|
||||
;(function (factory) {
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
// AMD. Register as an anonymous module.
|
||||
define(['jquery'], factory);
|
||||
} else if (typeof exports === 'object') {
|
||||
// Node/CommonJS
|
||||
factory(require('jquery'));
|
||||
} else {
|
||||
// Browser globals
|
||||
factory(window.jQuery || window.Zepto);
|
||||
}
|
||||
}(function($) {
|
||||
|
||||
/*>>core*/
|
||||
/**
|
||||
|
|
@ -31,12 +42,12 @@ var CLOSE_EVENT = 'Close',
|
|||
/**
|
||||
* Private vars
|
||||
*/
|
||||
/*jshint -W079 */
|
||||
var mfp, // As we have only one instance of MagnificPopup object, we define it locally to not to use 'this'
|
||||
MagnificPopup = function(){},
|
||||
_isJQ = !!(window.jQuery),
|
||||
_prevStatus,
|
||||
_window = $(window),
|
||||
_body,
|
||||
_document,
|
||||
_prevContentType,
|
||||
_wrapClasses,
|
||||
|
|
@ -86,6 +97,7 @@ var _mfpOn = function(name, f) {
|
|||
// Initialize Magnific Popup only when called at least once
|
||||
_checkInstance = function() {
|
||||
if(!$.magnificPopup.instance) {
|
||||
/*jshint -W020 */
|
||||
mfp = new MagnificPopup();
|
||||
mfp.init();
|
||||
$.magnificPopup.instance = mfp;
|
||||
|
|
@ -124,9 +136,7 @@ MagnificPopup.prototype = {
|
|||
*/
|
||||
init: function() {
|
||||
var appVersion = navigator.appVersion;
|
||||
mfp.isIE7 = appVersion.indexOf("MSIE 7.") !== -1;
|
||||
mfp.isIE8 = appVersion.indexOf("MSIE 8.") !== -1;
|
||||
mfp.isLowIE = mfp.isIE7 || mfp.isIE8;
|
||||
mfp.isLowIE = mfp.isIE8 = document.all && !document.addEventListener;
|
||||
mfp.isAndroid = (/android/gi).test(appVersion);
|
||||
mfp.isIOS = (/iphone|ipad|ipod/gi).test(appVersion);
|
||||
mfp.supportsTransition = supportsTransitions();
|
||||
|
|
@ -145,10 +155,6 @@ MagnificPopup.prototype = {
|
|||
*/
|
||||
open: function(data) {
|
||||
|
||||
if(!_body) {
|
||||
_body = $(document.body);
|
||||
}
|
||||
|
||||
var i;
|
||||
|
||||
if(data.isObj === false) {
|
||||
|
|
@ -347,7 +353,7 @@ MagnificPopup.prototype = {
|
|||
$('html').css(windowStyles);
|
||||
|
||||
// add everything to DOM
|
||||
mfp.bgOverlay.add(mfp.wrap).prependTo( mfp.st.prependTo || _body );
|
||||
mfp.bgOverlay.add(mfp.wrap).prependTo( mfp.st.prependTo || $(document.body) );
|
||||
|
||||
// Save last focused element
|
||||
mfp._lastFocusedEl = document.activeElement;
|
||||
|
|
@ -438,7 +444,7 @@ MagnificPopup.prototype = {
|
|||
}
|
||||
|
||||
|
||||
if(mfp._lastFocusedEl) {
|
||||
if(mfp.st.autoFocusLast && mfp._lastFocusedEl) {
|
||||
$(mfp._lastFocusedEl).focus(); // put tab focus back
|
||||
}
|
||||
mfp.currItem = null;
|
||||
|
|
@ -493,10 +499,6 @@ MagnificPopup.prototype = {
|
|||
|
||||
mfp.currItem = item;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(!mfp.currTemplate[type]) {
|
||||
var markup = mfp.st[type] ? mfp.st[type].markup : false;
|
||||
|
||||
|
|
@ -557,8 +559,6 @@ MagnificPopup.prototype = {
|
|||
},
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Creates Magnific Popup data object based on given data
|
||||
* @param {int} index Index of item to parse
|
||||
|
|
@ -634,7 +634,7 @@ MagnificPopup.prototype = {
|
|||
var midClick = options.midClick !== undefined ? options.midClick : $.magnificPopup.defaults.midClick;
|
||||
|
||||
|
||||
if(!midClick && ( e.which === 2 || e.ctrlKey || e.metaKey ) ) {
|
||||
if(!midClick && ( e.which === 2 || e.ctrlKey || e.metaKey || e.altKey || e.shiftKey ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -661,7 +661,6 @@ MagnificPopup.prototype = {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
options.el = $(e.mfpEl);
|
||||
if(options.delegate) {
|
||||
options.items = el.find(options.delegate);
|
||||
|
|
@ -789,7 +788,7 @@ MagnificPopup.prototype = {
|
|||
if(el.is('img')) {
|
||||
el.attr('src', value);
|
||||
} else {
|
||||
el.replaceWith( '<img src="'+value+'" class="' + el.attr('class') + '" />' );
|
||||
el.replaceWith( $('<img>').attr('src', value).attr('class', el.attr('class')) );
|
||||
}
|
||||
} else {
|
||||
el.attr(arr[1], value);
|
||||
|
|
@ -806,7 +805,6 @@ MagnificPopup.prototype = {
|
|||
// thx David
|
||||
if(mfp.scrollbarSize === undefined) {
|
||||
var scrollDiv = document.createElement("div");
|
||||
scrollDiv.id = "mfp-sbm";
|
||||
scrollDiv.style.cssText = 'width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;';
|
||||
document.body.appendChild(scrollDiv);
|
||||
mfp.scrollbarSize = scrollDiv.offsetWidth - scrollDiv.clientWidth;
|
||||
|
|
@ -837,7 +835,6 @@ $.magnificPopup = {
|
|||
options = $.extend(true, {}, options);
|
||||
}
|
||||
|
||||
|
||||
options.isObj = true;
|
||||
options.index = index || 0;
|
||||
return this.instance.open(options);
|
||||
|
|
@ -896,11 +893,13 @@ $.magnificPopup = {
|
|||
|
||||
overflowY: 'auto',
|
||||
|
||||
closeMarkup: '<button title="%title%" type="button" class="mfp-close">×</button>',
|
||||
closeMarkup: '<button title="%title%" type="button" class="mfp-close">×</button>',
|
||||
|
||||
tClose: 'Close (Esc)',
|
||||
|
||||
tLoading: 'Loading...'
|
||||
tLoading: 'Loading...',
|
||||
|
||||
autoFocusLast: true
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -956,26 +955,6 @@ $.fn.magnificPopup = function(options) {
|
|||
return jqEl;
|
||||
};
|
||||
|
||||
|
||||
//Quick benchmark
|
||||
/*
|
||||
var start = performance.now(),
|
||||
i,
|
||||
rounds = 1000;
|
||||
|
||||
for(i = 0; i < rounds; i++) {
|
||||
|
||||
}
|
||||
console.log('Test #1:', performance.now() - start);
|
||||
|
||||
start = performance.now();
|
||||
for(i = 0; i < rounds; i++) {
|
||||
|
||||
}
|
||||
console.log('Test #2:', performance.now() - start);
|
||||
*/
|
||||
|
||||
|
||||
/*>>core*/
|
||||
|
||||
/*>>inline*/
|
||||
|
|
@ -1053,7 +1032,7 @@ var AJAX_NS = 'ajax',
|
|||
_ajaxCur,
|
||||
_removeAjaxCursor = function() {
|
||||
if(_ajaxCur) {
|
||||
_body.removeClass(_ajaxCur);
|
||||
$(document.body).removeClass(_ajaxCur);
|
||||
}
|
||||
},
|
||||
_destroyAjaxRequest = function() {
|
||||
|
|
@ -1081,8 +1060,9 @@ $.magnificPopup.registerModule(AJAX_NS, {
|
|||
},
|
||||
getAjax: function(item) {
|
||||
|
||||
if(_ajaxCur)
|
||||
_body.addClass(_ajaxCur);
|
||||
if(_ajaxCur) {
|
||||
$(document.body).addClass(_ajaxCur);
|
||||
}
|
||||
|
||||
mfp.updateStatus('loading');
|
||||
|
||||
|
|
@ -1126,12 +1106,6 @@ $.magnificPopup.registerModule(AJAX_NS, {
|
|||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*>>ajax*/
|
||||
|
||||
/*>>image*/
|
||||
|
|
@ -1182,13 +1156,13 @@ $.magnificPopup.registerModule('image', {
|
|||
|
||||
_mfpOn(OPEN_EVENT+ns, function() {
|
||||
if(mfp.currItem.type === 'image' && imgSt.cursor) {
|
||||
_body.addClass(imgSt.cursor);
|
||||
$(document.body).addClass(imgSt.cursor);
|
||||
}
|
||||
});
|
||||
|
||||
_mfpOn(CLOSE_EVENT+ns, function() {
|
||||
if(imgSt.cursor) {
|
||||
_body.removeClass(imgSt.cursor);
|
||||
$(document.body).removeClass(imgSt.cursor);
|
||||
}
|
||||
_window.off('resize' + EVENT_NS);
|
||||
});
|
||||
|
|
@ -1326,6 +1300,9 @@ $.magnificPopup.registerModule('image', {
|
|||
if(el.length) {
|
||||
var img = document.createElement('img');
|
||||
img.className = 'mfp-img';
|
||||
if(item.el && item.el.find('img').length) {
|
||||
img.alt = item.el.find('img').attr('alt');
|
||||
}
|
||||
item.img = $(img).on('load.mfploader', onLoadComplete).on('error.mfploader', onLoadError);
|
||||
img.src = item.src;
|
||||
|
||||
|
|
@ -1377,8 +1354,6 @@ $.magnificPopup.registerModule('image', {
|
|||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
/*>>image*/
|
||||
|
||||
/*>>zoom*/
|
||||
|
|
@ -1492,7 +1467,6 @@ $.magnificPopup.registerModule('zoom', {
|
|||
animatedImg = getElToAnimate(image);
|
||||
}
|
||||
|
||||
|
||||
animatedImg.css( mfp._getOffset(true) );
|
||||
mfp.wrap.append(animatedImg);
|
||||
mfp.content.css('visibility', 'hidden');
|
||||
|
|
@ -1712,8 +1686,7 @@ $.magnificPopup.registerModule('gallery', {
|
|||
initGallery: function() {
|
||||
|
||||
var gSt = mfp.st.gallery,
|
||||
ns = '.mfp-gallery',
|
||||
supportsFastClick = Boolean($.fn.mfpFastClick);
|
||||
ns = '.mfp-gallery';
|
||||
|
||||
mfp.direction = true; // true - next, false - prev
|
||||
|
||||
|
|
@ -1758,22 +1731,13 @@ $.magnificPopup.registerModule('gallery', {
|
|||
arrowLeft = mfp.arrowLeft = $( markup.replace(/%title%/gi, gSt.tPrev).replace(/%dir%/gi, 'left') ).addClass(PREVENT_CLOSE_CLASS),
|
||||
arrowRight = mfp.arrowRight = $( markup.replace(/%title%/gi, gSt.tNext).replace(/%dir%/gi, 'right') ).addClass(PREVENT_CLOSE_CLASS);
|
||||
|
||||
var eName = supportsFastClick ? 'mfpFastClick' : 'click';
|
||||
arrowLeft[eName](function() {
|
||||
arrowLeft.click(function() {
|
||||
mfp.prev();
|
||||
});
|
||||
arrowRight[eName](function() {
|
||||
arrowRight.click(function() {
|
||||
mfp.next();
|
||||
});
|
||||
|
||||
// Polyfill for :before and :after (adds elements with classes mfp-a and mfp-b)
|
||||
if(mfp.isIE7) {
|
||||
_getEl('b', arrowLeft[0], false, true);
|
||||
_getEl('a', arrowLeft[0], false, true);
|
||||
_getEl('b', arrowRight[0], false, true);
|
||||
_getEl('a', arrowRight[0], false, true);
|
||||
}
|
||||
|
||||
mfp.container.append(arrowLeft.add(arrowRight));
|
||||
}
|
||||
});
|
||||
|
|
@ -1791,10 +1755,6 @@ $.magnificPopup.registerModule('gallery', {
|
|||
_mfpOn(CLOSE_EVENT+ns, function() {
|
||||
_document.off(ns);
|
||||
mfp.wrap.off('click'+ns);
|
||||
|
||||
if(mfp.arrowLeft && supportsFastClick) {
|
||||
mfp.arrowLeft.add(mfp.arrowRight).destroyMfpFastClick();
|
||||
}
|
||||
mfp.arrowRight = mfp.arrowLeft = null;
|
||||
});
|
||||
|
||||
|
|
@ -1857,58 +1817,6 @@ $.magnificPopup.registerModule('gallery', {
|
|||
}
|
||||
});
|
||||
|
||||
/*
|
||||
Touch Support that might be implemented some day
|
||||
|
||||
addSwipeGesture: function() {
|
||||
var startX,
|
||||
moved,
|
||||
multipleTouches;
|
||||
|
||||
return;
|
||||
|
||||
var namespace = '.mfp',
|
||||
addEventNames = function(pref, down, move, up, cancel) {
|
||||
mfp._tStart = pref + down + namespace;
|
||||
mfp._tMove = pref + move + namespace;
|
||||
mfp._tEnd = pref + up + namespace;
|
||||
mfp._tCancel = pref + cancel + namespace;
|
||||
};
|
||||
|
||||
if(window.navigator.msPointerEnabled) {
|
||||
addEventNames('MSPointer', 'Down', 'Move', 'Up', 'Cancel');
|
||||
} else if('ontouchstart' in window) {
|
||||
addEventNames('touch', 'start', 'move', 'end', 'cancel');
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
_window.on(mfp._tStart, function(e) {
|
||||
var oE = e.originalEvent;
|
||||
multipleTouches = moved = false;
|
||||
startX = oE.pageX || oE.changedTouches[0].pageX;
|
||||
}).on(mfp._tMove, function(e) {
|
||||
if(e.originalEvent.touches.length > 1) {
|
||||
multipleTouches = e.originalEvent.touches.length;
|
||||
} else {
|
||||
//e.preventDefault();
|
||||
moved = true;
|
||||
}
|
||||
}).on(mfp._tEnd + ' ' + mfp._tCancel, function(e) {
|
||||
if(moved && !multipleTouches) {
|
||||
var oE = e.originalEvent,
|
||||
diff = startX - (oE.pageX || oE.changedTouches[0].pageX);
|
||||
|
||||
if(diff > 20) {
|
||||
mfp.next();
|
||||
} else if(diff < -20) {
|
||||
mfp.prev();
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
*/
|
||||
|
||||
|
||||
/*>>gallery*/
|
||||
|
||||
/*>>retina*/
|
||||
|
|
@ -1949,101 +1857,4 @@ $.magnificPopup.registerModule(RETINA_NS, {
|
|||
});
|
||||
|
||||
/*>>retina*/
|
||||
|
||||
/*>>fastclick*/
|
||||
/**
|
||||
* FastClick event implementation. (removes 300ms delay on touch devices)
|
||||
* Based on https://developers.google.com/mobile/articles/fast_buttons
|
||||
*
|
||||
* You may use it outside the Magnific Popup by calling just:
|
||||
*
|
||||
* $('.your-el').mfpFastClick(function() {
|
||||
* console.log('Clicked!');
|
||||
* });
|
||||
*
|
||||
* To unbind:
|
||||
* $('.your-el').destroyMfpFastClick();
|
||||
*
|
||||
*
|
||||
* Note that it's a very basic and simple implementation, it blocks ghost click on the same element where it was bound.
|
||||
* If you need something more advanced, use plugin by FT Labs https://github.com/ftlabs/fastclick
|
||||
*
|
||||
*/
|
||||
|
||||
(function() {
|
||||
var ghostClickDelay = 1000,
|
||||
supportsTouch = 'ontouchstart' in window,
|
||||
unbindTouchMove = function() {
|
||||
_window.off('touchmove'+ns+' touchend'+ns);
|
||||
},
|
||||
eName = 'mfpFastClick',
|
||||
ns = '.'+eName;
|
||||
|
||||
|
||||
// As Zepto.js doesn't have an easy way to add custom events (like jQuery), so we implement it in this way
|
||||
$.fn.mfpFastClick = function(callback) {
|
||||
|
||||
return $(this).each(function() {
|
||||
|
||||
var elem = $(this),
|
||||
lock;
|
||||
|
||||
if( supportsTouch ) {
|
||||
|
||||
var timeout,
|
||||
startX,
|
||||
startY,
|
||||
pointerMoved,
|
||||
point,
|
||||
numPointers;
|
||||
|
||||
elem.on('touchstart' + ns, function(e) {
|
||||
pointerMoved = false;
|
||||
numPointers = 1;
|
||||
|
||||
point = e.originalEvent ? e.originalEvent.touches[0] : e.touches[0];
|
||||
startX = point.clientX;
|
||||
startY = point.clientY;
|
||||
|
||||
_window.on('touchmove'+ns, function(e) {
|
||||
point = e.originalEvent ? e.originalEvent.touches : e.touches;
|
||||
numPointers = point.length;
|
||||
point = point[0];
|
||||
if (Math.abs(point.clientX - startX) > 10 ||
|
||||
Math.abs(point.clientY - startY) > 10) {
|
||||
pointerMoved = true;
|
||||
unbindTouchMove();
|
||||
}
|
||||
}).on('touchend'+ns, function(e) {
|
||||
unbindTouchMove();
|
||||
if(pointerMoved || numPointers > 1) {
|
||||
return;
|
||||
}
|
||||
lock = true;
|
||||
e.preventDefault();
|
||||
clearTimeout(timeout);
|
||||
timeout = setTimeout(function() {
|
||||
lock = false;
|
||||
}, ghostClickDelay);
|
||||
callback();
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
elem.on('click' + ns, function() {
|
||||
if(!lock) {
|
||||
callback();
|
||||
}
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
$.fn.destroyMfpFastClick = function() {
|
||||
$(this).off('touchstart' + ns + ' click' + ns);
|
||||
if(supportsTouch) _window.off('touchmove'+ns+' touchend'+ns);
|
||||
};
|
||||
})();
|
||||
|
||||
/*>>fastclick*/
|
||||
_checkInstance(); })(window.jQuery || window.Zepto);
|
||||
_checkInstance(); }));
|
||||
Loading…
Reference in a new issue