Merge pull request #1046 from Automattic/slideshow-one-image

Slideshow one image
Automattic · Aug 27, 2014 · 867d2d7 · 867d2d7
2 parents 6437bb0 + 5ddc397
commit 867d2d7
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 33 deletions.
diff --git a/modules/shortcodes/js/slideshow-shortcode.js b/modules/shortcodes/js/slideshow-shortcode.js
@@ -94,40 +94,44 @@ JetpackSlideshow.prototype.finishInit_ = function() {
 	this.renderControls_();
 
 	var self = this;
-	// Initialize Cycle instance.
-	this.element.cycle( {
-		fx: this.transition,
-		prev: this.controls.prev,
-		next: this.controls.next,
-		slideExpr: '.slideshow-slide',
-		onPrevNextEvent: function() {
-			return self.onCyclePrevNextClick_.apply( self, arguments );
-		}
-	} );
-
-	var slideshow = this.element;
-	jQuery( this.controls.stop ).click( function() {
-		var button = jQuery(this);
-		if ( ! button.hasClass( 'paused' ) ) {
-			slideshow.cycle( 'pause' );
-			button.removeClass( 'running' );
-			button.addClass( 'paused' );
-		} else {
-			button.addClass( 'running' );
-			button.removeClass( 'paused' );
-			slideshow.cycle( 'resume', true );
-		}
-		return false;
-	} );
+	if ( this.images.length > 1 ) {
+		// Initialize Cycle instance.
+		this.element.cycle( {
+			fx: this.transition,
+			prev: this.controls.prev,
+			next: this.controls.next,
+			slideExpr: '.slideshow-slide',
+			onPrevNextEvent: function() {
+				return self.onCyclePrevNextClick_.apply( self, arguments );
+			}
+		} );
 
-	var controls = jQuery( this.controlsDiv_ );
-	slideshow.mouseenter( function() {
-		controls.fadeIn();
-	} );
-	slideshow.mouseleave( function() {
-		controls.fadeOut();
-	} );
+		var slideshow = this.element;
+		jQuery( this.controls.stop ).click( function() {
+			var button = jQuery(this);
+			if ( ! button.hasClass( 'paused' ) ) {
+				slideshow.cycle( 'pause' );
+				button.removeClass( 'running' );
+				button.addClass( 'paused' );
+			} else {
+				button.addClass( 'running' );
+				button.removeClass( 'paused' );
+				slideshow.cycle( 'resume', true );
+			}
+			return false;
+		} );
 
+		var controls = jQuery( this.controlsDiv_ );
+		slideshow.mouseenter( function() {
+			controls.fadeIn();
+		} );
+		slideshow.mouseleave( function() {
+			controls.fadeOut();
+		} );
+	} else {
+		this.element.children( ':first' ).show();
+		this.element.css( 'position', 'relative' );
+	}
 	this.initialized_ = true;
 };
 

diff --git a/modules/shortcodes/slideshow.php b/modules/shortcodes/slideshow.php
@@ -141,7 +141,7 @@ function shortcode_callback( $attr, $content = null ) {
 			'exclude'        => $attr['exclude'],
 		) );
 
-		if ( count( $attachments ) < 2 )
+		if ( count( $attachments ) < 1 )
 			return;
 
 		$gallery_instance = sprintf( "gallery-%d-%d", $attr['id'], ++$this->instance_count );

diff --git a/modules/widgets/gallery.php b/modules/widgets/gallery.php
@@ -215,6 +215,9 @@ public function slideshow_widget( $args, $instance ) {
 		if ( ! class_exists( 'Jetpack_Slideshow_Shortcode' ) )
 			return;
 
+		if ( count( $instance['attachments'] ) < 1 )
+			return;
+
 		$slideshow = new Jetpack_Slideshow_Shortcode();
 
 		$slideshow->enqueue_scripts();