diff --git a/dist/extension/js/foreground.js b/dist/extension/js/foreground.js index 459e8e96fa..9040aaa847 100644 --- a/dist/extension/js/foreground.js +++ b/dist/extension/js/foreground.js @@ -43,7 +43,7 @@ return true; }); - window.addEventListener('message', (e) => { + window.addEventListener('message', e => { if (e.origin != `chrome-extension://${extensionId}`) { return; }; diff --git a/dist/workers/graph.js b/dist/workers/graph.js index 1a6365cba1..9ec8b319f0 100644 --- a/dist/workers/graph.js +++ b/dist/workers/graph.js @@ -141,7 +141,7 @@ initFonts = () => { const fontFace = new FontFace(name, `url("../font/inter/regular.woff2") format("woff2")`); self.fonts.add(fontFace); - fontFace.load().then(() => { fontFamily = name; }); + fontFace.load().then(() => fontFamily = name); }; image = ({ src, bitmap }) => { diff --git a/electron.js b/electron.js index 84ec5b8463..22ea2ad56e 100644 --- a/electron.js +++ b/electron.js @@ -103,7 +103,7 @@ nativeTheme.on('updated', () => { function createWindow () { mainWindow = WindowManager.createMain({ route: Util.getRouteFromUrl(deeplinkingUrl), isChild: false }); - mainWindow.on('close', (e) => { + mainWindow.on('close', e => { Util.log('info', 'closeMain: ' + app.isQuiting); if (app.isQuiting) { @@ -114,7 +114,7 @@ function createWindow () { if (mainWindow.isFullScreen()) { mainWindow.setFullScreen(false); - mainWindow.once('leave-full-screen', () => { mainWindow.hide(); }); + mainWindow.once('leave-full-screen', () => mainWindow.hide()); } else { mainWindow.hide(); }; @@ -182,7 +182,7 @@ app.on('second-instance', (event, argv) => { mainWindow.focus(); }); -app.on('before-quit', (e) => { +app.on('before-quit', e => { Util.log('info', 'before-quit'); if (app.isQuiting) { diff --git a/electron/about/about.js b/electron/about/about.js index 0a1eb6d2b9..f416a9c576 100644 --- a/electron/about/about.js +++ b/electron/about/about.js @@ -16,7 +16,7 @@ $(() => { versionButton.on('click', e => { e.preventDefault(); - var handler = (e) => { + var handler = e => { e.preventDefault(); e.clipboardData.setData('text/plain', versionText); @@ -29,7 +29,7 @@ $(() => { copyIcon.addClass('active'); clearTimeout(timeout); - setTimeout(() => { copyIcon.removeClass('active'); }, 2000); + setTimeout(() => copyIcon.removeClass('active'), 2000); }); $.ajax({ diff --git a/electron/js/api.js b/electron/js/api.js index 8b62af46fc..1dfb2a2243 100644 --- a/electron/js/api.js +++ b/electron/js/api.js @@ -182,7 +182,7 @@ class Api { Util.log('info', '[Api].exit, relaunch: ' + relaunch); Util.send(win, 'shutdownStart'); - Server.stop(signal).then(() => { this.shutdown(win, relaunch); }); + Server.stop(signal).then(() => this.shutdown(win, relaunch)); }; setInterfaceLang (win, lang) { diff --git a/electron/js/menu.js b/electron/js/menu.js index d8caab9195..68cf60f2bc 100644 --- a/electron/js/menu.js +++ b/electron/js/menu.js @@ -230,7 +230,7 @@ class MenuManager { { label: 'Export templates', click: () => Util.send(this.win, 'commandGlobal', 'exportTemplates') }, { label: 'Export objects', click: () => Util.send(this.win, 'commandGlobal', 'exportObjects') }, - { label: 'Export localstore', click: () => { Util.send(this.win, 'commandGlobal', 'exportLocalstore'); } }, + { label: 'Export localstore', click: () => Util.send(this.win, 'commandGlobal', 'exportLocalstore') }, Separator, diff --git a/electron/js/window.js b/electron/js/window.js index 4d45270b0a..7062bd3380 100644 --- a/electron/js/window.js +++ b/electron/js/window.js @@ -53,7 +53,7 @@ class WindowManager { win = null; }); - win.once('ready-to-show', () => { win.show(); }); + win.once('ready-to-show', () => win.show()); win.on('focus', () => { UpdateManager.setWindow(win); MenuManager.setWindow(win); diff --git a/extension/popup/create.tsx b/extension/popup/create.tsx index 0335db37b7..bb1b2ea875 100644 --- a/extension/popup/create.tsx +++ b/extension/popup/create.tsx @@ -334,9 +334,9 @@ const Create = observer(class Create extends React.Component { - window.setTimeout(() => { $(element).addClass('isFocused'); }); + window.setTimeout(() => $(element).addClass('isFocused')); }, - onClose: () => { $(element).removeClass('isFocused'); }, + onClose: () => $(element).removeClass('isFocused'), data: { canAdd: true, filter: '', diff --git a/src/ts/app.tsx b/src/ts/app.tsx index 243e8f5cb5..54846eaaa6 100644 --- a/src/ts/app.tsx +++ b/src/ts/app.tsx @@ -424,7 +424,7 @@ class App extends React.Component { popupStore.closeAll(); }; - window.setTimeout(() => { popupStore.open(id, param); }, Constant.delay.popup); + window.setTimeout(() => popupStore.open(id, param), Constant.delay.popup); }; onUpdateCheck (e: any, auto: boolean) { diff --git a/src/ts/component/block/cover.tsx b/src/ts/component/block/cover.tsx index e5c75703c1..3c4ba2d961 100644 --- a/src/ts/component/block/cover.tsx +++ b/src/ts/component/block/cover.tsx @@ -411,8 +411,8 @@ const BlockCover = observer(class BlockCover extends React.Component { this.onDragMove(e); }); - win.on('mouseup.cover', (e: any) => { this.onDragEnd(e); }); + win.on('mousemove.cover', e => this.onDragMove(e)); + win.on('mouseup.cover', e => this.onDragEnd(e)); }; onDragMove (e: any) { diff --git a/src/ts/component/block/dataview.tsx b/src/ts/component/block/dataview.tsx index a8d8bfef94..52827b6047 100644 --- a/src/ts/component/block/dataview.tsx +++ b/src/ts/component/block/dataview.tsx @@ -961,7 +961,7 @@ const BlockDataview = observer(class BlockDataview extends React.Component { this.loadData(message.views[0].id, 0, true); }, 50); + window.setTimeout(() => this.loadData(message.views[0].id, 0, true), 50); }; if (isNew) { @@ -1201,7 +1201,7 @@ const BlockDataview = observer(class BlockDataview extends React.Component { this.applyObjectOrder(it.groupId, records); }, 30); + window.setTimeout(() => this.applyObjectOrder(it.groupId, records), 30); }); if (callBack) { diff --git a/src/ts/component/block/dataview/cell/file.tsx b/src/ts/component/block/dataview/cell/file.tsx index 4dd1454327..f76a154bdd 100644 --- a/src/ts/component/block/dataview/cell/file.tsx +++ b/src/ts/component/block/dataview/cell/file.tsx @@ -48,7 +48,7 @@ const CellFile = observer(class CellFile extends React.Component }; const Item = (item: any) => ( -
{ this.onClick(e, item); }}> +
this.onClick(e, item)}>
{UtilFile.name(item)}
diff --git a/src/ts/component/block/dataview/cell/index.tsx b/src/ts/component/block/dataview/cell/index.tsx index 1ce75fbbb3..77245ddf67 100644 --- a/src/ts/component/block/dataview/cell/index.tsx +++ b/src/ts/component/block/dataview/cell/index.tsx @@ -427,7 +427,7 @@ const Cell = observer(class Cell extends React.Component { }); if (!config.debug.ui) { - win.off('blur.cell').on('blur.cell', () => { menuStore.closeAll(Constant.menuIds.cell); }); + win.off('blur.cell').on('blur.cell', () => menuStore.closeAll(Constant.menuIds.cell)); }; } else if (closeIfOpen) { diff --git a/src/ts/component/block/dataview/cell/object.tsx b/src/ts/component/block/dataview/cell/object.tsx index 4db6d3698b..3477b6e862 100644 --- a/src/ts/component/block/dataview/cell/object.tsx +++ b/src/ts/component/block/dataview/cell/object.tsx @@ -171,7 +171,7 @@ const CellObject = observer(class CellObject extends React.Component { this.focus(); }, 15); + window.setTimeout(() => this.focus(), 15); }; }; }; diff --git a/src/ts/component/block/dataview/cell/select.tsx b/src/ts/component/block/dataview/cell/select.tsx index 28796bb140..428e5c82f8 100644 --- a/src/ts/component/block/dataview/cell/select.tsx +++ b/src/ts/component/block/dataview/cell/select.tsx @@ -91,7 +91,7 @@ const CellSelect = observer(class CellSelect extends React.Component { this.onValueRemove(item.id); }} + onRemove={() => this.onValueRemove(item.id)} /> ))} diff --git a/src/ts/component/block/dataview/view/board.tsx b/src/ts/component/block/dataview/view/board.tsx index ef0b41feb5..e676f09449 100644 --- a/src/ts/component/block/dataview/view/board.tsx +++ b/src/ts/component/block/dataview/view/board.tsx @@ -108,7 +108,7 @@ const ViewBoard = observer(class ViewBoard extends React.Component { this.onScrollView(); }); + node.find('#scroll').on('scroll', e => this.onScrollView()); }; unbind () { @@ -267,7 +267,7 @@ const ViewBoard = observer(class ViewBoard extends React.Component { e.preventDefault(); }); + $(document).off('dragover').on('dragover', e => e.preventDefault()); $(window).off('dragend.board drag.board'); $('body').addClass('grab'); @@ -310,8 +310,8 @@ const ViewBoard = observer(class ViewBoard extends React.Component { this.onDragMoveColumn(e, groupId); }); - win.on('dragend.board', (e: any) => { this.onDragEndColumn(e, groupId); }); + win.on('drag.board', e => this.onDragMoveColumn(e, groupId)); + win.on('dragend.board', e => this.onDragEndColumn(e, groupId)); }; onDragMoveColumn (e: any, groupId: any) { diff --git a/src/ts/component/block/dataview/view/board/card.tsx b/src/ts/component/block/dataview/view/board/card.tsx index 73b8b6ae92..5b04cfc497 100644 --- a/src/ts/component/block/dataview/view/board/card.tsx +++ b/src/ts/component/block/dataview/view/board/card.tsx @@ -105,7 +105,7 @@ const Card = observer(class Card extends React.Component { 0: () => { keyboard.withCommand(e) ? UtilObject.openWindow(record) : UtilObject.openPopup(record); }, - 2: () => { onContext(e, record.id); } + 2: () => onContext(e, record.id) }; const ids = selection ? selection.get(I.SelectType.Record) : []; diff --git a/src/ts/component/block/dataview/view/board/column.tsx b/src/ts/component/block/dataview/view/board/column.tsx index 29bc73d8a9..7928fa12bd 100644 --- a/src/ts/component/block/dataview/view/board/column.tsx +++ b/src/ts/component/block/dataview/view/board/column.tsx @@ -247,7 +247,7 @@ const Column = observer(class Column extends React.Component { menuStore.open('dataviewGroupEdit', { element: `#column-${id}-head`, horizontal: I.MenuDirection.Center, - onClose: () => { node.removeClass('active'); }, + onClose: () => node.removeClass('active'), data: { rootId, blockId: block.id, diff --git a/src/ts/component/block/dataview/view/gallery/card.tsx b/src/ts/component/block/dataview/view/gallery/card.tsx index 6c0b69c3f0..895785be5a 100644 --- a/src/ts/component/block/dataview/view/gallery/card.tsx +++ b/src/ts/component/block/dataview/view/gallery/card.tsx @@ -154,7 +154,7 @@ const Card = observer(class Card extends React.Component { 0: () => { keyboard.withCommand(e) ? UtilObject.openWindow(record) : UtilObject.openPopup(record); }, - 2: () => { onContext(e, record.id); } + 2: () => onContext(e, record.id) }; const ids = selection ? selection.get(I.SelectType.Record) : []; diff --git a/src/ts/component/block/dataview/view/grid.tsx b/src/ts/component/block/dataview/view/grid.tsx index f09b7ff351..77b9c86df5 100644 --- a/src/ts/component/block/dataview/view/grid.tsx +++ b/src/ts/component/block/dataview/view/grid.tsx @@ -168,7 +168,7 @@ const ViewGrid = observer(class ViewGrid extends React.Component { this.onScroll(); }); + node.find('#scroll').on('scroll', () => this.onScroll()); }; unbind () { @@ -258,8 +258,8 @@ const ViewGrid = observer(class ViewGrid extends React.Component { this.onResizeMove(e, relationKey); }); - win.on('mouseup.cell', (e: any) => { this.onResizeEnd(e, relationKey); }); + win.on('mousemove.cell', e => this.onResizeMove(e, relationKey)); + win.on('mouseup.cell', e => this.onResizeEnd(e, relationKey)); el.addClass('isResizing'); keyboard.setResize(true); @@ -296,7 +296,7 @@ const ViewGrid = observer(class ViewGrid extends React.Component { keyboard.setResize(false); }, 50); + window.setTimeout(() => keyboard.setResize(false), 50); }; checkWidth (width: number): number { @@ -319,7 +319,7 @@ const ViewGrid = observer(class ViewGrid extends React.Component { menuStore.closeAll(Constant.menuIds.cellAdd); } + onAdd: () => menuStore.closeAll(Constant.menuIds.cellAdd) } }); }; diff --git a/src/ts/component/block/dataview/view/grid/body/cell.tsx b/src/ts/component/block/dataview/view/grid/body/cell.tsx index 0d55a2907e..4ca14080a3 100644 --- a/src/ts/component/block/dataview/view/grid/body/cell.tsx +++ b/src/ts/component/block/dataview/view/grid/body/cell.tsx @@ -63,7 +63,7 @@ const BodyCell = observer(class BodyCell extends React.Component { key={id} id={id} className={cn.join(' ')} - onClick={(e: any) => { onCellClick(e, relation.relationKey, recordId); }} + onClick={e => onCellClick(e, relation.relationKey, recordId)} > { diff --git a/src/ts/component/block/dataview/view/grid/head/cell.tsx b/src/ts/component/block/dataview/view/grid/head/cell.tsx index e27fe9e860..4ef4f0c7f7 100644 --- a/src/ts/component/block/dataview/view/grid/head/cell.tsx +++ b/src/ts/component/block/dataview/view/grid/head/cell.tsx @@ -48,7 +48,7 @@ const HeadCell = observer(class HeadCell extends React.Component { >
-
{ onResizeStart(e, relationKey); }} /> +
onResizeStart(e, relationKey)} />
); @@ -88,8 +88,8 @@ const HeadCell = observer(class HeadCell extends React.Component { element, horizontal: I.MenuDirection.Center, noFlipY: true, - onOpen: () => { obj.addClass('active'); }, - onClose: () => { obj.removeClass('active'); }, + onOpen: () => obj.addClass('active'), + onClose: () => obj.removeClass('active'), data: { loadData, getView, diff --git a/src/ts/component/block/dataview/view/list/row.tsx b/src/ts/component/block/dataview/view/list/row.tsx index 915298e799..7a05d29c4a 100644 --- a/src/ts/component/block/dataview/view/list/row.tsx +++ b/src/ts/component/block/dataview/view/list/row.tsx @@ -125,7 +125,7 @@ const Row = observer(class Row extends React.Component { 0: () => { keyboard.withCommand(e) ? UtilObject.openWindow(record) : UtilObject.openPopup(record); }, - 2: () => { onContext(e, record.id); } + 2: () => onContext(e, record.id) }; const ids = selection ? selection.get(I.SelectType.Record) : []; diff --git a/src/ts/component/block/featured.tsx b/src/ts/component/block/featured.tsx index bec5ce9b0f..b2c79ea47a 100644 --- a/src/ts/component/block/featured.tsx +++ b/src/ts/component/block/featured.tsx @@ -77,7 +77,7 @@ const BlockFeatured = observer(class BlockFeatured extends React.Component { this.onMouseEnter(e, 'type'); }} + onMouseEnter={e => this.onMouseEnter(e, 'type')} onMouseLeave={this.onMouseLeave} > {typeName} @@ -127,7 +127,7 @@ const BlockFeatured = observer(class BlockFeatured extends React.Component { this.onMouseEnter(e, 'setOf', 'Query'); }} + onMouseEnter={e => this.onMouseEnter(e, 'setOf', 'Query')} onMouseLeave={this.onMouseLeave} > {setOfString.length ? ( @@ -657,7 +657,7 @@ const BlockFeatured = observer(class BlockFeatured extends React.Component { menuStore.open('blockRelationView', param); }); + menuStore.closeAll(null, () => menuStore.open('blockRelationView', param)); break; }; }; diff --git a/src/ts/component/block/index.tsx b/src/ts/component/block/index.tsx index 6d22512a33..9550c22e4d 100644 --- a/src/ts/component/block/index.tsx +++ b/src/ts/component/block/index.tsx @@ -568,8 +568,8 @@ const Block = observer(class Block extends React.Component { node.find('.colResize.active').removeClass('active'); node.find('.colResize.c' + index).addClass('active'); - win.on('mousemove.block', (e: any) => { this.onResize(e, index, offset); }); - win.on('mouseup.block', (e: any) => { this.onResizeEnd(e, index, offset); }); + win.on('mousemove.block', e => this.onResize(e, index, offset)); + win.on('mouseup.block', e => this.onResizeEnd(e, index, offset)); node.find('.resizable').trigger('resizeStart', [ e ]); }; diff --git a/src/ts/component/block/media/image.tsx b/src/ts/component/block/media/image.tsx index 2a26a93649..b2f7b0aa5d 100644 --- a/src/ts/component/block/media/image.tsx +++ b/src/ts/component/block/media/image.tsx @@ -69,13 +69,13 @@ const BlockImage = observer(class BlockImage extends React.Component { e.preventDefault(); }} + onDragStart={e => e.preventDefault()} onClick={this.onClick} onLoad={this.onLoad} onError={this.onError} /> - { this.onResizeStart(e, false); }} /> + this.onResizeStart(e, false)} />
); break; @@ -159,8 +159,8 @@ const BlockImage = observer(class BlockImage extends React.Component { this.onResize(e, checkMax); }); - win.on('mouseup.media', (e: any) => { this.onResizeEnd(e, checkMax); }); + win.on('mousemove.media', e => this.onResize(e, checkMax)); + win.on('mouseup.media', e => this.onResizeEnd(e, checkMax)); }; onResize (e: any, checkMax: boolean) { diff --git a/src/ts/component/block/table.tsx b/src/ts/component/block/table.tsx index 9c5919555a..182ce57886 100644 --- a/src/ts/component/block/table.tsx +++ b/src/ts/component/block/table.tsx @@ -264,7 +264,7 @@ const BlockTable = observer(class BlockTable extends React.Component { menuContext = context; - raf(() => { this.onOptionsOpen(type, rowId, columnId, cellId); }); + raf(() => this.onOptionsOpen(type, rowId, columnId, cellId)); }, onClose: () => { menuStore.closeAll(Constant.menuIds.table); @@ -362,7 +362,7 @@ const BlockTable = observer(class BlockTable extends React.Component { menuSubContext = context; }, + onOpen: context => menuSubContext = context, data: { rootId, rebind: menuContext.ref.rebind, @@ -432,7 +432,7 @@ const BlockTable = observer(class BlockTable extends React.Component { - fill(() => { C.BlockListSetAlign(rootId, blockIds, el.id); }); + fill(() => C.BlockListSetAlign(rootId, blockIds, el.id)); menuContext.close(); } }); @@ -446,7 +446,7 @@ const BlockTable = observer(class BlockTable extends React.Component { - fill(() => { C.BlockListSetVerticalAlign(rootId, blockIds, el.id); }); + fill(() => C.BlockListSetVerticalAlign(rootId, blockIds, el.id)); menuContext.close(); } }); @@ -457,7 +457,7 @@ const BlockTable = observer(class BlockTable extends React.Component { - fill(() => { C.BlockTextListSetColor(rootId, blockIds, id); }); + fill(() => C.BlockTextListSetColor(rootId, blockIds, id)); menuContext.close(); } }); @@ -468,7 +468,7 @@ const BlockTable = observer(class BlockTable extends React.Component { - fill(() => { C.BlockListSetBackgroundColor(rootId, blockIds, id); }); + fill(() => C.BlockListSetBackgroundColor(rootId, blockIds, id)); menuContext.close(); } }); @@ -839,8 +839,8 @@ const BlockTable = observer(class BlockTable extends React.Component { this.onResizeMove(e, id); }, 40)); - win.on('mouseup.table', (e: any) => { this.onResizeEnd(e, id); }); + win.on('mousemove.table', throttle(e => this.onResizeMove(e, id), 40)); + win.on('mouseup.table', e => this.onResizeEnd(e, id)); keyboard.setResize(true); }; @@ -921,11 +921,11 @@ const BlockTable = observer(class BlockTable extends React.Component { e.preventDefault(); }); + $(document).off('dragover').on('dragover', e => e.preventDefault()); e.dataTransfer.setDragImage(table.get(0), table.outerWidth(), 0); - win.on('drag.tableColumn', throttle((e: any) => { this.onDragMoveColumn(e, id); }, 40)); - win.on('dragend.tableColumn', (e: any) => { this.onDragEndColumn(e, id); }); + win.on('drag.tableColumn', throttle(e => this.onDragMoveColumn(e, id), 40)); + win.on('dragend.tableColumn', e => this.onDragEndColumn(e, id)); this.initCache(I.BlockType.TableColumn); this.setEditing(''); @@ -1013,11 +1013,11 @@ const BlockTable = observer(class BlockTable extends React.Component { e.preventDefault(); }); + $(document).off('dragover').on('dragover', e => e.preventDefault()); e.dataTransfer.setDragImage(layer.get(0), 0, table.outerHeight()); - win.on('drag.tableRow', throttle((e: any) => { this.onDragMoveRow(e, id); }, 40)); - win.on('dragend.tableRow', (e: any) => { this.onDragEndRow(e, id); }); + win.on('drag.tableRow', throttle(e => this.onDragMoveRow(e, id), 40)); + win.on('dragend.tableRow', e => this.onDragEndRow(e, id)); this.initCache(I.BlockType.TableRow); this.setEditing(''); diff --git a/src/ts/component/block/table/cell.tsx b/src/ts/component/block/table/cell.tsx index b8aa47ffb1..c9f9332ce1 100644 --- a/src/ts/component/block/table/cell.tsx +++ b/src/ts/component/block/table/cell.tsx @@ -49,8 +49,8 @@ const BlockTableCell = observer(class BlockTableCell extends React.Component { onDragStartColumn(e, column.id); }; - onClick = (e: any) => { onHandleColumn(e, item.type, row.id, column.id, cellId); }; + onDragStart = e => onDragStartColumn(e, column.id); + onClick = e => onHandleColumn(e, item.type, row.id, column.id, cellId); break; case I.BlockType.TableRow: @@ -58,9 +58,9 @@ const BlockTableCell = observer(class BlockTableCell extends React.Component { onDragStartRow(e, row.id); }; + onDragStart = e => onDragStartRow(e, row.id); }; - onClick = (e: any) => { onHandleRow(e, item.type, row.id, column.id, cellId); }; + onClick = e => onHandleRow(e, item.type, row.id, column.id, cellId); break; }; @@ -72,8 +72,8 @@ const BlockTableCell = observer(class BlockTableCell extends React.Component { onEnterHandle(e, item.type, row.id, column.id); }} - onMouseLeave={(e: any) => { onLeaveHandle(e); }} + onMouseEnter={e => onEnterHandle(e, item.type, row.id, column.id)} + onMouseLeave={e => onLeaveHandle(e)} onClick={onClick} onDragStart={onDragStart} onContextMenu={onClick} @@ -144,24 +144,24 @@ const BlockTableCell = observer(class BlockTableCell extends React.Component { onCellKeyUp(e, row.id, column.id, cellId, text, marks, range, props); }} - onUpdate={() => { onCellUpdate(cellId); }} - onFocus={(e: any) => { onCellFocus(e, row.id, column.id, cellId); }} - onBlur={(e: any) => { onCellBlur(e, row.id, column.id, cellId); }} + onUpdate={() => onCellUpdate(cellId)} + onFocus={e => onCellFocus(e, row.id, column.id, cellId)} + onBlur={e => onCellBlur(e, row.id, column.id, cellId)} getWrapperWidth={() => Constant.size.editor} /> ) : ( )} - {!readonly ?
{ onResizeStart(e, column.id); }} /> : ''} - { onOptions(e, I.BlockType.Text, row.id, column.id, cellId); }} /> + {!readonly ?
onResizeStart(e, column.id)} /> : ''} + onOptions(e, I.BlockType.Text, row.id, column.id, cellId)} />
); }; onMouseDown (e: any) { keyboard.disableSelection(true); - $(window).off('mousedown.table-cell').on('mousedown.table-cell', (e: any) => { keyboard.disableSelection(false); }); + $(window).off('mousedown.table-cell').on('mousedown.table-cell', e => keyboard.disableSelection(false)); }; }); diff --git a/src/ts/component/block/tableOfContents.tsx b/src/ts/component/block/tableOfContents.tsx index bda1542cdc..e19ba3a101 100644 --- a/src/ts/component/block/tableOfContents.tsx +++ b/src/ts/component/block/tableOfContents.tsx @@ -24,7 +24,7 @@ const BlockTableOfContents = observer(class BlockTableOfContents extends React.C return (
{ this.onClick(e, item.id); }} + onClick={e => this.onClick(e, item.id)} style={{ paddingLeft: item.depth * 24 }} > {item.text} diff --git a/src/ts/component/block/text.tsx b/src/ts/component/block/text.tsx index 20fb51fce3..b61c81ddf2 100644 --- a/src/ts/component/block/text.tsx +++ b/src/ts/component/block/text.tsx @@ -203,7 +203,7 @@ const BlockText = observer(class BlockText extends React.Component { onMouseDown={this.onMouseDown} onMouseUp={this.onMouseUp} onInput={this.onInput} - onDragStart={(e: any) => { e.preventDefault(); }} + onDragStart={e => e.preventDefault()} />
); @@ -1429,7 +1429,7 @@ const BlockText = observer(class BlockText extends React.Component { onMouseUp () { window.clearTimeout(this.timeoutClick); - this.timeoutClick = window.setTimeout(() => { this.clicks = 0; }, 300); + this.timeoutClick = window.setTimeout(() => this.clicks = 0, 300); }; onSelectIcon (icon: string) { diff --git a/src/ts/component/block/type.tsx b/src/ts/component/block/type.tsx index bd36599792..e727162450 100644 --- a/src/ts/component/block/type.tsx +++ b/src/ts/component/block/type.tsx @@ -32,8 +32,8 @@ const BlockType = observer(class BlockType extends React.Component { this.onClick(e, item); }} - onMouseEnter={(e: any) => { this.onOver(e, item); }} + onClick={e => this.onClick(e, item)} + onMouseEnter={e => this.onOver(e, item)} onMouseLeave={this.onOut} > {item.icon ? : ''} @@ -186,7 +186,7 @@ const BlockType = observer(class BlockType extends React.Component { obj.addClass('active'); }, + onOpen: () => obj.addClass('active'), onClose: () => { obj.removeClass('active'); focus.apply(); diff --git a/src/ts/component/drag/box.tsx b/src/ts/component/drag/box.tsx index da63215480..39db81ef44 100644 --- a/src/ts/component/drag/box.tsx +++ b/src/ts/component/drag/box.tsx @@ -102,8 +102,8 @@ class DragBox extends React.Component { element.addClass('isDragging'); win.off('mousemove.dragbox mouseup.dragbox'); - win.on('mousemove.dragbox', (e: any) => { this.onDragMove(e); }); - win.on('mouseup.dragbox', (e: any) => { this.onDragEnd(e); }); + win.on('mousemove.dragbox', e => this.onDragMove(e)); + win.on('mouseup.dragbox', e => this.onDragEnd(e)); }; onDragMove (e: any) { diff --git a/src/ts/component/drag/provider.tsx b/src/ts/component/drag/provider.tsx index fe30d84e27..cd58c315dc 100644 --- a/src/ts/component/drag/provider.tsx +++ b/src/ts/component/drag/provider.tsx @@ -235,8 +235,8 @@ const DragProvider = observer(class DragProvider extends React.Component keyboard.disableSelection(true); Preview.hideAll(); - win.on('drag.drag', (e: any) => { this.onDrag(e); }); - win.on('dragend.drag', (e: any) => { this.onDragEnd(e); }); + win.on('drag.drag', e => this.onDrag(e)); + win.on('dragend.drag', e => this.onDragEnd(e)); container.off('scroll.drag').on('scroll.drag', throttle(() => this.onScroll(), 20)); sidebar.off('scroll.drag').on('scroll.drag', throttle(() => this.onScroll(), 20)); diff --git a/src/ts/component/editor/page.tsx b/src/ts/component/editor/page.tsx index 5b2ede235e..8fb5000d17 100644 --- a/src/ts/component/editor/page.tsx +++ b/src/ts/component/editor/page.tsx @@ -628,7 +628,7 @@ const EditorPage = observer(class EditorPage extends React.Component { focus.clear(true); }); + Action.duplicate(rootId, rootId, ids[ids.length - 1], ids, I.BlockPosition.Bottom, () => focus.clear(true)); }); for (const item of styleParam) { @@ -1329,7 +1329,7 @@ const EditorPage = observer(class EditorPage extends React.Component { - window.setTimeout(() => { this.focus(block.id, range.from, range.to, false); }, 50); + window.setTimeout(() => this.focus(block.id, range.from, range.to, false), 50); if (next && next.isTextToggle()) { blockStore.toggle(rootId, next.id, true); @@ -1880,7 +1880,7 @@ const EditorPage = observer(class EditorPage extends React.Component { if (param.type == I.BlockType.Text) { - window.setTimeout(() => { this.focus(message.blockId, 0, 0, false); }, 15); + window.setTimeout(() => this.focus(message.blockId, 0, 0, false), 15); }; if (callBack) { diff --git a/src/ts/component/form/inputWithFile.tsx b/src/ts/component/form/inputWithFile.tsx index 6afd2917cc..4847767736 100644 --- a/src/ts/component/form/inputWithFile.tsx +++ b/src/ts/component/form/inputWithFile.tsx @@ -80,7 +80,7 @@ class InputWithFile extends React.Component { if (isIcon) { cn.push('isIcon'); - onClick = (e: MouseEvent) => { this.onClickFile(e); }; + onClick = e => this.onClickFile(e); }; if (focused) { diff --git a/src/ts/component/header/index.tsx b/src/ts/component/header/index.tsx index ca1f338069..3dfe759f93 100644 --- a/src/ts/component/header/index.tsx +++ b/src/ts/component/header/index.tsx @@ -116,7 +116,7 @@ class Header extends React.Component { menuParam.classNameWrap = 'fixed fromHeader'; }; - menuStore.closeAllForced(null, () => { menuStore.open(id, menuParam); }); + menuStore.closeAllForced(null, () => menuStore.open(id, menuParam)); }; getContainer () { diff --git a/src/ts/component/header/main/object.tsx b/src/ts/component/header/main/object.tsx index cb2ee28875..8b5c71b13d 100644 --- a/src/ts/component/header/main/object.tsx +++ b/src/ts/component/header/main/object.tsx @@ -116,7 +116,7 @@ const HeaderMainObject = observer(class HeaderMainObject extends React.Component const object = detailStore.get(rootId, rootId, []); keyboard.disableClose(true); - popupStore.closeAll(null, () => { UtilObject.openRoute(object); }); + popupStore.closeAll(null, () => UtilObject.openRoute(object)); }; onMore () { diff --git a/src/ts/component/list/object.tsx b/src/ts/component/list/object.tsx index 63fb07174d..d9fde29351 100644 --- a/src/ts/component/list/object.tsx +++ b/src/ts/component/list/object.tsx @@ -50,7 +50,7 @@ const ListObject = observer(class ListObject extends React.Component { offset={offset} limit={LIMIT} total={total} - onChange={(page: number) => { this.getData(page); }} + onChange={page => this.getData(page)} /> ); }; diff --git a/src/ts/component/list/objectManager.tsx b/src/ts/component/list/objectManager.tsx index a063763bf3..3985a86d7a 100644 --- a/src/ts/component/list/objectManager.tsx +++ b/src/ts/component/list/objectManager.tsx @@ -112,7 +112,7 @@ const ListObjectManager = observer(class ListObjectManager extends React.Compone this.refCheckbox.set(item.id, ref)} value={this.selected.includes(item.id)} - onChange={(e) => this.onClick(e, item)} + onChange={e => this.onClick(e, item)} />
UtilObject.openPopup(item)}> diff --git a/src/ts/component/menu/block/action.tsx b/src/ts/component/menu/block/action.tsx index 405a5aba4d..76f2b5022e 100644 --- a/src/ts/component/menu/block/action.tsx +++ b/src/ts/component/menu/block/action.tsx @@ -61,8 +61,8 @@ class MenuBlockAction extends React.Component { { this.onMouseEnter(e, action); }} - onClick={(e: any) => { this.onClick(e, action); }} + onMouseEnter={e => this.onMouseEnter(e, action)} + onClick={e => this.onClick(e, action)} /> ); })} @@ -99,7 +99,7 @@ class MenuBlockAction extends React.Component { this._isMounted = true; this.rebind(); - menu.off('mouseleave').on('mouseleave', () => { menuStore.clearTimeout(); }); + menu.off('mouseleave').on('mouseleave', () => menuStore.clearTimeout()); }; componentDidUpdate () { @@ -513,7 +513,7 @@ class MenuBlockAction extends React.Component { { operator: I.FilterOperator.And, relationKey: 'layout', condition: I.FilterCondition.In, value: UtilObject.getPageLayouts() }, ], canAdd: true, - onSelect: () => { close(); } + onSelect: () => close() }); break; }; diff --git a/src/ts/component/menu/block/add.tsx b/src/ts/component/menu/block/add.tsx index 9636084e73..a219f6dc88 100644 --- a/src/ts/component/menu/block/add.tsx +++ b/src/ts/component/menu/block/add.tsx @@ -50,8 +50,8 @@ const MenuBlockAdd = observer(class MenuBlockAdd extends React.Component
{ this.onClick(e, item); }} - onMouseEnter={(e: any) => { this.onMouseEnter(e, item); }} + onClick={e => this.onClick(e, item)} + onMouseEnter={e => this.onMouseEnter(e, item)} style={param.style} > @@ -136,8 +136,8 @@ const MenuBlockAdd = observer(class MenuBlockAdd extends React.Component {...item} className={cn.join(' ')} withDescription={item.isBlock} - onMouseEnter={(e: any) => { this.onMouseEnter(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} + onMouseEnter={e => this.onMouseEnter(e, item)} + onClick={e => this.onClick(e, item)} style={param.style} /> ); @@ -207,7 +207,7 @@ const MenuBlockAdd = observer(class MenuBlockAdd extends React.Component keyMapper: i => (items[i] || {}).id, }); - $(`#${getId()}`).off('mouseleave').on('mouseleave', () => { window.clearTimeout(this.timeout); }); + $(`#${getId()}`).off('mouseleave').on('mouseleave', () => window.clearTimeout(this.timeout)); }; componentDidUpdate () { @@ -257,7 +257,7 @@ const MenuBlockAdd = observer(class MenuBlockAdd extends React.Component rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/align.tsx b/src/ts/component/menu/block/align.tsx index db76f529f2..d3405b875c 100644 --- a/src/ts/component/menu/block/align.tsx +++ b/src/ts/component/menu/block/align.tsx @@ -41,7 +41,7 @@ class MenuBlockHAlign extends React.Component { rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/background.tsx b/src/ts/component/menu/block/background.tsx index b8ffc99649..9eb2154582 100644 --- a/src/ts/component/menu/block/background.tsx +++ b/src/ts/component/menu/block/background.tsx @@ -32,8 +32,8 @@ class MenuBlockBackground extends React.Component { icon="color" inner={inner} checkbox={action.value == value} - onClick={(e: any) => { this.onClick(e, action); }} - onMouseEnter={(e: any) => { this.onOver(e, action); }} + onClick={e => this.onClick(e, action)} + onMouseEnter={e => this.onOver(e, action)} /> ); })} @@ -47,7 +47,7 @@ class MenuBlockBackground extends React.Component { rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/color.tsx b/src/ts/component/menu/block/color.tsx index 1064f775dd..569f1379fa 100644 --- a/src/ts/component/menu/block/color.tsx +++ b/src/ts/component/menu/block/color.tsx @@ -32,8 +32,8 @@ class MenuBlockColor extends React.Component { icon="color" inner={inner} checkbox={action.value == value} - onClick={(e: any) => { this.onClick(e, action); }} - onMouseEnter={(e: any) => { this.onOver(e, action); }} + onClick={e => this.onClick(e, action)} + onMouseEnter={e => this.onOver(e, action)} /> ); })} @@ -47,7 +47,7 @@ class MenuBlockColor extends React.Component { rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/context.tsx b/src/ts/component/menu/block/context.tsx index 99c958091c..26cd990442 100644 --- a/src/ts/component/menu/block/context.tsx +++ b/src/ts/component/menu/block/context.tsx @@ -60,7 +60,7 @@ const MenuBlockContext = observer(class MenuBlockContext extends React.Component
{canTurn ? (
- { this.onMark(e, 'style'); }} /> + this.onMark(e, 'style')} />
) : ''} @@ -91,7 +91,7 @@ const MenuBlockContext = observer(class MenuBlockContext extends React.Component tooltip={action.name} tooltipCaption={action.caption} tooltipY={I.MenuDirection.Top} - onMouseDown={(e: any) => { this.onMark(e, action.type); }} + onMouseDown={e => this.onMark(e, action.type)} /> ); })} @@ -106,7 +106,7 @@ const MenuBlockContext = observer(class MenuBlockContext extends React.Component tooltip={translate('commonColor')} tooltipCaption={`${cmd} + Shift + C`} tooltipY={I.MenuDirection.Top} - onMouseDown={(e: any) => { this.onMark(e, I.MarkType.Color); }} + onMouseDown={e => this.onMark(e, I.MarkType.Color)} /> { this.onMark(e, I.MarkType.BgColor); }} + onMouseDown={e => this.onMark(e, I.MarkType.BgColor)} />
@@ -136,7 +136,7 @@ const MenuBlockContext = observer(class MenuBlockContext extends React.Component className="more" tooltip={translate('menuBlockContextMoreOptions')} tooltipY={I.MenuDirection.Top} - onMouseDown={(e: any) => { this.onMark(e, 'more'); }} + onMouseDown={e => this.onMark(e, 'more')} />
) : ''} @@ -256,7 +256,7 @@ const MenuBlockContext = observer(class MenuBlockContext extends React.Component menuStore.updateData(this.props.id, { marks }); onChange(marks); - window.setTimeout(() => { focus.apply(); }, 15); + window.setTimeout(() => focus.apply(), 15); } }); diff --git a/src/ts/component/menu/block/cover.tsx b/src/ts/component/menu/block/cover.tsx index ec9e6cb694..f7329f7d36 100644 --- a/src/ts/component/menu/block/cover.tsx +++ b/src/ts/component/menu/block/cover.tsx @@ -56,7 +56,7 @@ const MenuBlockCover = observer(class MenuBlockCover extends React.Component ( -
{ this.onSelect(e, item); }}> +
this.onSelect(e, item)}> {item.artist ?
{item.artist}
: ''}
@@ -136,7 +136,7 @@ const MenuBlockCover = observer(class MenuBlockCover extends React.Component { this.setTab(item.id); }} + onClick={() => this.setTab(item.id)} > {item.name}
diff --git a/src/ts/component/menu/block/latex.tsx b/src/ts/component/menu/block/latex.tsx index c8cbc1a650..7a940adf2a 100644 --- a/src/ts/component/menu/block/latex.tsx +++ b/src/ts/component/menu/block/latex.tsx @@ -178,7 +178,7 @@ const MenuBlockLatex = observer(class MenuBlockLatex extends React.Component { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/layout.tsx b/src/ts/component/menu/block/layout.tsx index 2304da178d..904fb4b483 100644 --- a/src/ts/component/menu/block/layout.tsx +++ b/src/ts/component/menu/block/layout.tsx @@ -34,8 +34,8 @@ class MenuBlockLayout extends React.Component { {...action} icon={action.icon || action.id} checkbox={action.id == value} - onMouseEnter={(e: any) => { this.onMouseEnter(e, action); }} - onClick={(e: any) => { this.onClick(e, action); }} + onMouseEnter={e => this.onMouseEnter(e, action)} + onClick={e => this.onClick(e, action)} /> ))}
@@ -61,7 +61,7 @@ class MenuBlockLayout extends React.Component { rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/link.tsx b/src/ts/component/menu/block/link.tsx index 7336f5ceda..db36bbc118 100644 --- a/src/ts/component/menu/block/link.tsx +++ b/src/ts/component/menu/block/link.tsx @@ -92,8 +92,8 @@ const MenuBlockLink = observer(class MenuBlockLink extends React.Component} - onMouseEnter={(e: any) => { this.onOver(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} + onMouseEnter={e => this.onOver(e, item)} + onClick={e => this.onClick(e, item)} withDescription={item.isBig} description={type ? type.name : undefined} style={param.style} @@ -206,7 +206,7 @@ const MenuBlockLink = observer(class MenuBlockLink extends React.Component { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/link/settings.tsx b/src/ts/component/menu/block/link/settings.tsx index 82cc91c417..06afd133c7 100644 --- a/src/ts/component/menu/block/link/settings.tsx +++ b/src/ts/component/menu/block/link/settings.tsx @@ -28,8 +28,8 @@ const MenuBlockLinkSettings = observer(class MenuBlockLinkSettings extends React { this.onClick(e, action); }} - onMouseEnter={(e: any) => { this.onOver(e, action); }} + onClick={e => this.onClick(e, action)} + onMouseEnter={e => this.onOver(e, action)} /> ))}
@@ -60,7 +60,7 @@ const MenuBlockLinkSettings = observer(class MenuBlockLinkSettings extends React rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/mention.tsx b/src/ts/component/menu/block/mention.tsx index 159f69ef70..03939d17b9 100644 --- a/src/ts/component/menu/block/mention.tsx +++ b/src/ts/component/menu/block/mention.tsx @@ -72,8 +72,8 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component object={item.id == 'add' ? undefined : item} icon={item.icon} name={} - onMouseEnter={(e: any) => { this.onOver(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} + onMouseEnter={e => this.onOver(e, item)} + onClick={e => this.onClick(e, item)} caption={type ? type.name : undefined} style={param.style} className={cn.join(' ')} @@ -162,7 +162,7 @@ const MenuBlockMention = observer(class MenuBlockMention extends React.Component rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/block/more.tsx b/src/ts/component/menu/block/more.tsx index 79ed668e95..03479421aa 100644 --- a/src/ts/component/menu/block/more.tsx +++ b/src/ts/component/menu/block/more.tsx @@ -38,8 +38,8 @@ class MenuBlockMore extends React.Component { key={i} {...action} icon={action.icon || action.id} - onMouseEnter={(e: any) => { this.onMouseEnter(e, action); }} - onClick={(e: any) => { this.onClick(e, action); }} + onMouseEnter={e => this.onMouseEnter(e, action)} + onClick={e => this.onClick(e, action)} /> ); })} @@ -83,7 +83,7 @@ class MenuBlockMore extends React.Component { rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; @@ -508,7 +508,7 @@ class MenuBlockMore extends React.Component { }; case 'pageUninstall': { - Action.uninstall(object, false, () => { onBack(); }); + Action.uninstall(object, false, () => onBack()); break; }; diff --git a/src/ts/component/menu/block/relation/view.tsx b/src/ts/component/menu/block/relation/view.tsx index 918030d54c..3ce4f1459a 100644 --- a/src/ts/component/menu/block/relation/view.tsx +++ b/src/ts/component/menu/block/relation/view.tsx @@ -82,7 +82,7 @@ const MenuBlockRelationView = observer(class MenuBlockRelationView extends React ); const ItemAdd = () => ( -
{ this.onAdd(e); }}> +
this.onAdd(e)}>
@@ -111,7 +111,7 @@ const MenuBlockRelationView = observer(class MenuBlockRelationView extends React const scrollWrap = node.find('#scrollWrap'); this.resize(); - scrollWrap.off('scroll').on('scroll', (e: any) => { this.onScroll(); }); + scrollWrap.off('scroll').on('scroll', e => this.onScroll()); this.selectionPrevent(true); }; @@ -219,7 +219,7 @@ const MenuBlockRelationView = observer(class MenuBlockRelationView extends React if (idx < 0) { const item = items.find(it => it.relationKey == relationKey); const cb = () => { - C.ObjectRelationAddFeatured(rootId, [ relationKey ], () => { analytics.event('FeatureRelation'); }); + C.ObjectRelationAddFeatured(rootId, [ relationKey ], () => analytics.event('FeatureRelation')); }; if (item.scope == I.RelationScope.Type) { @@ -228,7 +228,7 @@ const MenuBlockRelationView = observer(class MenuBlockRelationView extends React cb(); }; } else { - C.ObjectRelationRemoveFeatured(rootId, [ relationKey ], () => { analytics.event('UnfeatureRelation'); }); + C.ObjectRelationRemoveFeatured(rootId, [ relationKey ], () => analytics.event('UnfeatureRelation')); }; }; diff --git a/src/ts/component/menu/block/style.tsx b/src/ts/component/menu/block/style.tsx index e82d606a7a..b340c3d793 100644 --- a/src/ts/component/menu/block/style.tsx +++ b/src/ts/component/menu/block/style.tsx @@ -26,8 +26,8 @@ const MenuBlockStyle = observer(class MenuBlockStyle extends React.Component { this.onClick(e, action); }} - onMouseEnter={(e: any) => { this.onOver(e, action); }} + onClick={e => this.onClick(e, action)} + onMouseEnter={e => this.onOver(e, action)} /> ))}
@@ -52,7 +52,7 @@ const MenuBlockStyle = observer(class MenuBlockStyle extends React.Component { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/button.tsx b/src/ts/component/menu/button.tsx index 7101232de1..96d4861944 100644 --- a/src/ts/component/menu/button.tsx +++ b/src/ts/component/menu/button.tsx @@ -26,7 +26,7 @@ const MenuButton = observer(class MenuButton extends React.Component { key={i} {...item} className={disabled ? 'disabled' : ''} - onClick={(e: any) => { this.onSelect(e, item); }} + onClick={e => this.onSelect(e, item)} /> ))}
diff --git a/src/ts/component/menu/dataview/context.tsx b/src/ts/component/menu/dataview/context.tsx index 80271942c0..a12a7944f5 100644 --- a/src/ts/component/menu/dataview/context.tsx +++ b/src/ts/component/menu/dataview/context.tsx @@ -37,8 +37,8 @@ class MenuContext extends React.Component { key={i} {...action} icon={action.icon || action.id} - onMouseEnter={(e: any) => { this.onMouseEnter(e, action); }} - onClick={(e: any) => { this.onClick(e, action); }} + onMouseEnter={e => this.onMouseEnter(e, action)} + onClick={e => this.onClick(e, action)} /> ); })} @@ -71,7 +71,7 @@ class MenuContext extends React.Component { rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/dataview/date.tsx b/src/ts/component/menu/dataview/date.tsx index 4c43749a68..b63b24a64b 100644 --- a/src/ts/component/menu/dataview/date.tsx +++ b/src/ts/component/menu/dataview/date.tsx @@ -27,7 +27,7 @@ const MenuDataviewDate = observer(class MenuDataviewDate extends React.Component { this.onMouseEnter(e, action); }} + onMouseEnter={e => this.onMouseEnter(e, action)} /> ))}
@@ -59,7 +59,7 @@ const MenuDataviewDate = observer(class MenuDataviewDate extends React.Component rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/dataview/file/list.tsx b/src/ts/component/menu/dataview/file/list.tsx index 86beb7b6df..db93fb1ac8 100644 --- a/src/ts/component/menu/dataview/file/list.tsx +++ b/src/ts/component/menu/dataview/file/list.tsx @@ -58,7 +58,7 @@ const MenuDataviewFileList = observer(class MenuDataviewFileList extends React.C let content = null; if (item.id == 'add') { content = ( -
{ this.onOver(e, item); }} onClick={(e: any) => { this.onClick(e, item); }} style={param.style}> +
this.onOver(e, item)} onClick={e => this.onClick(e, item)} style={param.style}>
{item.name}
@@ -69,8 +69,8 @@ const MenuDataviewFileList = observer(class MenuDataviewFileList extends React.C id={item.id} object={item} name={UtilFile.name(item)} - onMouseEnter={(e: any) => { this.onOver(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} + onMouseEnter={e => this.onOver(e, item)} + onClick={e => this.onClick(e, item)} caption={type ? type.name : undefined} style={param.style} /> @@ -176,7 +176,7 @@ const MenuDataviewFileList = observer(class MenuDataviewFileList extends React.C rebind () { this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/dataview/file/values.tsx b/src/ts/component/menu/dataview/file/values.tsx index cecc91fd67..d2360f8d00 100644 --- a/src/ts/component/menu/dataview/file/values.tsx +++ b/src/ts/component/menu/dataview/file/values.tsx @@ -45,7 +45,7 @@ const MenuDataviewFileValues = observer(class MenuDataviewFileValues extends Rea ); const Image = (item: any) => ( - { position(); }} /> + position()} /> ); const Item = SortableElement((item: any) => { @@ -70,11 +70,11 @@ const MenuDataviewFileValues = observer(class MenuDataviewFileValues extends Rea return (
-
{ UtilObject.openPopup(item); }}> +
UtilObject.openPopup(item)}> {content}
- { this.onMore(e, item); }} /> + this.onMore(e, item)} />
); diff --git a/src/ts/component/menu/dataview/filter/list.tsx b/src/ts/component/menu/dataview/filter/list.tsx index 24298a9c24..b938de74a2 100644 --- a/src/ts/component/menu/dataview/filter/list.tsx +++ b/src/ts/component/menu/dataview/filter/list.tsx @@ -68,9 +68,9 @@ const MenuFilterList = observer(class MenuFilterList extends React.Component { this.onOver(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} - onRemove={(e: any) => { this.onRemove(e, item); }} + onOver={e => this.onOver(e, item)} + onClick={e => this.onClick(e, item)} + onRemove={e => this.onRemove(e, item)} /> ); @@ -139,7 +139,7 @@ const MenuFilterList = observer(class MenuFilterList extends React.Component { this.props.setHover({ id: 'add' }); }} - onMouseLeave={() => { this.props.setHover(); }} + onMouseLeave={() => this.props.setHover()} >
{translate('menuDataviewFilterNewFilter')}
@@ -182,10 +182,10 @@ const MenuFilterList = observer(class MenuFilterList extends React.Component { menuStore.closeAll(Constant.menuIds.cell); }); + obj.off('click').on('click', () => menuStore.closeAll(Constant.menuIds.cell)); this.unbind(); - $(window).on('keydown.menu', (e: any) => { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; @@ -286,7 +286,7 @@ const MenuFilterList = observer(class MenuFilterList extends React.Component it.id), () => { loadData(view.id, 0); }); + C.BlockDataviewFilterSort(rootId, blockId, view.id, view.filters.map(it => it.id), () => loadData(view.id, 0)); keyboard.disableSelection(false); diff --git a/src/ts/component/menu/dataview/filter/values.tsx b/src/ts/component/menu/dataview/filter/values.tsx index e0b5a1de02..a32372d6da 100644 --- a/src/ts/component/menu/dataview/filter/values.tsx +++ b/src/ts/component/menu/dataview/filter/values.tsx @@ -74,7 +74,7 @@ const MenuDataviewFilterValues = observer(class MenuDataviewFilterValues extends let value = null; let Item = null; let list = []; - let onSubmit = (e: any) => { this.onSubmit(e); }; + let onSubmit = e => this.onSubmit(e); const ItemAdd = (item: any) => (
- { this.onDelete(e, element); }} /> + this.onDelete(e, element)} />
); diff --git a/src/ts/component/menu/dataview/group/edit.tsx b/src/ts/component/menu/dataview/group/edit.tsx index 92ee48e8c0..5dc55875d4 100644 --- a/src/ts/component/menu/dataview/group/edit.tsx +++ b/src/ts/component/menu/dataview/group/edit.tsx @@ -29,8 +29,8 @@ const MenuGroupEdit = observer(class MenuGroupEdit extends React.Component { this.onClick(e, action); }} - onMouseEnter={(e: any) => { this.onMouseEnter(e, action); }} + onClick={e => this.onClick(e, action)} + onMouseEnter={e => this.onMouseEnter(e, action)} /> ); })} @@ -73,7 +73,7 @@ const MenuGroupEdit = observer(class MenuGroupEdit extends React.Component { this.props.onKeyDown(e); }); + $(window).on('keydown.menu', e => this.props.onKeyDown(e)); window.setTimeout(() => this.props.setActive(), 15); }; diff --git a/src/ts/component/menu/dataview/group/list.tsx b/src/ts/component/menu/dataview/group/list.tsx index 01bd2d1e44..5488b614b3 100644 --- a/src/ts/component/menu/dataview/group/list.tsx +++ b/src/ts/component/menu/dataview/group/list.tsx @@ -61,7 +61,7 @@ const MenuGroupList = observer(class MenuGroupList extends React.Component this.node = node} id={'item-' + item.id} className={cn.join(' ')} - onMouseEnter={(e: any) => { this.onMouseEnter(e, item); }} + onMouseEnter={e => this.onMouseEnter(e, item)} style={item.style} > {allowedView ? : ''} diff --git a/src/ts/component/menu/dataview/object/list.tsx b/src/ts/component/menu/dataview/object/list.tsx index 8c47d82aec..9a3ee5868d 100644 --- a/src/ts/component/menu/dataview/object/list.tsx +++ b/src/ts/component/menu/dataview/object/list.tsx @@ -75,7 +75,7 @@ const MenuDataviewObjectList = observer(class MenuDataviewObjectList extends Rea } else if (item.id == 'add') { content = ( -
{ this.onOver(e, item); }} onClick={(e: any) => { this.onClick(e, item); }} style={param.style}> +
this.onOver(e, item)} onClick={e => this.onClick(e, item)} style={param.style}>
{item.name}
@@ -86,8 +86,8 @@ const MenuDataviewObjectList = observer(class MenuDataviewObjectList extends Rea id={item.id} object={item} name={name} - onMouseEnter={(e: any) => { this.onOver(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} + onMouseEnter={e => this.onOver(e, item)} + onClick={e => this.onClick(e, item)} caption={type ? type.name : undefined} style={param.style} /> diff --git a/src/ts/component/menu/dataview/object/values.tsx b/src/ts/component/menu/dataview/object/values.tsx index 7d1491b83f..5d43fd76f2 100644 --- a/src/ts/component/menu/dataview/object/values.tsx +++ b/src/ts/component/menu/dataview/object/values.tsx @@ -46,15 +46,15 @@ const MenuObjectValues = observer(class MenuObjectValues extends React.Component
{ this.onOver(e, item); }} + onMouseEnter={e => this.onOver(e, item)} style={item.style} > - { this.onClick(e, item); }}> + this.onClick(e, item)}> - { this.onRemove(e, item); }} /> + this.onRemove(e, item)} />
); }); @@ -63,8 +63,8 @@ const MenuObjectValues = observer(class MenuObjectValues extends React.Component
{ this.onOver(e, item); }} - onClick={(e: any) => { this.onClick(e, item); }} + onMouseEnter={e => this.onOver(e, item)} + onClick={e => this.onClick(e, item)} style={item.style} > diff --git a/src/ts/component/menu/dataview/option/list.tsx b/src/ts/component/menu/dataview/option/list.tsx index 0b331db59d..3af371a2f6 100644 --- a/src/ts/component/menu/dataview/option/list.tsx +++ b/src/ts/component/menu/dataview/option/list.tsx @@ -186,7 +186,7 @@ const MenuOptionList = observer(class MenuOptionList extends React.Component this.onKeyDown(e)); - $(`#${this.props.getId()}`).on('click', () => { menuStore.close('dataviewOptionEdit'); }); + $(`#${this.props.getId()}`).on('click', () => menuStore.close('dataviewOptionEdit')); window.setTimeout(() => this.props.setActive(), 15); }; @@ -316,7 +316,7 @@ const MenuOptionList = observer(class MenuOptionList extends React.Component { this.resize(); }, 50); + window.setTimeout(() => this.resize(), 50); }); }; diff --git a/src/ts/component/menu/dataview/relation/edit.tsx b/src/ts/component/menu/dataview/relation/edit.tsx index 57549f18d2..f6712213b0 100644 --- a/src/ts/component/menu/dataview/relation/edit.tsx +++ b/src/ts/component/menu/dataview/relation/edit.tsx @@ -149,7 +149,7 @@ const MenuRelationEdit = observer(class MenuRelationEdit extends React.Component { this.onClick(e, action); }} + onClick={e => this.onClick(e, action)} onMouseEnter={this.menuClose} /> ))} diff --git a/src/ts/component/menu/dataview/relation/list.tsx b/src/ts/component/menu/dataview/relation/list.tsx index a9fd3d7b63..2803820aa3 100644 --- a/src/ts/component/menu/dataview/relation/list.tsx +++ b/src/ts/component/menu/dataview/relation/list.tsx @@ -62,7 +62,7 @@ const MenuRelationList = observer(class MenuRelationList extends React.Component
{ this.onMouseEnter(e, item); }} + onMouseEnter={e => this.onMouseEnter(e, item)} style={item.style} > {allowedView ? : ''} @@ -153,7 +153,7 @@ const MenuRelationList = observer(class MenuRelationList extends React.Component className="item add" onClick={this.onAdd} onMouseEnter={() => { this.props.setHover({ id: 'add' }); }} - onMouseLeave={() => { this.props.setHover(); }} + onMouseLeave={() => this.props.setHover()} >
{translate('menuDataviewRelationListAddRelation')}
diff --git a/src/ts/component/menu/dataview/sort.tsx b/src/ts/component/menu/dataview/sort.tsx index f609880712..41a06767b4 100644 --- a/src/ts/component/menu/dataview/sort.tsx +++ b/src/ts/component/menu/dataview/sort.tsx @@ -61,7 +61,7 @@ const MenuSort = observer(class MenuSort extends React.Component {
{ this.onOver(e, item); }} + onMouseEnter={e => this.onOver(e, item)} style={item.style} > {allowedView ? : ''} @@ -71,7 +71,7 @@ const MenuSort = observer(class MenuSort extends React.Component { id={[ 'filter', 'relation', item.id ].join('-')} options={relationOptions} value={item.relationKey} - onChange={(v: string) => { this.onChange(item.id, 'relationKey', v); }} + onChange={v => this.onChange(item.id, 'relationKey', v)} /> { this.ref = ref; }} + ref={ref => this.ref = ref} type="password" placeholder={translate('popupSettingsImportNotionTokenPlaceholder')} /> @@ -50,7 +50,7 @@ class PopupSettingsPageImportNotion extends React.Component - <div className="btn" onClick={() => { onPage('importNotionHelp'); }}> + <div className="btn" onClick={() => onPage('importNotionHelp')}> <Icon className="help" />{translate('popupSettingsImportNotionStepByStepGuide')} </div> </div> diff --git a/src/ts/component/popup/search.tsx b/src/ts/component/popup/search.tsx index 91e373a1dd..c73cec60d3 100644 --- a/src/ts/component/popup/search.tsx +++ b/src/ts/component/popup/search.tsx @@ -250,7 +250,7 @@ const PopupSearch = observer(class PopupSearch extends React.Component<I.Popup, const win = $(window); win.on('keydown.search', e => this.onKeyDown(e)); - win.on('resize.search', (e: any) => { this.resize(); }); + win.on('resize.search', e => this.resize()); }; unbind () { @@ -569,7 +569,7 @@ const PopupSearch = observer(class PopupSearch extends React.Component<I.Popup, case 'relation': { $('#button-header-relation').trigger('click'); - window.setTimeout(() => { $('#menuBlockRelationView #item-add').trigger('click'); }, Constant.delay.menu * 2); + window.setTimeout(() => $('#menuBlockRelationView #item-add').trigger('click'), Constant.delay.menu * 2); break; }; diff --git a/src/ts/component/popup/settings.tsx b/src/ts/component/popup/settings.tsx index d88bc5af73..50a03b6dab 100644 --- a/src/ts/component/popup/settings.tsx +++ b/src/ts/component/popup/settings.tsx @@ -223,9 +223,9 @@ const PopupSettings = observer(class PopupSettings extends React.Component<I.Pop const win = $(window); this.unbind(); - win.on('resize.settings', () => { this.resize(); }); + win.on('resize.settings', () => this.resize()); win.on('keydown.settings', e => this.onKeyDown(e)); - win.on('mousedown.settings', (e: any) => { this.onMouseDown(e); }); + win.on('mousedown.settings', e => this.onMouseDown(e)); }; unbind () { diff --git a/src/ts/component/preview/index.tsx b/src/ts/component/preview/index.tsx index e1247d4165..d844a35d96 100644 --- a/src/ts/component/preview/index.tsx +++ b/src/ts/component/preview/index.tsx @@ -142,7 +142,7 @@ const PreviewComponent = observer(class PreviewComponent extends React.Component menuStore.open('blockLink', { rect: rect ? { ...rect, height: 0, y: rect.y + win.scrollTop() } : null, horizontal: I.MenuDirection.Center, - onOpen: () => { Preview.previewHide(true); }, + onOpen: () => Preview.previewHide(true), data: { filter: mark ? mark.param : '', type: mark ? mark.type : null, diff --git a/src/ts/component/selection/provider.tsx b/src/ts/component/selection/provider.tsx index b838fd8718..fde0f3a546 100644 --- a/src/ts/component/selection/provider.tsx +++ b/src/ts/component/selection/provider.tsx @@ -161,8 +161,8 @@ const SelectionProvider = observer(class SelectionProvider extends React.Compone scrollOnMove.onMouseDown(e, isPopup); this.unbindMouse(); - win.on(`mousemove.selection`, (e: any) => { this.onMouseMove(e); }); - win.on(`blur.selection mouseup.selection`, (e: any) => { this.onMouseUp(e); }); + win.on(`mousemove.selection`, e => this.onMouseMove(e)); + win.on(`blur.selection mouseup.selection`, e => this.onMouseUp(e)); }; initNodes () { diff --git a/src/ts/component/sidebar/index.tsx b/src/ts/component/sidebar/index.tsx index 6b5ad57c5e..a123829b30 100644 --- a/src/ts/component/sidebar/index.tsx +++ b/src/ts/component/sidebar/index.tsx @@ -234,7 +234,7 @@ const Sidebar = observer(class Sidebar extends React.Component<Props> { $('body').removeClass('rowResize colResize'); $(window).off('mousemove.sidebar mouseup.sidebar'); - window.setTimeout(() => { this.movedX = false; }, 15); + window.setTimeout(() => this.movedX = false, 15); }; onHandleClick () { diff --git a/src/ts/component/util/frame.tsx b/src/ts/component/util/frame.tsx index ef912b9001..ddf01283d6 100644 --- a/src/ts/component/util/frame.tsx +++ b/src/ts/component/util/frame.tsx @@ -38,7 +38,7 @@ class Frame extends React.Component<Props> { this.resize(); this.unbind(); - $(window).on('resize.frame', () => { this.resize(); }); + $(window).on('resize.frame', () => this.resize()); }; componentWillUnmount () { diff --git a/src/ts/component/util/media/audio.tsx b/src/ts/component/util/media/audio.tsx index 7aface5fb5..05cb13dbee 100644 --- a/src/ts/component/util/media/audio.tsx +++ b/src/ts/component/util/media/audio.tsx @@ -100,9 +100,9 @@ class MediaAudio extends React.Component<Props> { this.audioNode = el.get(0) as HTMLAudioElement; if (el.length) { - el.on('canplay timeupdate', () => { this.onTimeUpdate(); }); - el.on('play', () => { this.onPlay(); }); - el.on('ended pause', () => { this.onPause(); }); + el.on('canplay timeupdate', () => this.onTimeUpdate()); + el.on('play', () => this.onPlay()); + el.on('ended pause', () => this.onPause()); }; }; diff --git a/src/ts/component/util/media/video.tsx b/src/ts/component/util/media/video.tsx index ed3fe09028..01d158a903 100644 --- a/src/ts/component/util/media/video.tsx +++ b/src/ts/component/util/media/video.tsx @@ -46,9 +46,9 @@ class MediaVideo extends React.Component<Props> { const node = $(this.node); const video = node.find('video'); - video.on('play', () => { this.onPlay(); }); - video.on('pause', () => { this.onPause(); }); - video.on('ended', () => { this.onEnded(); }); + video.on('play', () => this.onPlay()); + video.on('pause', () => this.onPause()); + video.on('ended', () => this.onEnded()); }; unbind () { diff --git a/src/ts/component/util/pager.tsx b/src/ts/component/util/pager.tsx index e4ba5d663b..aa32642661 100644 --- a/src/ts/component/util/pager.tsx +++ b/src/ts/component/util/pager.tsx @@ -37,7 +37,7 @@ class Pager extends React.Component<Props> { }; const Item = (item) => ( - <div className={'pageItem ' + (item.id == page ? 'active' : '')} onClick={() => { this.onChange(item.id); }}> + <div className={'pageItem ' + (item.id == page ? 'active' : '')} onClick={() => this.onChange(item.id)}> {item.id} </div> ); @@ -79,15 +79,15 @@ class Pager extends React.Component<Props> { if (items.length > 1) { return ( <div className={[ 'pager', (isShort ? 'isShort' : '') ].join(' ')}> - {isShort ? <Icon className={[ 'arrow', 'end', 'left', (page == 1 ? 'disabled' : '') ].join(' ')} onClick={() => { this.onChange(1); }} /> : ''} - <Icon className={[ 'arrow', 'left', (page == 1 ? 'disabled' : '') ].join(' ')} onClick={() => { this.onChange(page - 1); }} /> + {isShort ? <Icon className={[ 'arrow', 'end', 'left', (page == 1 ? 'disabled' : '') ].join(' ')} onClick={() => this.onChange(1)} /> : ''} + <Icon className={[ 'arrow', 'left', (page == 1 ? 'disabled' : '') ].join(' ')} onClick={() => this.onChange(page - 1)} /> {startPage} {list} {endPage} - <Icon className={[ 'arrow', 'right', (page == pages ? 'disabled' : '') ].join(' ')} onClick={() => { this.onChange(page + 1); }} /> - {isShort ? <Icon className={[ 'arrow', 'end', 'right', (page == pages ? 'disabled' : '') ].join(' ')} onClick={() => { this.onChange(pages); }} /> : ''} + <Icon className={[ 'arrow', 'right', (page == pages ? 'disabled' : '') ].join(' ')} onClick={() => this.onChange(page + 1)} /> + {isShort ? <Icon className={[ 'arrow', 'end', 'right', (page == pages ? 'disabled' : '') ].join(' ')} onClick={() => this.onChange(pages)} /> : ''} </div> ); } else { diff --git a/src/ts/component/util/progress.tsx b/src/ts/component/util/progress.tsx index 706131b25c..265e652e04 100644 --- a/src/ts/component/util/progress.tsx +++ b/src/ts/component/util/progress.tsx @@ -98,8 +98,8 @@ const Progress = observer(class Progress extends React.Component { keyboard.setDragging(true); win.off('mousemove.progress mouseup.progress'); - win.on('mousemove.progress', (e: any) => { this.onDragMove(e); }); - win.on('mouseup.progress', (e: any) => { this.onDragEnd(e); }); + win.on('mousemove.progress', e => this.onDragMove(e)); + win.on('mouseup.progress', e => this.onDragEnd(e)); }; onDragMove (e: any) { diff --git a/src/ts/component/widget/index.tsx b/src/ts/component/widget/index.tsx index 434f6a1b16..0afaf176fc 100644 --- a/src/ts/component/widget/index.tsx +++ b/src/ts/component/widget/index.tsx @@ -422,8 +422,8 @@ const WidgetIndex = observer(class WidgetIndex extends React.Component<Props> { subIds: Constant.menuIds.widget, vertical: I.MenuDirection.Center, horizontal: I.MenuDirection.Right, - onOpen: () => { node.addClass('active'); }, - onClose: () => { node.removeClass('active'); }, + onOpen: () => node.addClass('active'), + onClose: () => node.removeClass('active'), data: { ...block.content, target: object, diff --git a/src/ts/component/widget/list/item.tsx b/src/ts/component/widget/list/item.tsx index cd80168679..a129b1deaa 100644 --- a/src/ts/component/widget/list/item.tsx +++ b/src/ts/component/widget/list/item.tsx @@ -178,8 +178,8 @@ const WidgetListItem = observer(class WidgetListItem extends React.Component<Pro const menuParam: any = { className: 'fixed', classNameWrap: 'fromSidebar', - onOpen: () => { node.addClass('active'); }, - onClose: () => { node.removeClass('active'); }, + onOpen: () => node.addClass('active'), + onClose: () => node.removeClass('active'), data: { route: 'Widget', objectIds: [ id ], diff --git a/src/ts/component/widget/tree/item.tsx b/src/ts/component/widget/tree/item.tsx index eda759b73e..82e2b014ad 100644 --- a/src/ts/component/widget/tree/item.tsx +++ b/src/ts/component/widget/tree/item.tsx @@ -153,8 +153,8 @@ const TreeItem = observer(class Node extends React.Component<Props> { const menuParam: any = { className: 'fixed', classNameWrap: 'fromSidebar', - onOpen: () => { node.addClass('active'); }, - onClose: () => { node.removeClass('active'); }, + onOpen: () => node.addClass('active'), + onClose: () => node.removeClass('active'), data: { route: 'Widget', objectIds: [ id ], diff --git a/src/ts/lib/focus.ts b/src/ts/lib/focus.ts index 542164132c..aaa5b6c887 100644 --- a/src/ts/lib/focus.ts +++ b/src/ts/lib/focus.ts @@ -82,7 +82,7 @@ class Focus { el.focus({ preventScroll: true }); if (node.hasClass('input')) { - window.setTimeout(() => { (el as HTMLInputElement).setSelectionRange(range.from, range.to); }); + window.setTimeout(() => (el as HTMLInputElement).setSelectionRange(range.from, range.to)); } else if (node.hasClass('editable')) { keyboard.setFocus(true); diff --git a/src/ts/lib/preview.ts b/src/ts/lib/preview.ts index 6d15bdcdd8..c4f4818981 100644 --- a/src/ts/lib/preview.ts +++ b/src/ts/lib/preview.ts @@ -120,7 +120,7 @@ class Preview { node.css({ left: x, top: y }).addClass('show'); window.clearTimeout(this.timeout.delay); - this.timeout.delay = window.setTimeout(() => { this.delayTooltip = delay; }, 500); + this.timeout.delay = window.setTimeout(() => this.delayTooltip = delay, 500); this.delayTooltip = 100; }, this.delayTooltip); }; @@ -232,7 +232,7 @@ class Preview { toastShow (param: I.Toast) { const setTimeout = () => { window.clearTimeout(this.timeout.toast); - this.timeout.toast = window.setTimeout(() => { this.toastHide(false); }, Constant.delay.toast); + this.timeout.toast = window.setTimeout(() => this.toastHide(false), Constant.delay.toast); }; commonStore.toastSet(param); @@ -241,8 +241,8 @@ class Preview { setTimeout(); obj.off('mouseenter.toast mouseleave.toast'); - obj.on('mouseenter.toast', () => { window.clearTimeout(this.timeout.toast); }); - obj.on('mouseleave.toast', () => { setTimeout(); }); + obj.on('mouseenter.toast', () => window.clearTimeout(this.timeout.toast)); + obj.on('mouseleave.toast', () => setTimeout()); }; /** diff --git a/src/ts/lib/util/data.ts b/src/ts/lib/util/data.ts index d6519eaa57..93c0589eaf 100644 --- a/src/ts/lib/util/data.ts +++ b/src/ts/lib/util/data.ts @@ -661,12 +661,12 @@ class UtilData { dbStore.metaSet(subId, '', { total: message.counters.total, keys }); }; - let details = []; const mapper = (it: any) => { - keys.forEach((k: string) => { it[k] = it[k] || ''; }); + keys.forEach(k => it[k] = it[k] || ''); return { id: it[idField], details: it }; }; + let details = []; details = details.concat(message.dependencies.map(mapper)); details = details.concat(message.records.map(mapper)); diff --git a/src/ts/lib/util/object.ts b/src/ts/lib/util/object.ts index 6f28eee98b..be845685e2 100644 --- a/src/ts/lib/util/object.ts +++ b/src/ts/lib/util/object.ts @@ -208,7 +208,7 @@ class UtilObject { keyboard.setSource(null); historyPopup.pushMatch(param.data.matchPopup); - window.setTimeout(() => { popupStore.open('page', param); }, Constant.delay.popup); + window.setTimeout(() => popupStore.open('page', param), Constant.delay.popup); }; create (rootId: string, targetId: string, details: any, position: I.BlockPosition, templateId: string, fields: any, flags: I.ObjectFlag[], callBack?: (message: any) => void) {