Merge branch 'master' into master

MMM-Todoist.js

@@ -375,6 +375,9 @@ Module.register("MMM-Todoist", {
 		case "dueDateDesc":
 			sorteditems = self.sortByDueDateDesc(items);
 			break;
+		case "dueDateDescPriority":
+			sorteditems = self.sortByDueDateDescPriority(items);
+			break;
 		default:
 			sorteditems = self.sortByTodoist(items);
 			break;
@@ -435,6 +438,16 @@ Module.register("MMM-Todoist", {
 		});
 		return itemstoSort;
 	},
+	sortByDueDateDescPriority: function (itemstoSort) {
+		itemstoSort.sort(function (a, b) {
+			if (a.date > b.date) return 1;
+			if (a.date < b.date) return -1;
+
+			if (a.priority < b.priority) return 1;
+			if (a.priority > b.priority) return -1;
+		});
+		return itemstoSort;
+    	},
 	createCell: function(className, innerHTML) {
 		var cell = document.createElement("div");
 		cell.className = "divTableCell " + className;

README.md

@@ -140,6 +140,7 @@ The following properties can be configured:
 				<code>"priority"</code> <span>- Sort based on the priority, in Descending order. (Highest priority first)</span> </br >
 				<code>"dueDateAsc"</code> <span>- Sort based on the Due Date of the Todo Ascending. (Oldest date first)</span> </br>
 				<code>"dueDateDesc"</code> <span>- Sort based on the Due Date of the Todo Descending. (Newest date first)</span></br>
+				<code>"dueDateDescPriority"</code> <span>- Sort based on the Due Date of the Todo Descending and by priority high to low.</span></br>
 				<br><b>Default value:</b> <code>"todoist"</code>
 			</td>
 		</tr>