magnific-popup-rails 0.8.5 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e36e33baa530cfa85c5791ad6c3a9d8171157df
-  data.tar.gz: 2e4b2d7fb1ad27c59cd2fa06ce9311bb56d3601b
+  metadata.gz: 8dfa7fcdc9593679fa1242e1159cd1db871cb8fb
+  data.tar.gz: 3ae93e0d073ba2defd4743edb016cf79f851f6ed
 SHA512:
-  metadata.gz: 1a7b819ce7c4821cafaa1a3e36fd3a7e8e36c2d304bee5f385f38b4e31df35be11dfb0321ee03e9fad8e476145f2de546bd877fb54c6708776be90c15efe9549
-  data.tar.gz: 281780d1b21c88b4ee949ee032163956666b7454675894f8963b3cd1ba0e00a3568b2ece032654351b325b7f0ce9327db112de7f2d69d5b99bec5247ff96d483
+  metadata.gz: a8a8a6ad828a49fbf29edf386977421b298e9736c3499564d15cdd92ae24b5298cda17466048542d7de9ff8521e400b353d8c30fa1eb5a16eed855fba508a530
+  data.tar.gz: d174b7f1443a1d234b8ae97404f828b599e427c0513261a3b0de1c35c3f2d500ecbb08661989c4f388b7e7b0630dbea9b36ac73e83f645de5a6ca2be6f85bb3b

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

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

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

@@ -1,4 +1,4 @@
-/*! Magnific Popup - v0.8.5 - 2013-05-15
+/*! Magnific Popup - v0.8.7 - 2013-05-19
 * http://dimsemenov.com/plugins/magnific-popup/
 * Copyright (c) 2013 Dmitry Semenov; */
 ;(function($) {
@@ -160,19 +160,25 @@ MagnificPopup.prototype = {
 	 */
 	open: function(data) {
 
-		mfp.items = data.items.length ? data.items : [data.items];
-		
+		var i;
+
+		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;
 		}
 
-		var i;
-
+		
 		mfp.types = []; 
 		_wrapClasses = '';
-		
-		mfp.ev = data.el || _document;
+		mfp.ev = data.mainEl || _document;
 
 		if(data.isObj) {
 			mfp.index = data.index || 0;
@@ -557,7 +563,6 @@ MagnificPopup.prototype = {
 	parseEl: function(index) {
 		var item = mfp.items[index],
 			type = item.type;
-		
 
 		if(item.tagName) {
 			item = { el: $(item) };
@@ -1353,7 +1358,9 @@ $.magnificPopup.registerModule(IFRAME_NS, {
 				//}
 			});
 
-			_mfpOn(CLOSE_EVENT + '.' + IFRAME_NS, _fixIframeBugs);
+			_mfpOn(CLOSE_EVENT + '.' + IFRAME_NS, function() {
+				_fixIframeBugs();
+			});
 		},
 
 		getIframe: function(item, template) {
@@ -1439,8 +1446,10 @@ $.magnificPopup.registerModule('gallery', {
 
 				if(gSt.navigateByImgClick) {
 					mfp.wrap.on('click'+ns, '.mfp-img', function() {
-						mfp.next();
-						return false;
+						if(mfp.items.length > 1) {
+							mfp.next();
+							return false;
+						}
 					});
 				}
 
@@ -1461,11 +1470,11 @@ $.magnificPopup.registerModule('gallery', {
 
 			_mfpOn(MARKUP_PARSE_EVENT+ns, function(e, element, values, item) {
 				var l = mfp.items.length;
-				values.counter = l ? _replaceCurrTotal(gSt.tCounter, item.index, l) : '';
+				values.counter = l > 1 ? _replaceCurrTotal(gSt.tCounter, item.index, l) : '';
 			});
 
 			_mfpOn('BuildControls' + ns, function() {
-				if(gSt.arrows && !mfp.arrowLeft) {
+				if(mfp.items.length > 1 && gSt.arrows && !mfp.arrowLeft) {
 					var markup = gSt.arrowMarkup,
 						arrowLeft = mfp.arrowLeft = $( markup.replace('%title%', gSt.tPrev).replace('%dir%', 'left') ).addClass(PREVENT_CLOSE_CLASS),			
 						arrowRight = mfp.arrowRight = $( markup.replace('%title%', gSt.tNext).replace('%dir%', 'right') ).addClass(PREVENT_CLOSE_CLASS);
@@ -1504,7 +1513,7 @@ $.magnificPopup.registerModule('gallery', {
 				_document.off(ns);
 				mfp.wrap.off('click'+ns);
 			
-				if(supportsFastClick) {
+				if(mfp.arrowLeft && supportsFastClick) {
 					mfp.arrowLeft.add(mfp.arrowRight).destroyMfpFastClick();
 				}
 				mfp.arrowRight = mfp.arrowLeft = null;

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

@@ -297,6 +297,7 @@ img.mfp-img {
   text-align: left;
   line-height: 18px;
   color: #f3f3f3;
+  word-break: break-word;
   padding-right: 36px; }
 
 .mfp-figure small {

metadata

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