Merge pull request #6131 from Automattic/fix/twitter-noscrollbar

Twitter Widget: add noscrollbar option back.

modules/widgets/twitter-timeline.php

@@ -81,7 +81,7 @@ public function widget( $args, $instance ) {
 		echo $args['before_widget'];
 
 		$title = isset( $instance['title'] ) ? $instance['title'] : '';
-		
+
 		/** This filter is documented in core/src/wp-includes/default-widgets.php */
 		$title = apply_filters( 'widget_title', $title );
 		if ( ! empty( $title ) ) {
@@ -239,7 +239,8 @@ public function update( $new_instance, $old_instance ) {
 			'noheader',
 			'nofooter',
 			'noborders',
-			'transparent'
+			'transparent',
+			'noscrollbar',
 		);
 		if ( isset( $new_instance['chrome'] ) ) {
 			foreach ( $new_instance['chrome'] as $chrome ) {
@@ -431,6 +432,16 @@ class="widefat"
 				<?php esc_html_e( 'No Borders', 'jetpack' ); ?>
 			</label>
 			<br />
+			<input
+				type="checkbox"<?php checked( in_array( 'noscrollbar', $instance['chrome'] ) ); ?>
+				id="<?php echo $this->get_field_id( 'chrome-noscrollbar' ); ?>"
+				name="<?php echo $this->get_field_name( 'chrome' ); ?>[]"
+				value="noscrollbar"
+			/>
+			<label for="<?php echo $this->get_field_id( 'chrome-noscrollbar' ); ?>">
+				<?php esc_html_e( 'No Scrollbar', 'jetpack' ); ?>
+			</label>
+			<br />
 			<input
 				type="checkbox"<?php checked( in_array( 'transparent', $instance['chrome'] ) ); ?>
 				id="<?php echo $this->get_field_id( 'chrome-transparent' ); ?>"