magnific-popup-rails 0.0.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e64d58ff6bce2c5317de41ef5e14c3cb5a33f557
-  data.tar.gz: 85d79b8f06f0713a56aed9b2c753b886edcc4b47
+  metadata.gz: dbbad4e8f9e51d536d3821cafcf978ebf3417a60
+  data.tar.gz: 54c4d1b21b1f17c0a27cd2aa9ecd6f786412fbda
 SHA512:
-  metadata.gz: ab7a50d73b6b335f86b0d1b5c0c03d68d367e890c0baf85277338185a9b46dc168e416450576f7ae6219feb15a7a89d529a940bf46551ffc0b8bdfa632474622
-  data.tar.gz: 58115a89f63d6d4fe0e8512c48d50e889d94bcfbd7ebbce6b4a57d065302fdd8cd765eea8a54b32679e6d053a5a4ca3f861f4123cc9fd9052e537fdf57ef2ca3
+  metadata.gz: 25b37b9f77023e714ee9b34ead27421c46bd9dae26014138014c71a52ecacc75342598bbcf115d210109905b26872c25f9a4eed8b73a154be8940c33ef2cb277
+  data.tar.gz: 4a76ac27f904c0bcd08b59e0834dda8cff80ff35568fe38071d986038ffa0d8af34e13bf56d1a22bed5448151489ea5f64175f9467c94f00e3154ec3676e2b65

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

@@ -1,5 +1,5 @@
 module MagnificPopup
   module Rails
-    VERSION = "0.0.1"
+    VERSION = "0.8.1"
   end
 end

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

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.1 - 2013-05-02
+/*! Magnific Popup - v0.8.2 - 2013-05-05
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -193,11 +193,11 @@ 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);
 		}
-		mfp.contentContainer = _getEl('content', mfp.container);
-
 
 
 		// Initializing modules
@@ -273,7 +273,7 @@ MagnificPopup.prototype = {
 		
 		var bodyStyles = {};
 
-		if( mfp.fixedContentPos ) {
+		if( mfp.fixedContentPos && mfp.st.overflowY !== 'scroll' ) {
 			var s = mfp._getScrollbarSize();
 			if(s) {
 				bodyStyles.paddingRight = s;
@@ -433,6 +433,9 @@ MagnificPopup.prototype = {
 	updateItemHTML: function() {
 		var item = mfp.items[mfp.index];
 
+		// Detach and perform modifications
+		mfp.contentContainer.detach();
+
 		if(!item.parsed) {
 			item = mfp.parseEl( mfp.index );
 		}
@@ -454,7 +457,7 @@ MagnificPopup.prototype = {
 		if(_prevContentType && _prevContentType !== item.type) {
 			mfp.container.removeClass('mfp-'+_prevContentType+'-holder');
 		}
-
+		
 		var newContent = mfp['get' + type.charAt(0).toUpperCase() + type.slice(1)](item, mfp.currTemplate[type]);
 		mfp.appendContent(newContent, type);
 
@@ -462,6 +465,9 @@ MagnificPopup.prototype = {
 
 		_mfpTrigger(CHANGE_EVENT, item);
 		_prevContentType = item.type;
+		
+		// Append container back after its content changed
+		mfp.container.prepend(mfp.contentContainer);
 	},
 
 
@@ -556,9 +562,12 @@ MagnificPopup.prototype = {
 						}
 					}
 				}
-
+					
 				e.preventDefault();
 				options.el = $(this);
+				if(options.delegate) {
+					options.items = el.find(options.delegate);
+				}
 				mfp.open(options);
 			}
 			
@@ -575,7 +584,6 @@ MagnificPopup.prototype = {
 		} else {
 			options.isObj = false;
 			if(options.delegate) {
-				options.items = el.find(options.delegate);
 				el.off(eName).on(eName, options.delegate , eHandler);
 			} else {
 				options.items = el;

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

@@ -48,7 +48,8 @@
   display: inline-block;
   vertical-align: middle;
   margin: 0 auto;
-  text-align: left; }
+  text-align: left;
+  z-index: 505; }
 
 .mfp-inline-holder .mfp-content,
 .mfp-ajax-holder .mfp-content {
@@ -85,7 +86,7 @@
   display: none; }
 
 .mfp-hide {
-  display: none; }
+  display: none !important; }
 
 .mfp-preloader {
   color: #cccccc;
@@ -95,7 +96,8 @@
   text-align: center;
   margin-top: -0.8em;
   left: 8px;
-  right: 8px; }
+  right: 8px;
+  z-index: 504; }
 
 .mfp-preloader a {
   color: #cccccc; }
@@ -117,7 +119,8 @@ button.mfp-arrow {
   border: 0;
   -webkit-appearance: none;
   display: block;
-  padding: 0; }
+  padding: 0;
+  z-index: 506; }
 
 button::-moz-focus-inner {
   padding: 0;
@@ -386,4 +389,4 @@ img.mfp-img {
 .mfp-ie7 .mfp-close {
   top: 0;
   right: 0;
-  padding-top: 0; }
+  padding-top: 0; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magnific-popup-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Joshua Jansen