Merge commit '83305a9'

Conflicts: modules/carousel/jetpack-carousel.js
Automattic · Apr 7, 2014 · cbaf41f · cbaf41f
2 parents 4e98ea5 + 83305a9
commit cbaf41f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/modules/carousel/jetpack-carousel.js b/modules/carousel/jetpack-carousel.js
@@ -691,7 +691,7 @@ jQuery(document).ready(function($) {
 
 
 			// Load the images for the next and previous slides.
-			$( next ).add( previous ).each(function() {
+			$( next ).add( previous ).each( function() {
 				gallery.jp_carousel( 'loadFullImage', $( this ) );
 			});
 
@@ -948,7 +948,6 @@ jQuery(document).ready(function($) {
 			return args.orig_file;
 		},
 
-
 		originalDimensions: function() {
 			var splitted = $(this).data('orig-size').split(',');
 			return {width: parseInt(splitted[0], 10), height: parseInt(splitted[1], 10)};