Skip to content

Commit ae00a9f

Browse files
authored
Merge pull request #4 from beekeeper-studio/build-6.2.0
Build 6.2.0 to master
2 parents fee2513 + 3365233 commit ae00a9f

4 files changed

Lines changed: 35 additions & 2 deletions

File tree

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
This branch contains version 6.2.0 including these fixes:
2+
- make autoFocus optional for SelectRange https://github.com/olifolkerd/tabulator/pull/4452
3+
- Break expanded range after pressing arrow keys https://github.com/olifolkerd/tabulator/pull/4478
4+
- fix autoscroll on long columns https://github.com/olifolkerd/tabulator/pull/4479
5+
- fix navigation conflict with SelectRange and Edit https://github.com/olifolkerd/tabulator/pull/4516
6+
- blur editor after pressing next/prev https://github.com/olifolkerd/tabulator/pull/4517
7+
- 13f9a9b9 fix errors when handling BigInt
8+
19
<p align="center">
210
<img height="200" src="http://tabulator.info/images/logos/t_hollow.png">
311
</p>

src/js/core/ColumnManager.js

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

247247
default:
248-
if(!isNaN(value) && value !== ""){
248+
if(!isNaN(Number(value)) && value !== ""){
249249
sorter = "number";
250250
}else{
251251
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
@@ -178,6 +178,10 @@ export default class Edit extends Module{
178178

179179
if(cell){
180180

181+
if(cell.column.modules.edit.navigationBlocked){
182+
return false;
183+
}
184+
181185
if(e){
182186
e.preventDefault();
183187
}
@@ -208,6 +212,10 @@ export default class Edit extends Module{
208212

209213
if(cell){
210214

215+
if(cell.column.modules.edit.navigationBlocked){
216+
return false;
217+
}
218+
211219
if(e){
212220
e.preventDefault();
213221
}
@@ -238,6 +246,10 @@ export default class Edit extends Module{
238246

239247
if(cell){
240248

249+
if(cell.column.modules.edit.navigationBlocked){
250+
return false;
251+
}
252+
241253
if(e){
242254
e.preventDefault();
243255
}
@@ -259,6 +271,10 @@ export default class Edit extends Module{
259271

260272
if(cell){
261273

274+
if(cell.column.modules.edit.navigationBlocked){
275+
return false;
276+
}
277+
262278
if(e){
263279
e.preventDefault();
264280
}
@@ -280,6 +296,10 @@ export default class Edit extends Module{
280296

281297
if(cell){
282298

299+
if(cell.column.modules.edit.navigationBlocked){
300+
return false;
301+
}
302+
283303
if(e){
284304
e.preventDefault();
285305
}
@@ -301,6 +321,10 @@ export default class Edit extends Module{
301321

302322
if(cell){
303323

324+
if(cell.column.modules.edit.navigationBlocked){
325+
return false;
326+
}
327+
304328
if(e){
305329
e.preventDefault();
306330
}
@@ -401,6 +425,7 @@ export default class Edit extends Module{
401425
convertEmptyValues:convertEmpty,
402426
editorEmptyValue:column.definition.editorEmptyValue,
403427
editorEmptyValueFunc:column.definition.editorEmptyValueFunc,
428+
navigationBlocked: false,
404429
};
405430

406431
//set column editor

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)