Bump to v2.0.6

Author: fancyapps

CHANGELOG.md

@@ -1,6 +1,19 @@
 fancyBox - Changelog
 =========
 
+### Version 2.0.6 - April 16, 2012
+
+* Fixed #188 - keystrokes in contenteditable
+* Fixed #171 - non-images should not be preloaded
+* Fixed #158 - 'closeClick: true' breaks gallery navigation
+* New "media" helper - detects and displays various media types
+* New option "groupAttr" - name of group selector attribute, default is "data-fancybox-group"
+* New feature - selector expressions in URLs, see #170
+* Improved 'overlay' helper to use "position: fixed"
+* Improved autoSize, fixed wrong height in some cases
+* Improved centering and iframe scrolling for iOS
+* Updated markup, new element '.fancybox-skin' is now used for styling
+
 ### Version 2.0.5 - February 21, 2012
 
 * Fixed #155 - easing for prev/next animations

README.md

@@ -45,12 +45,16 @@ May also be passed an optional options object which will extend the default valu
     <script>
         $(document).ready(function() {
             $('.fancybox').fancybox({
-                padding : 5,
-                loop : false
+                padding : 0,
+                openEffect  : 'elastic'
             });
         });
     </script>
 
+Tip: Automatically group and apply fancyBox to all images:
+
+    $("a[href$='.jpg'],a[href$='.jpeg'],a[href$='.png'],a[href$='.gif']").attr('rel', 'gallery').fancybox();
+
 Script uses the `href` attribute of the matched elements to obtain the location of the content and to figure out content type you want to display.
 You can specify type directly by adding classname (fancybox.image, fancybox.iframe, etc) or `data-fancybox-group` attribute:
 
@@ -198,7 +202,7 @@ and move them outside of area (use this snippet after including fancybox.css):
 In that case, you might want to increase space around box:
 
     $(".fancybox").fancybox({
-        margin : [20, 60, 20, 60],
+        margin : [20, 60, 20, 60]
     });
 
 

demo/iframe.html

@@ -9,8 +9,12 @@ <h1>fancyBox - iframe demo</h1>
 
 	<p>
 		<a href="javascript:parent.jQuery.fancybox.close();">Close iframe parent</a>
+
+		|
+
+		<a href="javascript:parent.jQuery.fancybox.open({href : '1_b.jpg', title : 'My title'});">Change content</a>
 	</p>
-	
+
 	<p>
 		Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam scelerisque justo ac eros consectetur bibendum. In hac habitasse platea dictumst. Nulla aliquam turpis et tellus elementum luctus. Duis sit amet rhoncus velit. Duis nisl ligula, mattis interdum blandit laoreet, mattis id ante. Cras pulvinar lacus vitae nisi egestas non euismod neque bibendum. Vestibulum faucibus libero id ante molestie ultricies. Vestibulum quis nibh felis. Vestibulum libero nisl, vehicula vel ullamcorper sit amet, tristique sit amet augue. Etiam urna neque, porttitor sed sodales lacinia, posuere a nisl. Vestibulum blandit neque in sapien volutpat ac condimentum sapien auctor. Ut imperdiet venenatis ultricies. Phasellus accumsan, sem eu placerat commodo, felis purus commodo ipsum, sit amet vulputate orci est viverra est.
 	</p>

demo/index.html

@@ -5,14 +5,14 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
 	<!-- Add jQuery library -->
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+	<script type="text/javascript" src="../lib/jquery-1.7.2.min.js"></script>
 
 	<!-- Add mousewheel plugin (this is optional) -->
 	<script type="text/javascript" src="../lib/jquery.mousewheel-3.0.6.pack.js"></script>
 
 	<!-- Add fancyBox main JS and CSS files -->
-	<script type="text/javascript" src="../source/jquery.fancybox.js"></script>
-	<link rel="stylesheet" type="text/css" href="../source/jquery.fancybox.css" media="screen" />
+	<script type="text/javascript" src="../source/jquery.fancybox.js?v=2.0.6"></script>
+	<link rel="stylesheet" type="text/css" href="../source/jquery.fancybox.css?v=2.0.6" media="screen" />
 
 	<!-- Add Button helper (this is optional) -->
 	<link rel="stylesheet" type="text/css" href="../source/helpers/jquery.fancybox-buttons.css?v=1.0.2" />
@@ -201,7 +201,7 @@
 		});
 	</script>
 	<style type="text/css">
-		.fancybox-custom .fancybox-outer {
+		.fancybox-custom .fancybox-skin {
 			box-shadow: 0 0 50px #222;
 		}
 	</style>

source/helpers/jquery.fancybox-buttons.css

@@ -2,7 +2,7 @@
 	position: fixed;
 	left: 0;
 	width: 100%;
-	z-index: 1005;
+	z-index: 8050;
 }
 
 #fancybox-buttons.top {

source/helpers/jquery.fancybox-media.js

@@ -43,7 +43,7 @@
 				rez;
 
 			if ((rez = href.match(/(youtube\.com|youtu\.be)\/(v\/|u\/|embed\/|watch\?v=)?([^#\&\?]*).*/i))) {
-				href = '//www.youtube.com/embed/' + rez[3] + '?autoplay=1&fs=1&rel=0&modestbranding=1&enablejsapi=1';
+				href = '//www.youtube.com/embed/' + rez[3] + '?autoplay=1&autohide=1&fs=1&rel=0&enablejsapi=1';
 				type = 'iframe';
 
 			} else if ((rez = href.match(/vimeo.com\/(\d+)\/?(.*)/))) {
@@ -78,7 +78,6 @@
 			if (type) {
 				obj.href = href;
 				obj.type = type;
-				obj.autoSize = false;
 			}
 		}
 	}

source/helpers/jquery.fancybox-thumbs.css

@@ -1,9 +1,9 @@
 #fancybox-thumbs {
 	position: fixed;
-	left: 0px;
+	left: 0;
 	width: 100%;
 	overflow: hidden;
-	z-index: 1005;
+	z-index: 8050;
 }
 
 #fancybox-thumbs.bottom {

source/jquery.fancybox.css

@@ -1,4 +1,4 @@
-/*! fancyBox v2.0.5 fancyapps.com | fancyapps.com/fancybox/#license */
+/*! fancyBox v2.0.6 fancyapps.com | fancyapps.com/fancybox/#license */
 .fancybox-tmp iframe, .fancybox-tmp object {
 	vertical-align: top;
 	padding: 0;

source/jquery.fancybox.js

@@ -1,6 +1,6 @@
 /*!
  * fancyBox - jQuery Plugin
- * version: 2.0.5 (14/04/2012)
+ * version: 2.0.6 (16/04/2012)
  * @requires jQuery v1.6 or later
  *
  * Examples at http://fancyapps.com/fancybox/
@@ -18,10 +18,10 @@
 		F = $.fancybox = function () {
 			F.open.apply( this, arguments );
 		},
-		didResize = false,
-		resizeTimer = null,
-		isTouch = document.createTouch !== undefined,
-		isString = function(str) {
+		didResize	= false,
+		resizeTimer	= null,
+		isTouch		= document.createTouch !== undefined,
+		isString	= function(str) {
 			return $.type(str) === "string";
 		},
 		isPercentage = function(str) {
@@ -59,7 +59,7 @@
 
 			fixed: false,
 			scrolling: 'auto', // 'auto', 'yes' or 'no'
-			wrapCSS: 'fancybox-default',
+			wrapCSS: '',
 
 			arrows: true,
 			closeBtn: true,
@@ -486,8 +486,8 @@
 			}
 		},
 
-		trigger: function (event, obj) {
-			var ret, obj = obj || F[ $.inArray(event, ['onCancel', 'beforeLoad', 'afterLoad']) > -1 ? 'coming' : 'current' ];
+		trigger: function (event, o) {
+			var ret, obj = o || F[ $.inArray(event, ['onCancel', 'beforeLoad', 'afterLoad']) > -1 ? 'coming' : 'current' ];
 
 			if (!obj) {
 				return;
@@ -675,7 +675,9 @@
 			$.extend(F.coming, {
 				type      : 'html',
 				autoSize  : true,
+				minWidth  : 0,
 				minHeight : 0,
+				padding   : 15,
 				hasError  : type,
 				content   : F.coming.tpl.error
 			});
@@ -930,17 +932,17 @@
 		},
 
 		_setDimension: function () {
-			var wrap = F.wrap,
-				inner = F.inner,
-				current = F.current,
-				viewport = F.getViewport(),
-				margin = current.margin,
-				padding2 = current.padding * 2,
-				width = current.width,
-				height = current.height,
-				maxWidth = current.maxWidth + padding2,
+			var wrap      = F.wrap,
+				inner     = F.inner,
+				current   = F.current,
+				viewport  = F.getViewport(),
+				margin    = current.margin,
+				padding2  = current.padding * 2,
+				width     = current.width,
+				height    = current.height,
+				maxWidth  = current.maxWidth + padding2,
 				maxHeight = current.maxHeight + padding2,
-				minWidth = current.minWidth + padding2,
+				minWidth  = current.minWidth + padding2,
 				minHeight = current.minHeight + padding2,
 				ratio,
 				height_;
@@ -961,7 +963,7 @@
 			height += padding2;
 
 			if (current.fitToView) {
-				maxWidth = Math.min(viewport.w, maxWidth);
+				maxWidth  = Math.min(viewport.w, maxWidth);
 				maxHeight = Math.min(viewport.h, maxHeight);
 			}
 
@@ -1239,9 +1241,9 @@
 				.show()
 				.animate(endPos, {
 					duration : effect === 'none' ? 0 : current.openSpeed,
-					easing : current.openEasing,
-					step: elastic ? this.step : null,
-					complete: F._afterZoomIn
+					easing   : current.openEasing,
+					step     : elastic ? this.step : null,
+					complete : F._afterZoomIn
 				});
 		},
 
@@ -1265,10 +1267,10 @@
 			}
 
 			wrap.animate(endPos, {
-				duration: effect === 'none' ? 0 : current.closeSpeed,
-				easing: current.closeEasing,
-				step: elastic ? this.step : null,
-				complete: F._afterZoomOut
+				duration : effect === 'none' ? 0 : current.closeSpeed,
+				easing   : current.closeEasing,
+				step     : elastic ? this.step : null,
+				complete : F._afterZoomOut
 			});
 		},
 
@@ -1291,11 +1293,8 @@
 				.show()
 				.animate(endPos, {
 					duration : effect === 'none' ? 0 : current.nextSpeed,
-					easing : current.nextEasing,
-					complete: function() {
-						//Somehow this helps to restore overflow
-						setTimeout( F._afterZoomIn, 1);
-					}
+					easing   : current.nextEasing,
+					complete : F._afterZoomIn
 				});
 		},
 
@@ -1315,9 +1314,9 @@
 			}
 
 			wrap.animate(endPos, {
-				duration: effect === 'none' ? 0 : current.prevSpeed,
-				easing: current.prevEasing,
-				complete: cleanUp
+				duration : effect === 'none' ? 0 : current.prevSpeed,
+				easing   : current.prevEasing,
+				complete : cleanUp
 			});
 		}
 	};