Merge branch 'develop' into ari/fix-pro/129

Author: aristath

CHANGELOG.md

@@ -3,6 +3,7 @@
 Bugs we fixed:
 
 * Fix issue where "Perform all updates" task was incorrectly marked as completed.
+* Prevent new lines to be added when user task title is edited.
 
 
 = 1.6.2 =

assets/js/editor.js

@@ -39,7 +39,7 @@ const prplGetPageTypeSlugFromId = ( id ) => {
 
 	return progressPlannerEditor.pageTypes.find(
 		( pageTypeItem ) => parseInt( pageTypeItem.id ) === parseInt( id )
-	).slug;
+	)?.slug;
 };
 
 /**
@@ -48,6 +48,14 @@ const prplGetPageTypeSlugFromId = ( id ) => {
  * @return {Element} Element to render.
  */
 const PrplRenderPageTypeSelector = () => {
+	// Bail early if the page types are not set.
+	if (
+		! progressPlannerEditor.pageTypes ||
+		0 === progressPlannerEditor.pageTypes.length
+	) {
+		return el( 'div', {}, '' );
+	}
+
 	// Build the page types array, to be used in the dropdown.
 	const pageTypes = [];
 	progressPlannerEditor.pageTypes.forEach( ( term ) => {
@@ -187,8 +195,12 @@ const PrplLessonItemsHTML = () => {
 	}, [] );
 	const pageTodos = pageTodosMeta || '';
 
-	// Bail early if the page type is not set.
-	if ( ! pageType ) {
+	// Bail early if the page type or lessons are not set.
+	if (
+		! pageType ||
+		! progressPlannerEditor.lessons ||
+		0 === progressPlannerEditor.lessons.length
+	) {
 		return el( 'div', {}, '' );
 	}
 

assets/js/suggested-task.js

@@ -495,6 +495,19 @@ prplSuggestedTask = {
 		}, 300 );
 	},
 
+	/**
+	 * Prevent Enter key in contenteditable elements.
+	 *
+	 * @param {Event} event The keydown event.
+	 */
+	preventEnterKey: ( event ) => {
+		if ( event.key === 'Enter' ) {
+			event.preventDefault();
+			event.stopPropagation();
+			return false;
+		}
+	},
+
 	/**
 	 * Get the task element.
 	 *

assets/js/widgets/suggested-tasks-badge-scroller.js

@@ -92,12 +92,16 @@ class BadgeScroller {
 	}
 
 	addEventListeners() {
-		this.badgeButtonUp.addEventListener( 'click', () =>
-			this.handleUpClick()
-		);
-		this.badgeButtonDown.addEventListener( 'click', () =>
-			this.handleDownClick()
-		);
+		if ( this.badgeButtonUp ) {
+			this.badgeButtonUp.addEventListener( 'click', () =>
+				this.handleUpClick()
+			);
+		}
+		if ( this.badgeButtonDown ) {
+			this.badgeButtonDown.addEventListener( 'click', () =>
+				this.handleDownClick()
+			);
+		}
 	}
 
 	handleUpClick() {

views/js-templates/suggested-task.html

@@ -21,7 +21,7 @@
 		<# } #>
 
 		<h3 style="width: 100%;">
-			<span <# if ( 'user' === categorySlug ) { #>contenteditable="plaintext-only" onkeydown="prplSuggestedTask.updateTaskTitle( this );" data-post-id="{{ data.post.id }}"<# } #>><# if ( data.post.meta.prpl_url ) { #><a href="{{{ data.post.meta.prpl_url }}}" target="{{{ data.post.meta.prpl_url_target }}}">{{{ data.post.title.rendered }}}</a><# } else if ( data.post.meta.prpl_popover_id ) { #><a href="#" role="button" onclick="document.getElementById('{{{ data.post.meta.prpl_popover_id }}}')?.showPopover()">{{{ data.post.title.rendered }}}</a><# } else { #>{{{ data.post.title.rendered }}}<# } #></span>
+			<span <# if ( 'user' === categorySlug ) { #>contenteditable="plaintext-only" onkeydown="prplSuggestedTask.preventEnterKey( event ); prplSuggestedTask.updateTaskTitle( this );" data-post-id="{{ data.post.id }}"<# } #>><# if ( data.post.meta.prpl_url ) { #><a href="{{{ data.post.meta.prpl_url }}}" target="{{{ data.post.meta.prpl_url_target }}}">{{{ data.post.title.rendered }}}</a><# } else if ( data.post.meta.prpl_popover_id ) { #><a href="#" role="button" onclick="document.getElementById('{{{ data.post.meta.prpl_popover_id }}}')?.showPopover()">{{{ data.post.title.rendered }}}</a><# } else { #>{{{ data.post.title.rendered }}}<# } #></span>
 		</h3>
 
 		<div class="prpl-suggested-task-actions">