Merge pull request #14 from jamiefaye/dev

Dev
jamiefaye · Jul 6, 2018 · 8246eaa · 8246eaa
2 parents 85cdc43 + 9d54b76
commit 8246eaa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/DR/FTF/List.js b/DR/FTF/List.js
diff --git a/FTF/src/FileBrowser.js b/FTF/src/FileBrowser.js
@@ -60,8 +60,12 @@ export default class FileBrowser {
 		this.polling_active = false;
 		this.wlansd;
 		this.sortOrder = 1;
-		this.fieldNum = -1;
-
+		this.fieldNum = 0;
+		let that = this;
+		this.sortFunction = function(a, b) {
+			if (!a["fname"]) return 0;
+			return a["fname"].localeCompare(b["fname"]) * that.sortOrder;
+		};
 }
 
   toggleChecks (e) {

diff --git a/waverly/src/FileWidget.js b/waverly/src/FileWidget.js
@@ -63,7 +63,12 @@ class FileWidget {
 		this.polling_active = false;
 		this.filelist;
 		this.sortOrder = 1;
-		this.fieldNum = -1;
+		this.fieldNum = 0;
+		let that = this;
+		this.sortFunction = function(a, b) {
+			if (!a["fname"]) return 0;
+			return a["fname"].localeCompare(b["fname"]) * that.sortOrder;
+		};
 		if (params) {
 			this.params = params;
 		} else {

diff --git a/xmlView/src/FileWidget.js b/xmlView/src/FileWidget.js
@@ -63,7 +63,12 @@ class FileWidget {
 		this.polling_active = false;
 		this.filelist;
 		this.sortOrder = 1;
-		this.fieldNum = -1;
+		this.fieldNum = 0;
+		let that = this;
+		this.sortFunction = function(a, b) {
+			if (!a["fname"]) return 0;
+			return a["fname"].localeCompare(b["fname"]) * that.sortOrder;
+		};
 		if (params) {
 			this.params = params;
 		} else {