Fixed custom sort function does not work (#169)

ota-meshi · web-flow · commit 88959b586782 · 2019-08-27T09:46:40.000+09:00
* Fixed custom sort function does not work fixed #168 * Update travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: node_js
 node_js:
   - "node"
-
+addons:
+  chrome: stable
+services:
+  - xvfb
 before_install:
   - npm run echo:v
   - cp ./README.md ./packages/cheetah-grid/README.md
   - cp ./LICENSE ./packages/cheetah-grid/LICENSE
   - cp ./LICENSE ./packages/vue-cheetah-grid/LICENSE
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 
 before_script:
   - npm run lint
diff --git a/packages/cheetah-grid/package-lock.json b/packages/cheetah-grid/package-lock.json
diff --git a/packages/cheetah-grid/package.json b/packages/cheetah-grid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cheetah-grid",
-  "version": "0.13.8",
+  "version": "0.13.9",
   "description": "Cheetah Grid is a high performance grid engine that works on canvas",
   "keywords": [
     "spreadsheet",
diff --git a/packages/cheetah-grid/src/js/header/action.js b/packages/cheetah-grid/src/js/header/action.js
@@ -46,7 +46,7 @@ const action = {
 	},
 	ofCell(headerCell) {
 		if (headerCell.sort) {
-			if (headerCell.sort === 'function') {
+			if (typeof headerCell.sort === 'function') {
 				// 0.9.0 Backward compatibility
 				const sort = ({order, col, grid}) => headerCell.sort(order, col, grid);
 				return new ImmutableSortHeaderAction({sort});
diff --git a/packages/docs/api/js/advanced_header/column_sort.md b/packages/docs/api/js/advanced_header/column_sort.md
@@ -50,6 +50,7 @@ const grid = new cheetahGrid.ListGrid({
           ? (v1, v2) => v1 === v2 ? 0 : v1 > v2 ? 1 : -1
           : (v1, v2) => v1 === v2 ? 0 : v1 < v2 ? 1 : -1;
         records.sort((r1, r2) => compare(r1.no, r2.no));
+        console.log('sorted:',records)
         grid.records = records;
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cheetah-grid",`
`3`		`- "version": "0.13.8",`
	`3`	`+ "version": "0.13.9",`
`4`	`4`	`"description": "Cheetah Grid is a high performance grid engine that works on canvas",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"spreadsheet",`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ const grid = new cheetahGrid.ListGrid({`
`50`	`50`	`? (v1, v2) => v1 === v2 ? 0 : v1 > v2 ? 1 : -1`
`51`	`51`	`: (v1, v2) => v1 === v2 ? 0 : v1 < v2 ? 1 : -1;`
`52`	`52`	`records.sort((r1, r2) => compare(r1.no, r2.no));`
	`53`	`+ console.log('sorted:',records)`
`53`	`54`	`grid.records = records;`
`54`	`55`	`}`
`55`	`56`	`},`