ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-24 11:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[table] #707 Fixed sorting on insert for numbers

Browse Source 
Added metadata to event generator
This commit is contained in:
Henry 2016-03-10 13:31:40 -08:00
parent 7da1a218ba
commit a56edb9ff4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/eventGenerator/bundle.js
View File

@ -66,6 +66,8 @@ define([
], ],
"ranges": [ "ranges": [
{ {
"key": "message",
"name": "Message",
"format": "string" "format": "string"
} }
] ]

10
platform/features/table/src/controllers/MCTTableController.js
View File

@ -262,13 +262,17 @@ define(
sortKey = this.$scope.sortColumn; sortKey = this.$scope.sortColumn;
function binarySearch(searchArray, searchElement, min, max){ function binarySearch(searchArray, searchElement, min, max){
var sampleAt = Math.floor((max - min) / 2) + min; var sampleAt = Math.floor((max - min) / 2) + min,
valA,
valB;
if (max < min) { if (max < min) {
return min; // Element is not in array, min gives direction return min; // Element is not in array, min gives direction
} }
switch(self.sortComparator(searchElement[sortKey].text, searchArray[sampleAt][sortKey].text)) { valA = isNaN(searchElement[sortKey].text) ? searchElement[sortKey].text : parseFloat(searchElement[sortKey].text);
valB = isNaN(searchArray[sampleAt][sortKey].text) ? searchArray[sampleAt][sortKey].text : searchArray[sampleAt][sortKey].text;
switch(self.sortComparator(valA, valB)) {
case -1: case -1:
return binarySearch(searchArray, searchElement, min, sampleAt - 1); return binarySearch(searchArray, searchElement, min, sampleAt - 1);
case 0 : case 0 :