fixed string sorter bug, exposed sorters, exposed canvas offset in cell

TonyGermaneri · May 18, 2017 · 08e1df2 · 08e1df2
1 parent e1e4d5d
commit 08e1df2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "canvas-datagrid",
   "main": "lib/main.js",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "ignore": [
     "**/.*",
     "node_modules",

diff --git a/lib/main.js b/lib/main.js
@@ -1418,8 +1418,8 @@
                             nodeType: 'canvas-datagrid-cell',
                             x: cx,
                             y: cy,
-                            offsetTop: cy,
-                            offsetLeft: cx,
+                            offsetTop: canvasOffsetTop,
+                            offsetLeft: canvasOffsetLeft,
                             scrollTop: scrollBox.scrollTop,
                             scrollLeft: scrollBox.scrollLeft,
                             active: active === true,
@@ -2185,15 +2185,17 @@
         sorters.string = function (columnName, direction) {
             var asc = direction === 'asc';
             return function (a, b) {
-                if (a[columnName] === undefined || a[columnName] === null
-                        || b[columnName] === undefined || b[columnName] === null) {
-                    return false;
+                if (a[columnName] === undefined || a[columnName] === null) {
+                    return 1;
+                }
+                if (b[columnName] === undefined || b[columnName] === null) {
+                    return 0;
                 }
                 if (asc) {
-                    if (!a[columnName].localeCompare) { return false; }
+                    if (!a[columnName].localeCompare) { return 1; }
                     return a[columnName].localeCompare(b[columnName]);
                 }
-                if (!b[columnName].localeCompare) { return false; }
+                if (!b[columnName].localeCompare) { return 1; }
                 return b[columnName].localeCompare(a[columnName]);
             };
         };
@@ -3844,6 +3846,7 @@
             intf.dispose = dispose;
             intf.appendTo = appendTo;
             intf.filters = filters;
+            intf.sorters = sorters;
             intf.autosize = autosize;
             intf.beginEditAt = beginEditAt;
             intf.endEdit = endEdit;
@@ -4024,7 +4027,6 @@
             intf.attributes = {};
             intf.style = {};
             intf.formatters = formatters;
-            intf.filters = filters;
             Object.keys(style).forEach(function (key) {
                 Object.defineProperty(intf.style, key, {
                     get: function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvas-datagrid",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "Canvas based data grid",
   "main": "./lib/main.js",
   "repository": {