magnific-popup-rails 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfa7fcdc9593679fa1242e1159cd1db871cb8fb
-  data.tar.gz: 3ae93e0d073ba2defd4743edb016cf79f851f6ed
+  metadata.gz: 9f5c37f0a1bdc475a11a10ce7fc2a485d4fdc848
+  data.tar.gz: c7bc9ab3cbeeff9e0f788a4625081690ac1a4524
 SHA512:
-  metadata.gz: a8a8a6ad828a49fbf29edf386977421b298e9736c3499564d15cdd92ae24b5298cda17466048542d7de9ff8521e400b353d8c30fa1eb5a16eed855fba508a530
-  data.tar.gz: d174b7f1443a1d234b8ae97404f828b599e427c0513261a3b0de1c35c3f2d500ecbb08661989c4f388b7e7b0630dbea9b36ac73e83f645de5a6ca2be6f85bb3b
+  metadata.gz: c8047ae4afc82e5369ad9f868701122f7f60afa2e97a454363e7b29a1b3f09e5384472b182b3737a48acb0aa9cbb1d340e8d767afd5ae0a90fe04966580fb0c3
+  data.tar.gz: a628027ca149648562ff1fcb66cefd4d8c3b5641b1edfd88cccf4762cc9eb02e93736d931890fa6e6ae477c1e728dc5a9d34947560f1c37cc6423839cdd0f633

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

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

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

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.7 - 2013-05-19
+/*! Magnific Popup - v0.8.8 - 2013-05-24
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -165,24 +165,7 @@ MagnificPopup.prototype = {
 		if(data.isObj === false) { 
 			// convert jQuery collection to array to avoid conflicts later
 			mfp.items = data.items.toArray();
-		} else {
-			mfp.items = $.isArray(data.items) ? data.items : [data.items];
-		}
-
-		// if popup is already opened - we just update the content
-		if(mfp.isOpen) {
-			mfp.updateItemHTML();
-			return;
-		}
-
-		
-		mfp.types = []; 
-		_wrapClasses = '';
-		mfp.ev = data.mainEl || _document;
 
-		if(data.isObj) {
-			mfp.index = data.index || 0;
-		} else {
 			mfp.index = 0;
 			var items = data.items,
 				item;
@@ -196,8 +179,20 @@ MagnificPopup.prototype = {
 					break;
 				}
 			}
+		} else {
+			mfp.items = $.isArray(data.items) ? data.items : [data.items];
+			mfp.index = data.index || 0;
 		}
 
+		// if popup is already opened - we just update the content
+		if(mfp.isOpen) {
+			mfp.updateItemHTML();
+			return;
+		}
+		
+		mfp.types = []; 
+		_wrapClasses = '';
+		mfp.ev = data.mainEl || _document;
 
 		if(data.key) {
 			if(!mfp.popupsCache[data.key]) {
@@ -643,9 +638,16 @@ MagnificPopup.prototype = {
 				}
 			}
 			
-			if(e.type)
+			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();
+				}
+			}
+				
+
 			options.el = $(e.mfpEl);
 			if(options.delegate) {
 				options.items = el.find(options.delegate);

metadata

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