magnific-popup-rails 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5c37f0a1bdc475a11a10ce7fc2a485d4fdc848
-  data.tar.gz: c7bc9ab3cbeeff9e0f788a4625081690ac1a4524
+  metadata.gz: 624bb1c6f24eb32ca3081a289bd90508ba249e3d
+  data.tar.gz: 7c1215f4b5e94c3905b60723aed37cabb28e0a62
 SHA512:
-  metadata.gz: c8047ae4afc82e5369ad9f868701122f7f60afa2e97a454363e7b29a1b3f09e5384472b182b3737a48acb0aa9cbb1d340e8d767afd5ae0a90fe04966580fb0c3
-  data.tar.gz: a628027ca149648562ff1fcb66cefd4d8c3b5641b1edfd88cccf4762cc9eb02e93736d931890fa6e6ae477c1e728dc5a9d34947560f1c37cc6423839cdd0f633
+  metadata.gz: 7b57ccc8271ff21c04488802786695aebae9cfe72c1cd0f35ae71f6d2978d59ffffe1d9bd9f0f57bb1d90dc6e16581d188f8a2d1b5bedbc9747f2ef656f3c644
+  data.tar.gz: 79526db942e9a2f1070c4eed97d7acb6b74bfe168656d5b08d83e37b5e8b2b9eb022e255f2be55872840c3f8bca1dfe8c37fc695a4f9cbf33d341a715a096a09

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

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

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

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.8 - 2013-05-24
+/*! Magnific Popup - v0.8.9 - 2013-06-04
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -15,6 +15,7 @@
  * Private static constants
  */
 var CLOSE_EVENT = 'Close',
+	AFTER_CLOSE_EVENT = 'AfterClose',
 	BEFORE_APPEND_EVENT = 'BeforeAppend',
 	MARKUP_PARSE_EVENT = 'MarkupParse',
 	OPEN_EVENT = 'Open',
@@ -141,7 +142,7 @@ MagnificPopup.prototype = {
 	init: function() {
 		var appVersion = navigator.appVersion;
 		mfp.isIE7 = appVersion.indexOf("MSIE 7.") !== -1; 
-		mfp.isIE8 = appVersion.indexOf("MSIE 8.") !== -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);
@@ -227,7 +228,7 @@ MagnificPopup.prototype = {
 
 			mfp.container = _getEl('container', mfp.wrap);
 		}
-		
+
 		mfp.contentContainer = _getEl('content');
 		if(mfp.st.preloader) {
 			mfp.preloader = _getEl('preloader', mfp.container, mfp.st.tLoading);
@@ -308,11 +309,13 @@ MagnificPopup.prototype = {
 		var bodyStyles = {};
 
 		if( mfp.fixedContentPos ) {
-			var s = mfp._getScrollbarSize();
-			if(s) {
-				bodyStyles.paddingRight = s;
-			}
-		}
+            if(mfp._hasScrollBar(windowHeight)){
+                var s = mfp._getScrollbarSize();
+                if(s) {
+                    bodyStyles.paddingRight = s;
+                }
+            }
+        }
 
 		if(mfp.fixedContentPos) {
 			if(!mfp.isIE7) {
@@ -413,11 +416,11 @@ MagnificPopup.prototype = {
 		mfp._removeClassFromMFP(classesToRemove);
 
 		if(mfp.fixedContentPos) {
-			var bodyStyles = {paddingRight: 0};
+			var bodyStyles = {paddingRight: ''};
 			if(mfp.isIE7) {
-				$('body, html').css('overflow', 'auto');
+				$('body, html').css('overflow', '');
 			} else {
-				bodyStyles.overflow = 'visible';
+				bodyStyles.overflow = '';
 			}
 			_body.css(bodyStyles);
 		}
@@ -444,6 +447,8 @@ MagnificPopup.prototype = {
 		mfp.content = null;
 		mfp.currTemplate = null;
 		mfp.prevHeight = 0;
+
+		_mfpTrigger(AFTER_CLOSE_EVENT);
 	},
 	
 	updateSize: function(winHeight) {
@@ -457,6 +462,10 @@ MagnificPopup.prototype = {
 		} else {
 			mfp.wH = winHeight || _window.height();
 		}
+		// Fixes #84: popup incorrectly positioned with position:relative on body
+		if(!mfp.fixedContentPos) {
+			mfp.wrap.css('height', mfp.wH);
+		}
 
 		_mfpTrigger('Resize');
 
@@ -705,12 +714,8 @@ MagnificPopup.prototype = {
 		mfp.wrap.removeClass(cName);
 	},
 	_hasScrollBar: function(winHeight) {
-		if(document.body.clientHeight > (winHeight || _window.height()) ) {
-            return true;    
-        }
-        return false;
+		return (  (mfp.isIE7 ? _document.height() : document.body.scrollHeight) > (winHeight || _window.height()) )
 	},
-
 	_parseMarkup: function(template, values, item) {
 		var arr;
 		if(item.data) {
@@ -908,6 +913,7 @@ for(i = 0; i < rounds; i++) {
 console.log('Test #2:', performance.now() - start);
 */
 
+
 /*>>core*/
 
 /*>>inline*/
@@ -950,7 +956,8 @@ $.magnificPopup.registerModule(INLINE_NS, {
 				if(el.length) {
 
 					// If target element has parent - we replace it with placeholder and put it back after popup is closed
-					if(el[0].parentNode !== null) {
+					var parent = el[0].parentNode;
+					if(parent && parent.tagName) {
 						if(!_inlinePlaceholder) {
 							_hiddenClass = inlineSt.hiddenClass;
 							_inlinePlaceholder = _getEl(_hiddenClass);
@@ -1019,10 +1026,14 @@ $.magnificPopup.registerModule(AJAX_NS, {
 			var opts = $.extend({
 				url: item.src,
 				success: function(data, textStatus, jqXHR) {
+					var temp = {
+						data:data,
+						xhr:jqXHR
+					};
 
-					_mfpTrigger('ParseAjax', jqXHR);
+					_mfpTrigger('ParseAjax', temp);
 
-					mfp.appendContent( $(jqXHR.responseText), AJAX_NS );
+					mfp.appendContent( $(temp.data), AJAX_NS );
 
 					item.finished = true;
 
@@ -1036,6 +1047,7 @@ $.magnificPopup.registerModule(AJAX_NS, {
 
 					mfp.updateStatus('ready');
 
+					_mfpTrigger('AjaxContentAdded');
 				},
 				error: function() {
 					_removeAjaxCursor();

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

@@ -245,7 +245,8 @@ button::-moz-focus-inner {
 
 .mfp-iframe-scaler iframe {
   position: absolute;
-  top: -3px;
+  display: block;
+  top: 0;
   left: 0;
   width: 100%;
   height: 100%;
@@ -253,7 +254,7 @@ button::-moz-focus-inner {
   background: black; }
 
 .mfp-iframe-holder .mfp-close {
-  top: -43px; }
+  top: -40px; }
 
 /* Main image in popup */
 img.mfp-img {

metadata

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