Improved contacts sorting internal logic

Author: vasil-sokolov

js/Settings.js

@@ -80,8 +80,12 @@ module.exports = {
 		return {
 			Allow: config.Allow ? true : false,
 			DisplayOptions: config.DisplayOptions || [],
-			DefaultSortBy: config.DefaultSortBy && config.Allow ? config.DefaultSortBy : 'Name',
-			DefaultSortOrder: config.DefaultSortOrder && config.Allow ? config.DefaultSortOrder : 'Desc'
+			DefaultSortBy: config.Allow ?
+				Types.pEnum(Enums.ContactSortField[config.DefaultSortBy], Enums.ContactSortField, Enums.ContactSortField.Name) :
+				Enums.ContactSortField.Filename,
+			DefaultSortOrder: config.Allow ?
+				Types.pEnum(Enums.SortOrder[config.DefaultSortOrder], Enums.SortOrder, Enums.SortOrder.Desc) :
+				Enums.SortOrder.Desc
 		};
 	}
 };

js/views/CContactsView.js

@@ -215,10 +215,6 @@ function CContactsView()
 
 	this.bSortEnabled = Settings.ContactsSortBy && Settings.ContactsSortBy.Allow 
 		&& Settings.ContactsSortBy.DisplayOptions && Settings.ContactsSortBy.DisplayOptions.length > 0;
-	
-	// Had to set it here because in Setting.init not all Enums are defined
-	Settings.ContactsSortBy.DefaultSortBy = Enums.ContactSortField[Settings.ContactsSortBy.DefaultSortBy];
-	Settings.ContactsSortBy.DefaultSortOrder = Enums.SortOrder[Settings.ContactsSortBy.DefaultSortOrder];
 
 	this.sortBy = ko.observable(Settings.ContactsSortBy.DefaultSortBy);
 	this.sortOrder = ko.observable(Settings.ContactsSortBy.DefaultSortOrder);