Skip to content

Commit 2d4e904

Browse files
committed
Merge branch 'master' into oli-master
# Conflicts: # dist/js/tabulator.js # dist/js/tabulator.js.map # dist/js/tabulator.min.js # dist/js/tabulator.min.js.map # dist/js/tabulator_esm.js # dist/js/tabulator_esm.js.map # dist/js/tabulator_esm.min.js # dist/js/tabulator_esm.min.js.map # dist/js/tabulator_esm.min.mjs # dist/js/tabulator_esm.min.mjs.map # dist/js/tabulator_esm.mjs # dist/js/tabulator_esm.mjs.map # package-lock.json # package.json
2 parents fe38eb7 + a604593 commit 2d4e904

7 files changed

Lines changed: 39 additions & 8 deletions

File tree

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
This fork is based on version 6.3.1 with addition to these changes:
2+
- fix navigation conflict with SelectRange and Edit https://github.com/olifolkerd/tabulator/pull/4516
3+
- blur editor after pressing next/prev https://github.com/olifolkerd/tabulator/pull/4517
4+
- fix errors when handling BigInt https://github.com/beekeeper-studio/tabulator/commit/13f9a9b99a7fb7bb8359a6f991afbd874835e2fd
5+
- use Number.isNaN as it's more robust https://github.com/beekeeper-studio/tabulator/pull/3
6+
17
<p align="center">
28
<img height="200" src="http://tabulator.info/images/logos/t_hollow.png">
39
</p>

src/js/core/ColumnManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export default class ColumnManager extends CoreFeature {
244244
break;
245245

246246
default:
247-
if(!isNaN(value) && value !== ""){
247+
if(!isNaN(Number(value)) && value !== ""){
248248
sorter = "number";
249249
}else{
250250
if(value.match(/((^[0-9]+[a-z]+)|(^[a-z]+[0-9]+))+$/i)){

src/js/modules/Edit/Edit.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ export default class Edit extends Module{
184184

185185
if(cell){
186186

187+
if(cell.column.modules.edit.navigationBlocked){
188+
return false;
189+
}
190+
187191
if(e){
188192
e.preventDefault();
189193
}
@@ -214,6 +218,10 @@ export default class Edit extends Module{
214218

215219
if(cell){
216220

221+
if(cell.column.modules.edit.navigationBlocked){
222+
return false;
223+
}
224+
217225
if(e){
218226
e.preventDefault();
219227
}
@@ -244,6 +252,10 @@ export default class Edit extends Module{
244252

245253
if(cell){
246254

255+
if(cell.column.modules.edit.navigationBlocked){
256+
return false;
257+
}
258+
247259
if(e){
248260
e.preventDefault();
249261
}
@@ -265,6 +277,10 @@ export default class Edit extends Module{
265277

266278
if(cell){
267279

280+
if(cell.column.modules.edit.navigationBlocked){
281+
return false;
282+
}
283+
268284
if(e){
269285
e.preventDefault();
270286
}
@@ -286,6 +302,10 @@ export default class Edit extends Module{
286302

287303
if(cell){
288304

305+
if(cell.column.modules.edit.navigationBlocked){
306+
return false;
307+
}
308+
289309
if(e){
290310
e.preventDefault();
291311
}
@@ -307,6 +327,10 @@ export default class Edit extends Module{
307327

308328
if(cell){
309329

330+
if(cell.column.modules.edit.navigationBlocked){
331+
return false;
332+
}
333+
310334
if(e){
311335
e.preventDefault();
312336
}
@@ -407,6 +431,7 @@ export default class Edit extends Module{
407431
convertEmptyValues:convertEmpty,
408432
editorEmptyValue:column.definition.editorEmptyValue,
409433
editorEmptyValueFunc:column.definition.editorEmptyValueFunc,
434+
navigationBlocked: false,
410435
};
411436

412437
//set column editor

src/js/modules/Format/defaults/formatters/money.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default function(cell, formatterParams, onRendered){
1010
var after = !!formatterParams.symbolAfter;
1111
var precision = typeof formatterParams.precision !== "undefined" ? formatterParams.precision : 2;
1212

13-
if(isNaN(floatVal)){
13+
if(Number.isNaN(floatVal)){
1414
return this.emptyToSpace(this.sanitizeHTML(cell.getValue()));
1515
}
1616

@@ -41,4 +41,4 @@ export default function(cell, formatterParams, onRendered){
4141
}else{
4242
return after ? sign + value + symbol : sign + symbol + value;
4343
}
44-
}
44+
}

src/js/modules/Format/defaults/formatters/star.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function(cell, formatterParams, onRendered){
1717
star.setAttribute("xml:space", "preserve");
1818
star.style.padding = "0 1px";
1919

20-
value = value && !isNaN(value) ? parseInt(value) : 0;
20+
value = value && !Number.isNaN(value) ? parseInt(value) : 0;
2121

2222
value = Math.max(0, Math.min(value, maxStars));
2323

@@ -35,4 +35,4 @@ export default function(cell, formatterParams, onRendered){
3535
element.setAttribute("aria-label", value);
3636

3737
return stars;
38-
}
38+
}

src/js/modules/Format/defaults/formatters/traffic.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function(cell, formatterParams, onRendered){
77
color = "#666666",
88
percent, percentValue;
99

10-
if(isNaN(value) || typeof cell.getValue() === "undefined"){
10+
if(Number.isNaN(value) || typeof cell.getValue() === "undefined"){
1111
return;
1212
}
1313

@@ -44,4 +44,4 @@ export default function(cell, formatterParams, onRendered){
4444
el.style.backgroundColor = color;
4545

4646
return el;
47-
}
47+
}

src/js/modules/Sort/Sort.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ export default class Sort extends Module{
322322
break;
323323

324324
default:
325-
if(!isNaN(value) && value !== ""){
325+
if(!isNaN(Number(value)) && value !== ""){
326326
sorter = "number";
327327
}else{
328328
if(value.match(/((^[0-9]+[a-z]+)|(^[a-z]+[0-9]+))+$/i)){

0 commit comments

Comments
 (0)