magnific-popup-rails 0.8.9 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624bb1c6f24eb32ca3081a289bd90508ba249e3d
-  data.tar.gz: 7c1215f4b5e94c3905b60723aed37cabb28e0a62
+  metadata.gz: ec7f564e5818c04d199b66e9ae0697826be4cadc
+  data.tar.gz: 3b72f9ce7ca69fa517b7d9e6e2aa7fbdeb957ce3
 SHA512:
-  metadata.gz: 7b57ccc8271ff21c04488802786695aebae9cfe72c1cd0f35ae71f6d2978d59ffffe1d9bd9f0f57bb1d90dc6e16581d188f8a2d1b5bedbc9747f2ef656f3c644
-  data.tar.gz: 79526db942e9a2f1070c4eed97d7acb6b74bfe168656d5b08d83e37b5e8b2b9eb022e255f2be55872840c3f8bca1dfe8c37fc695a4f9cbf33d341a715a096a09
+  metadata.gz: 2d8d02290428074f7f860917966e6d72b6ac63f8773aba05f4f67fd8725c60144b877bc71db5121db6be4cc51417be00ccf8bdd8ffbe01b40c44ca20d69e0fb6
+  data.tar.gz: 3d9fdc61d4dd3397c4d9f4838c9e6ba7e7ee4ef45a5f510cd95b9648d714a773f6828dc56db3e482146cb07ae25aa7d2ef436c2b8d56ecb8f137887023eaf2c8

data/lib/magnific-popup-rails/version.rb

@@ -1,5 +1,5 @@
 module MagnificPopup
   module Rails
-    VERSION = "0.8.9"
+    VERSION = "0.9.3"
   end
 end

data/vendor/assets/javascripts/magnific-popup/jquery.magnific-popup.js

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.9 - 2013-06-04
+/*! Magnific Popup - v0.9.3 - 2013-07-16
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -15,6 +15,7 @@
  * Private static constants
  */
 var CLOSE_EVENT = 'Close',
+	BEFORE_CLOSE_EVENT = 'BeforeClose',
 	AFTER_CLOSE_EVENT = 'AfterClose',
 	BEFORE_APPEND_EVENT = 'BeforeAppend',
 	MARKUP_PARSE_EVENT = 'MarkupParse',
@@ -76,7 +77,7 @@ var _mfpOn = function(name, f) {
 		}
 	},
 	_setFocus = function() {
-		(mfp.st.focus ? mfp.content.find(mfp.st.focus).eq(0) : mfp.wrap).focus();
+		(mfp.st.focus ? mfp.content.find(mfp.st.focus).eq(0) : mfp.wrap).trigger('focus');
 	},
 	_getCloseBtn = function(type) {
 		if(type !== _currPopupType || !mfp.currTemplate.closeBtn) {
@@ -116,13 +117,33 @@ var _mfpOn = function(name, f) {
 			// if click is outside the content
 			if(  (target !== mfp.content[0] && !$.contains(mfp.content[0], target))  ) {
 				if(closeOnBg) {
-					return true;
+					// last check, if the clicked element is in DOM, (in case it's removed onclick)
+					if( $.contains(document, target) ) {
+						return true;
+					}
 				}
 			} else if(closeOnContent) {
 				return true;
 			}
 
 		}
+		return false;
+	},
+	// CSS transition detection, http://stackoverflow.com/questions/7264899/detect-css-transitions-using-javascript-and-without-modernizr
+	supportsTransitions = function() {
+		var s = document.createElement('p').style, // 's' for style. better to create an element if body yet to exist
+			v = ['ms','O','Moz','Webkit']; // 'v' for vendor
+
+		if( s['transition'] !== undefined ) {
+			return true; 
+		}
+			
+		while( v.length ) {
+			if( v.pop() + 'Transition' in s ) {
+				return true;
+			}
+		}
+				
 		return false;
 	};
 
@@ -146,6 +167,8 @@ MagnificPopup.prototype = {
 		mfp.isLowIE = mfp.isIE7 || mfp.isIE8;
 		mfp.isAndroid = (/android/gi).test(appVersion);
 		mfp.isIOS = (/iphone|ipad|ipod/gi).test(appVersion);
+		mfp.supportsTransition = supportsTransitions();
+
 		// We disable fixed positioned lightbox on devices that don't handle it nicely.
 		// If you know a better way of detecting this - let me know.
 		mfp.probablyMobile = (mfp.isAndroid || mfp.isIOS || /(Opera Mini)|Kindle|webOS|BlackBerry|(Opera Mobi)|(Windows Phone)|IEMobile/i.test(navigator.userAgent) );
@@ -193,7 +216,11 @@ MagnificPopup.prototype = {
 		
 		mfp.types = []; 
 		_wrapClasses = '';
-		mfp.ev = data.mainEl || _document;
+		if(data.mainEl && data.mainEl.length) {
+			mfp.ev = data.mainEl.eq(0);
+		} else {
+			mfp.ev = _document;
+		}
 
 		if(data.key) {
 			if(!mfp.popupsCache[data.key]) {
@@ -208,7 +235,13 @@ MagnificPopup.prototype = {
 
 		mfp.st = $.extend(true, {}, $.magnificPopup.defaults, data ); 
 		mfp.fixedContentPos = mfp.st.fixedContentPos === 'auto' ? !mfp.probablyMobile : mfp.st.fixedContentPos;
-		
+
+		if(mfp.st.modal) {
+			mfp.st.closeOnContentClick = false;
+			mfp.st.closeOnBgClick = false;
+			mfp.st.showCloseBtn = false;
+			mfp.st.enableEscapeKey = false;
+		}
 		
 
 		// Building markup
@@ -245,14 +278,16 @@ MagnificPopup.prototype = {
 		_mfpTrigger('BeforeOpen');
 
 
-		// Close button
-		if(!mfp.st.closeBtnInside) {
-			mfp.wrap.append( _getCloseBtn() );
-		} else {
-			_mfpOn(MARKUP_PARSE_EVENT, function(e, template, values, item) {
-				values.close_replaceWith = _getCloseBtn(item.type);
-			});
-			_wrapClasses += ' mfp-close-btn-in';
+		if(mfp.st.showCloseBtn) {
+			// Close button
+			if(!mfp.st.closeBtnInside) {
+				mfp.wrap.append( _getCloseBtn() );
+			} else {
+				_mfpOn(MARKUP_PARSE_EVENT, function(e, template, values, item) {
+					values.close_replaceWith = _getCloseBtn(item.type);
+				});
+				_wrapClasses += ' mfp-close-btn-in';
+			}
 		}
 
 		if(mfp.st.alignTop) {
@@ -282,12 +317,14 @@ MagnificPopup.prototype = {
 
 		
 
-		// Close on ESC key
-		_document.on('keyup' + EVENT_NS, function(e) {
-			if(e.keyCode === 27) {
-				mfp.close();
-			}
-		});
+		if(mfp.st.enableEscapeKey) {
+			// Close on ESC key
+			_document.on('keyup' + EVENT_NS, function(e) {
+				if(e.keyCode === 27) {
+					mfp.close();
+				}
+			});
+		}
 
 		_window.on('resize' + EVENT_NS, function() {
 			mfp.updateSize();
@@ -306,20 +343,20 @@ MagnificPopup.prototype = {
 		var windowHeight = mfp.wH = _window.height();
 
 		
-		var bodyStyles = {};
+		var windowStyles = {};
 
 		if( mfp.fixedContentPos ) {
             if(mfp._hasScrollBar(windowHeight)){
                 var s = mfp._getScrollbarSize();
                 if(s) {
-                    bodyStyles.paddingRight = s;
+                    windowStyles.paddingRight = s;
                 }
             }
         }
 
 		if(mfp.fixedContentPos) {
 			if(!mfp.isIE7) {
-				bodyStyles.overflow = 'hidden';
+				windowStyles.overflow = 'hidden';
 			} else {
 				// ie7 double-scroll bug
 				$('body, html').css('overflow', 'hidden');
@@ -343,7 +380,7 @@ MagnificPopup.prototype = {
 
 
 		// remove scrollbar, add padding e.t.c
-		_body.css(bodyStyles);
+		$('html').css(windowStyles);
 		
 		// add everything to DOM
 		mfp.bgOverlay.add(mfp.wrap).prependTo( document.body );
@@ -384,10 +421,11 @@ MagnificPopup.prototype = {
 	 */
 	close: function() {
 		if(!mfp.isOpen) return;
+		_mfpTrigger(BEFORE_CLOSE_EVENT);
 
 		mfp.isOpen = false;
 		// for CSS3 animation
-		if(mfp.st.removalDelay && !mfp.isLowIE)  {
+		if(mfp.st.removalDelay && !mfp.isLowIE && mfp.supportsTransition )  {
 			mfp._addClassToMFP(REMOVING_CLASS);
 			setTimeout(function() {
 				mfp._close();
@@ -416,13 +454,13 @@ MagnificPopup.prototype = {
 		mfp._removeClassFromMFP(classesToRemove);
 
 		if(mfp.fixedContentPos) {
-			var bodyStyles = {paddingRight: ''};
+			var windowStyles = {paddingRight: ''};
 			if(mfp.isIE7) {
 				$('body, html').css('overflow', '');
 			} else {
-				bodyStyles.overflow = '';
+				windowStyles.overflow = '';
 			}
-			_body.css(bodyStyles);
+			$('html').css(windowStyles);
 		}
 		
 		_document.off('keyup' + EVENT_NS + ' focusin' + EVENT_NS);
@@ -434,14 +472,15 @@ MagnificPopup.prototype = {
 		mfp.container.attr('class', 'mfp-container');
 
 		// remove close button from target element
-		if(!mfp.st.closeBtnInside || mfp.currTemplate[mfp.currItem.type] === true ) {
+		if(mfp.st.showCloseBtn &&
+		(!mfp.st.closeBtnInside || mfp.currTemplate[mfp.currItem.type] === true)) {
 			if(mfp.currTemplate.closeBtn)
 				mfp.currTemplate.closeBtn.detach();
 		}
 
 
 		if(mfp._lastFocusedEl) {
-			$(mfp._lastFocusedEl).focus(); // put tab focus back
+			$(mfp._lastFocusedEl).trigger('focus'); // put tab focus back
 		}
 		mfp.currItem = null;	
 		mfp.content = null;
@@ -539,7 +578,8 @@ MagnificPopup.prototype = {
 		mfp.content = newContent;
 		
 		if(newContent) {
-			if(mfp.st.closeBtnInside && mfp.currTemplate[type] === true) {
+			if(mfp.st.showCloseBtn && mfp.st.closeBtnInside &&
+				mfp.currTemplate[type] === true) {
 				// if there is no markup, we just append close button element inside
 				if(!mfp.content.find('.mfp-close').length) {
 					mfp.content.append(_getCloseBtn());
@@ -632,37 +672,41 @@ MagnificPopup.prototype = {
 	},
 	_openClick: function(e, el, options) {
 		var midClick = options.midClick !== undefined ? options.midClick : $.magnificPopup.defaults.midClick;
-		if( midClick || e.which !== 2 ) {
-			var disableOn = options.disableOn !== undefined ? options.disableOn : $.magnificPopup.defaults.disableOn;
 
-			if(disableOn) {
-				if($.isFunction(disableOn)) {
-					if( !disableOn.call(mfp) ) {
-						return true;
-					}
-				} else { // else it's number
-					if( _window.width() < disableOn ) {
-						return true;
-					}
-				}
-			}
-			
-			if(e.type) {
-				e.preventDefault();
 
-				// This will prevent popup from closing if element is inside and popup is already opened
-				if(mfp.isOpen) {
-					e.stopPropagation();
+		if(!midClick && ( e.which === 2 || e.ctrlKey || e.metaKey ) ) {
+			return;
+		}
+
+		var disableOn = options.disableOn !== undefined ? options.disableOn : $.magnificPopup.defaults.disableOn;
+
+		if(disableOn) {
+			if($.isFunction(disableOn)) {
+				if( !disableOn.call(mfp) ) {
+					return true;
+				}
+			} else { // else it's number
+				if( _window.width() < disableOn ) {
+					return true;
 				}
 			}
-				
+		}
+		
+		if(e.type) {
+			e.preventDefault();
 
-			options.el = $(e.mfpEl);
-			if(options.delegate) {
-				options.items = el.find(options.delegate);
+			// This will prevent popup from closing if element is inside and popup is already opened
+			if(mfp.isOpen) {
+				e.stopPropagation();
 			}
-			mfp.open(options);
 		}
+			
+
+		options.el = $(e.mfpEl);
+		if(options.delegate) {
+			options.items = el.find(options.delegate);
+		}
+		mfp.open(options);
 	},
 
 
@@ -692,7 +736,7 @@ MagnificPopup.prototype = {
 
 			mfp.preloader.html(text);
 
-			mfp.preloader.find('a').click(function(e) {
+			mfp.preloader.find('a').on('click', function(e) {
 				e.stopImmediatePropagation();
 			});
 
@@ -714,7 +758,7 @@ MagnificPopup.prototype = {
 		mfp.wrap.removeClass(cName);
 	},
 	_hasScrollBar: function(winHeight) {
-		return (  (mfp.isIE7 ? _document.height() : document.body.scrollHeight) > (winHeight || _window.height()) )
+		return (  (mfp.isIE7 ? _document.height() : document.body.scrollHeight) > (winHeight || _window.height()) );
 	},
 	_parseMarkup: function(template, values, item) {
 		var arr;
@@ -826,6 +870,12 @@ $.magnificPopup = {
 
 		closeBtnInside: true, 
 
+		showCloseBtn: true,
+
+		enableEscapeKey: true,
+
+		modal: false,
+
 		alignTop: false,
 	
 		removalDelay: 0,
@@ -1222,6 +1272,8 @@ $.magnificPopup.registerModule('image', {
 
 							item.hasSize = true;
 							item.loaded = true;
+
+							_mfpTrigger('ImageLoadComplete');
 							
 						}
 						else {
@@ -1265,6 +1317,9 @@ $.magnificPopup.registerModule('image', {
 				if(el.is('img')) {
 					item.img = item.img.clone();
 				}
+				if(item.img[0].naturalWidth > 0) {
+					item.hasSize = true;
+				}
 			}
 
 			mfp._parseMarkup(template, {
@@ -1305,6 +1360,193 @@ $.magnificPopup.registerModule('image', {
 
 /*>>image*/
 
+/*>>zoom*/
+var hasMozTransform,
+	getHasMozTransform = function() {
+		if(hasMozTransform === undefined) {
+			hasMozTransform = document.createElement('p').style.MozTransform !== undefined;
+		}
+		return hasMozTransform;		
+	};
+
+$.magnificPopup.registerModule('zoom', {
+
+	options: {
+		enabled: false,
+		easing: 'ease-in-out',
+		duration: 300,
+		opener: function(element) {
+			return element.is('img') ? element : element.find('img');
+		}
+	},
+
+	proto: {
+
+		initZoom: function() {
+			var zoomSt = mfp.st.zoom,
+				ns = '.zoom';
+				
+			if(!zoomSt.enabled || !mfp.supportsTransition) {
+				return;
+			}
+
+			var duration = zoomSt.duration,
+				getElToAnimate = function(image) {
+					var newImg = image.clone().removeAttr('style').removeAttr('class').addClass('mfp-animated-image'),
+						transition = 'all '+(zoomSt.duration/1000)+'s ' + zoomSt.easing,
+						cssObj = {
+							position: 'fixed',
+							zIndex: 9999,
+							left: 0,
+							top: 0,
+							'-webkit-backface-visibility': 'hidden'
+						},
+						t = 'transition';
+
+					cssObj['-webkit-'+t] = cssObj['-moz-'+t] = cssObj['-o-'+t] = cssObj[t] = transition;
+
+					newImg.css(cssObj);
+					return newImg;
+				},
+				showMainContent = function() {
+					mfp.content.css('visibility', 'visible');
+				},
+				openTimeout,
+				animatedImg;
+
+			_mfpOn('BuildControls'+ns, function() {
+				if(mfp._allowZoom()) {
+
+					clearTimeout(openTimeout);
+					mfp.content.css('visibility', 'hidden');
+
+					// Basically, all code below does is clones existing image, puts in on top of the current one and animated it
+					
+					image = mfp._getItemToZoom();
+
+					if(!image) {
+						showMainContent();
+						return;
+					}
+
+					animatedImg = getElToAnimate(image); 
+					
+					animatedImg.css( mfp._getOffset() );
+
+					mfp.wrap.append(animatedImg);
+
+					openTimeout = setTimeout(function() {
+						animatedImg.css( mfp._getOffset( true ) );
+						openTimeout = setTimeout(function() {
+
+							showMainContent();
+
+							setTimeout(function() {
+								animatedImg.remove();
+								image = animatedImg = null;
+								_mfpTrigger('ZoomAnimationEnded');
+							}, 16); // avoid blink when switching images 
+
+						}, duration); // this timeout equals animation duration
+
+					}, 16); // by adding this timeout we avoid short glitch at the beginning of animation
+
+
+					// Lots of timeouts...
+				}
+			});
+			_mfpOn(BEFORE_CLOSE_EVENT+ns, function() {
+				if(mfp._allowZoom()) {
+
+					clearTimeout(openTimeout);
+
+					mfp.st.removalDelay = duration;
+
+					if(!image) {
+						image = mfp._getItemToZoom();
+						if(!image) {
+							return;
+						}
+						animatedImg = getElToAnimate(image);
+					}
+					
+					
+					animatedImg.css( mfp._getOffset(true) );
+					mfp.wrap.append(animatedImg);
+					mfp.content.css('visibility', 'hidden');
+					
+					setTimeout(function() {
+						animatedImg.css( mfp._getOffset() );
+					}, 16);
+				}
+
+			});
+
+			_mfpOn(CLOSE_EVENT+ns, function() {
+				if(mfp._allowZoom()) {
+					showMainContent();
+					if(animatedImg) {
+						animatedImg.remove();
+					}
+				}	
+			});
+		},
+
+		_allowZoom: function() {
+			return mfp.currItem.type === 'image';
+		},
+
+		_getItemToZoom: function() {
+			if(mfp.currItem.hasSize) {
+				return mfp.currItem.img;
+			} else {
+				return false;
+			}
+		},
+
+		// Get element postion relative to viewport
+		_getOffset: function(isLarge) {
+			var el;
+			if(isLarge) {
+				el = mfp.currItem.img;
+			} else {
+				el = mfp.st.zoom.opener(mfp.currItem.el || mfp.currItem);
+			}
+
+			var offset = el.offset();
+			var paddingTop = parseInt(el.css('padding-top'),10);
+			var paddingBottom = parseInt(el.css('padding-bottom'),10);
+			offset.top -= ( $(window).scrollTop() - paddingTop );
+
+
+			/*
+			
+			Animating left + top + width/height looks glitchy in Firefox, but perfect in Chrome. And vice-versa.
+
+			 */
+			var obj = {
+				width: el.width(),
+				// fix Zepto height+padding issue
+				height: (_isJQ ? el.innerHeight() : el[0].offsetHeight) - paddingBottom - paddingTop
+			};
+
+			// I hate to do this, but there is no another option
+			if( getHasMozTransform() ) {
+				obj['-moz-transform'] = obj['transform'] = 'translate(' + offset.left + 'px,' + offset.top + 'px)';
+			} else {
+				obj.left = offset.left;
+				obj.top = offset.top;
+			}
+			return obj;
+		}
+
+	}
+});
+
+
+
+/*>>zoom*/
+
 /*>>iframe*/
 
 var IFRAME_NS = 'iframe',
@@ -1582,6 +1824,7 @@ $.magnificPopup.registerModule('gallery', {
 				}).on('error.mfploader', function() {
 					item.hasSize = true;
 					item.loadError = true;
+					_mfpTrigger('LazyLoadError', item);
 				}).attr('src', item.src);
 			}
 

data/vendor/assets/stylesheets/magnific-popup/magnific-popup.css

@@ -4,7 +4,7 @@
   left: 0;
   width: 100%;
   height: 100%;
-  z-index: 502;
+  z-index: 1042;
   overflow: hidden;
   position: fixed;
   background: #0b0b0b;
@@ -16,13 +16,12 @@
   left: 0;
   width: 100%;
   height: 100%;
-  z-index: 503;
+  z-index: 1043;
   position: fixed;
   outline: none !important;
   -webkit-backface-visibility: hidden; }
 
 .mfp-container {
-  height: 100%;
   text-align: center;
   position: absolute;
   width: 100%;
@@ -49,7 +48,7 @@
   vertical-align: middle;
   margin: 0 auto;
   text-align: left;
-  z-index: 505; }
+  z-index: 1045; }
 
 .mfp-inline-holder .mfp-content,
 .mfp-ajax-holder .mfp-content {
@@ -97,7 +96,7 @@
   margin-top: -0.8em;
   left: 8px;
   right: 8px;
-  z-index: 504; }
+  z-index: 1044; }
 
 .mfp-preloader a {
   color: #cccccc; }
@@ -120,7 +119,7 @@ button.mfp-arrow {
   -webkit-appearance: none;
   display: block;
   padding: 0;
-  z-index: 506; }
+  z-index: 1046; }
 
 button::-moz-focus-inner {
   padding: 0;
@@ -167,7 +166,6 @@ button::-moz-focus-inner {
 
 .mfp-arrow {
   position: absolute;
-  top: 0;
   opacity: 0.65;
   margin: 0;
   top: 50%;
@@ -196,37 +194,37 @@ button::-moz-focus-inner {
   top: 0;
   margin-top: 35px;
   margin-left: 35px;
-  border: solid transparent; }
+  border: medium inset transparent; }
 .mfp-arrow:after,
 .mfp-arrow .mfp-a {
-  opacity: 0.8;
-  border-top-width: 12px;
-  border-bottom-width: 12px;
+  border-top-width: 13px;
+  border-bottom-width: 13px;
   top: 8px; }
 .mfp-arrow:before,
 .mfp-arrow .mfp-b {
-  border-top-width: 20px;
-  border-bottom-width: 20px; }
+  border-top-width: 21px;
+  border-bottom-width: 21px; }
 
 .mfp-arrow-left {
   left: 0; }
   .mfp-arrow-left:after,
   .mfp-arrow-left .mfp-a {
-    border-right: 12px solid black;
-    left: 5px; }
+    border-right: 17px solid white;
+    margin-left: 31px; }
   .mfp-arrow-left:before,
   .mfp-arrow-left .mfp-b {
-    border-right: 20px solid white; }
+    margin-left: 25px;
+    border-right: 27px solid #3f3f3f; }
 
 .mfp-arrow-right {
   right: 0; }
   .mfp-arrow-right:after,
   .mfp-arrow-right .mfp-a {
-    border-left: 12px solid black;
-    left: 3px; }
+    border-left: 17px solid white;
+    margin-left: 39px; }
   .mfp-arrow-right:before,
   .mfp-arrow-right .mfp-b {
-    border-left: 20px solid white; }
+    border-left: 27px solid #3f3f3f; }
 
 .mfp-iframe-holder {
   padding-top: 40px;
@@ -281,7 +279,8 @@ img.mfp-img {
   width: auto;
   height: auto;
   z-index: -1;
-  box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); }
+  box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+  background: #444444; }
 
 .mfp-figure {
   line-height: 0; }
@@ -361,7 +360,7 @@ img.mfp-img {
   .mfp-img-mobile .mfp-figure small {
     display: inline;
     margin-left: 5px; } }
-@media all and (max-width: 800px) {
+@media all and (max-width: 900px) {
   .mfp-arrow {
     -webkit-transform: scale(0.75);
     transform: scale(0.75); }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnific-popup-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.3
 platform: ruby
 authors:
 - Joshua Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake