magnific-popup-rails 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5483a4804ef5103dce66e64b1b6769b76e2afdeb
-  data.tar.gz: 9d7fe3fe758cefa4d4da62a6b221f786a4ec1ecd
+  metadata.gz: 3e36e33baa530cfa85c5791ad6c3a9d8171157df
+  data.tar.gz: 2e4b2d7fb1ad27c59cd2fa06ce9311bb56d3601b
 SHA512:
-  metadata.gz: 502d9ad0db09e8cc5c0bdf38eb94723adb1d62860ed9aaddb3bfcc8e149d383bdac51efc6b7121f535deedbe290af0a0d4265accab57431b271bd42ff2550ee4
-  data.tar.gz: 69283604406c21571262468117a734fdde23f5b150a83c13e98db34187e71b147587401594bd77d529fa589272cb10eebf703614f1dd10827a33508d185dd285
+  metadata.gz: 1a7b819ce7c4821cafaa1a3e36fd3a7e8e36c2d304bee5f385f38b4e31df35be11dfb0321ee03e9fad8e476145f2de546bd877fb54c6708776be90c15efe9549
+  data.tar.gz: 281780d1b21c88b4ee949ee032163956666b7454675894f8963b3cd1ba0e00a3568b2ece032654351b325b7f0ce9327db112de7f2d69d5b99bec5247ff96d483

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

@@ -1,5 +1,5 @@
 module MagnificPopup
   module Rails
-    VERSION = "0.8.4"
+    VERSION = "0.8.5"
   end
 end

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

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.4 - 2013-05-13
+/*! Magnific Popup - v0.8.5 - 2013-05-15
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -91,6 +91,38 @@ var _mfpOn = function(name, f) {
 			mfp.init();
 			$.magnificPopup.instance = mfp;
 		}
+	},
+	// Check to close popup or not
+	// "target" is an element that was clicked
+	_checkIfClose = function(target) {
+
+		if($(target).hasClass(PREVENT_CLOSE_CLASS)) {
+			return;
+		}
+
+		var closeOnContent = mfp.st.closeOnContentClick;
+		var closeOnBg = mfp.st.closeOnBgClick;
+
+		if(closeOnContent && closeOnBg) {
+			return true;
+		} else {
+
+			// We close the popup if click is on close button or on preloader. Or if there is no content.
+			if(!mfp.content || $(target).hasClass('mfp-close') || (mfp.preloader && target === mfp.preloader[0]) ) {
+				return true;
+			}
+
+			// if click is outside the content
+			if(  (target !== mfp.content[0] && !$.contains(mfp.content[0], target))  ) {
+				if(closeOnBg) {
+					return true;
+				}
+			} else if(closeOnContent) {
+				return true;
+			}
+
+		}
+		return false;
 	};
 
 
@@ -109,9 +141,10 @@ 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.isAndroid = (/android/gi).test(appVersion);
 		mfp.isIOS = (/iphone|ipad|ipod/gi).test(appVersion);
-
 		// 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) );
@@ -186,22 +219,8 @@ MagnificPopup.prototype = {
 			});
 
 			mfp.wrap = _getEl('wrap').attr('tabindex', -1).on('click'+EVENT_NS, function(e) {
-
-				var target = e.target;
-				if($(target).hasClass(PREVENT_CLOSE_CLASS)) {
-					return;
-				}
-
-				if(mfp.st.closeOnContentClick) {
+				if(_checkIfClose(e.target)) {
 					mfp.close();
-				} else {
-					// close popup if click is not on a content, on close button, or content does not exist
-					if( !mfp.content || 
-						$(target).hasClass('mfp-close') ||
-						(mfp.preloader && e.target === mfp.preloader[0]) || 
-						(target !== mfp.content[0] && !$.contains(mfp.content[0], target)) ) {
-						mfp.close();
-					}
 				}
 			});
 
@@ -287,7 +306,7 @@ MagnificPopup.prototype = {
 		
 		var bodyStyles = {};
 
-		if( mfp.fixedContentPos && mfp.st.overflowY !== 'scroll' ) {
+		if( mfp.fixedContentPos ) {
 			var s = mfp._getScrollbarSize();
 			if(s) {
 				bodyStyles.paddingRight = s;
@@ -364,7 +383,7 @@ MagnificPopup.prototype = {
 
 		mfp.isOpen = false;
 		// for CSS3 animation
-		if(mfp.st.removalDelay)  {
+		if(mfp.st.removalDelay && !mfp.isLowIE)  {
 			mfp._addClassToMFP(REMOVING_CLASS);
 			setTimeout(function() {
 				mfp._close();
@@ -419,7 +438,8 @@ MagnificPopup.prototype = {
 
 		if(mfp._lastFocusedEl) {
 			$(mfp._lastFocusedEl).focus(); // put tab focus back
-		}	
+		}
+		mfp.currItem = null;	
 		mfp.content = null;
 		mfp.currTemplate = null;
 		mfp.prevHeight = 0;
@@ -456,10 +476,19 @@ MagnificPopup.prototype = {
 		if(!item.parsed) {
 			item = mfp.parseEl( mfp.index );
 		}
+
+		var type = item.type;	
+
+		_mfpTrigger('BeforeChange', [mfp.currItem ? mfp.currItem.type : '', type]);
+		// BeforeChange event works like so:
+		// _mfpOn('BeforeChange', function(e, prevType, newType) { });
 		
 		mfp.currItem = item;
 
-		var type = item.type;		
+		
+
+		
+
 		if(!mfp.currTemplate[type]) {
 			var markup = mfp.st[type] ? mfp.st[type].markup : false;
 
@@ -488,6 +517,8 @@ MagnificPopup.prototype = {
 		
 		// Append container back after its content changed
 		mfp.container.prepend(mfp.contentContainer);
+
+		_mfpTrigger('AfterChange');
 	},
 
 
@@ -779,6 +810,8 @@ $.magnificPopup = {
 		
 		closeOnContentClick: false,
 
+		closeOnBgClick: true,
+
 		closeBtnInside: true, 
 
 		alignTop: false,
@@ -1074,15 +1107,22 @@ $.magnificPopup.registerModule('image', {
 				_window.off('resize' + EVENT_NS);
 			});
 
-			_mfpOn('Resize'+ns, function() {
-				mfp.resizeImage();
-			});
+			_mfpOn('Resize'+ns, mfp.resizeImage);
+			if(mfp.isLowIE) {
+				_mfpOn('AfterChange', mfp.resizeImage);
+			}
 		},
 		resizeImage: function() {
 			var item = mfp.currItem;
 			if(!item.img) return;
+
 			if(mfp.st.image.verticalFit) {
-				item.img.css('max-height', mfp.wH + 'px');
+				var decr = 0;
+				// fix box-sizing in ie7/8
+				if(mfp.isLowIE) {
+					decr = parseInt(item.img.css('padding-top'), 10) + parseInt(item.img.css('padding-bottom'),10);
+				}
+				item.img.css('max-height', mfp.wH-decr);
 			}
 		},
 		_onImageHasSize: function(item) {
@@ -1249,13 +1289,21 @@ $.magnificPopup.registerModule('image', {
 /*>>iframe*/
 
 var IFRAME_NS = 'iframe',
+	_emptyPage = '//about:blank',
+	
+	_fixIframeBugs = function(isShowing) {
+		if(mfp.currTemplate[IFRAME_NS]) {
+			var el = mfp.currTemplate[IFRAME_NS].find('iframe');
+			if(el.length) { 
+				// reset src after the popup is closed to avoid "video keeps playing after popup is closed" bug
+				if(!isShowing) {
+					el[0].src = _emptyPage;
+				}
 
-	// IE black screen bug fix
-	toggleIframeInIE = function(show) {
-		if(mfp.isIE7 && mfp.currItem && mfp.currItem.type === IFRAME_NS) {
-			var el = mfp.content.find('iframe');
-			if(el.length) {
-				el.css('display', show ? 'block' : 'none');
+				// IE8 black screen bug fix
+				if(mfp.isIE8) {
+					el.css('display', isShowing ? 'block' : 'none');
+				}
 			}
 		}
 	};
@@ -1265,7 +1313,7 @@ $.magnificPopup.registerModule(IFRAME_NS, {
 	options: {
 		markup: '<div class="mfp-iframe-scaler">'+
 					'<div class="mfp-close"></div>'+
-					'<iframe class="mfp-iframe" frameborder="0" allowfullscreen></iframe>'+
+					'<iframe class="mfp-iframe" src="//about:blank" frameborder="0" allowfullscreen></iframe>'+
 				'</div>',
 
 		srcAction: 'iframe_src',
@@ -1292,10 +1340,20 @@ $.magnificPopup.registerModule(IFRAME_NS, {
 	proto: {
 		initIframe: function() {
 			mfp.types.push(IFRAME_NS);
-			toggleIframeInIE(true);
-			_mfpOn(CLOSE_EVENT + '.' + IFRAME_NS, function() {
-				toggleIframeInIE();
+
+			_mfpOn('BeforeChange', function(e, prevType, newType) {
+				if(prevType !== newType) {
+					if(prevType === IFRAME_NS) {
+						_fixIframeBugs(); // iframe if removed
+					} else if(newType === IFRAME_NS) {
+						_fixIframeBugs(true); // iframe is showing
+					} 
+				}// else {
+					// iframe source is switched, don't do anything
+				//}
 			});
+
+			_mfpOn(CLOSE_EVENT + '.' + IFRAME_NS, _fixIframeBugs);
 		},
 
 		getIframe: function(item, template) {

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

@@ -296,7 +296,8 @@ img.mfp-img {
 .mfp-title {
   text-align: left;
   line-height: 18px;
-  color: #f3f3f3; }
+  color: #f3f3f3;
+  padding-right: 36px; }
 
 .mfp-figure small {
   color: #bdbdbd;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magnific-popup-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Joshua Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake