diff --git a/dist/workers/graph.js b/dist/workers/graph.js index 9ec8b319f0..12625831ba 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 22ea2ad56e..e99943047f 100644 --- a/electron.js +++ b/electron.js @@ -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(); }; diff --git a/electron/about/about.js b/electron/about/about.js index f416a9c576..9d7fd0710a 100644 --- a/electron/about/about.js +++ b/electron/about/about.js @@ -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 1dfb2a2243..8a4e3966f3 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 68cf60f2bc..1acc63505c 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 7062bd3380..7a2a198cea 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 bb1b2ea875..b5eed15711 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 54846eaaa6..17e7d10489 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/dataview.tsx b/src/ts/component/block/dataview.tsx index 52827b6047..98e15a3cf8 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/index.tsx b/src/ts/component/block/dataview/cell/index.tsx index 77245ddf67..3e1ba4d4b2 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 3477b6e862..fd4aecee4d 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 428e5c82f8..18cf4df99a 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/card.tsx b/src/ts/component/block/dataview/view/board/card.tsx index 5b04cfc497..23cafb8c38 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 7928fa12bd..b87d68613b 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 895785be5a..b3be98aa20 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 77b9c86df5..f2f73df4f3 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 () { @@ -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/head/cell.tsx b/src/ts/component/block/dataview/view/grid/head/cell.tsx index 4ef4f0c7f7..e092b0a222 100644 --- a/src/ts/component/block/dataview/view/grid/head/cell.tsx +++ b/src/ts/component/block/dataview/view/grid/head/cell.tsx @@ -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 7a05d29c4a..466c899399 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 b2c79ea47a..5503068a05 100644 --- a/src/ts/component/block/featured.tsx +++ b/src/ts/component/block/featured.tsx @@ -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/table.tsx b/src/ts/component/block/table.tsx index 182ce57886..9e7ece7f00 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); @@ -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(); } }); diff --git a/src/ts/component/block/table/cell.tsx b/src/ts/component/block/table/cell.tsx index c9f9332ce1..3b43d5dbab 100644 --- a/src/ts/component/block/table/cell.tsx +++ b/src/ts/component/block/table/cell.tsx @@ -144,7 +144,7 @@ const BlockTableCell = observer(class BlockTableCell extends React.Component { onCellKeyUp(e, row.id, column.id, cellId, text, marks, range, props); }} - onUpdate={() => onCellUpdate(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} diff --git a/src/ts/component/block/text.tsx b/src/ts/component/block/text.tsx index b61c81ddf2..24cdc7e5ea 100644 --- a/src/ts/component/block/text.tsx +++ b/src/ts/component/block/text.tsx @@ -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 e727162450..696796ce95 100644 --- a/src/ts/component/block/type.tsx +++ b/src/ts/component/block/type.tsx @@ -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/editor/page.tsx b/src/ts/component/editor/page.tsx index 8fb5000d17..8682888bc8 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/header/index.tsx b/src/ts/component/header/index.tsx index 3dfe759f93..8dcd2b9b76 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 8b5c71b13d..ecbc49b0c4 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/menu/block/action.tsx b/src/ts/component/menu/block/action.tsx index 76f2b5022e..2afe5b0c31 100644 --- a/src/ts/component/menu/block/action.tsx +++ b/src/ts/component/menu/block/action.tsx @@ -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 a219f6dc88..d95a195a75 100644 --- a/src/ts/component/menu/block/add.tsx +++ b/src/ts/component/menu/block/add.tsx @@ -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 () { diff --git a/src/ts/component/menu/block/context.tsx b/src/ts/component/menu/block/context.tsx index 26cd990442..c962e81e2d 100644 --- a/src/ts/component/menu/block/context.tsx +++ b/src/ts/component/menu/block/context.tsx @@ -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 f7329f7d36..ce4c3ae193 100644 --- a/src/ts/component/menu/block/cover.tsx +++ b/src/ts/component/menu/block/cover.tsx @@ -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/more.tsx b/src/ts/component/menu/block/more.tsx index 03479421aa..10e1c6c6ad 100644 --- a/src/ts/component/menu/block/more.tsx +++ b/src/ts/component/menu/block/more.tsx @@ -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 3ce4f1459a..719342a562 100644 --- a/src/ts/component/menu/block/relation/view.tsx +++ b/src/ts/component/menu/block/relation/view.tsx @@ -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/dataview/file/values.tsx b/src/ts/component/menu/dataview/file/values.tsx index d2360f8d00..86fedd9ac9 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) => { diff --git a/src/ts/component/menu/dataview/filter/list.tsx b/src/ts/component/menu/dataview/filter/list.tsx index b938de74a2..341bd81fe9 100644 --- a/src/ts/component/menu/dataview/filter/list.tsx +++ b/src/ts/component/menu/dataview/filter/list.tsx @@ -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,7 +182,7 @@ 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 => this.props.onKeyDown(e)); @@ -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/option/list.tsx b/src/ts/component/menu/dataview/option/list.tsx index 3af371a2f6..bd374799ac 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/list.tsx b/src/ts/component/menu/dataview/relation/list.tsx index 2803820aa3..9a13a7fc6f 100644 --- a/src/ts/component/menu/dataview/relation/list.tsx +++ b/src/ts/component/menu/dataview/relation/list.tsx @@ -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 41a06767b4..c5b52a0ecb 100644 --- a/src/ts/component/menu/dataview/sort.tsx +++ b/src/ts/component/menu/dataview/sort.tsx @@ -172,7 +172,7 @@ const MenuSort = observer(class MenuSort extends React.Component { className="item add" onClick={this.onAdd} onMouseEnter={() => { this.props.setHover({ id: 'add' }); }} - onMouseLeave={() => this.props.setHover()} + onMouseLeave={() => this.props.setHover()} >
{translate('menuDataviewSortNewSort')}
diff --git a/src/ts/component/menu/dataview/view/list.tsx b/src/ts/component/menu/dataview/view/list.tsx index 26af72f647..bbfc717f1d 100644 --- a/src/ts/component/menu/dataview/view/list.tsx +++ b/src/ts/component/menu/dataview/view/list.tsx @@ -146,7 +146,7 @@ const MenuViewList = observer(class MenuViewList extends React.Component className="item add" onClick={this.onAdd} onMouseEnter={() => { this.props.setHover({ id: 'add' }); }} - onMouseLeave={() => this.props.setHover()} + onMouseLeave={() => this.props.setHover()} >
{translate('menuDataviewViewListAddView')}
diff --git a/src/ts/component/menu/index.tsx b/src/ts/component/menu/index.tsx index 2b84bf4903..f6d6e72cb2 100644 --- a/src/ts/component/menu/index.tsx +++ b/src/ts/component/menu/index.tsx @@ -605,7 +605,7 @@ const Menu = observer(class Menu extends React.Component { }); window.clearTimeout(this.timeoutPoly); - this.timeoutPoly = window.setTimeout(() => this.poly.hide(), 500); + this.timeoutPoly = window.setTimeout(() => this.poly.hide(), 500); }; // Arrow positioning @@ -708,7 +708,7 @@ const Menu = observer(class Menu extends React.Component { if (refInput) { if (refInput.isFocused && (this.ref.n < 0)) { - keyboard.shortcut('arrowleft, arrowright', e, () => ret = true); + keyboard.shortcut('arrowleft, arrowright', e, () => ret = true); keyboard.shortcut('arrowdown', e, () => { refInput.blur(); diff --git a/src/ts/component/menu/search/text.tsx b/src/ts/component/menu/search/text.tsx index 93cd9fb845..4b20ee385c 100644 --- a/src/ts/component/menu/search/text.tsx +++ b/src/ts/component/menu/search/text.tsx @@ -49,9 +49,9 @@ class MenuSearchText extends React.Component {
- this.onArrow(-1)} /> + this.onArrow(-1)} />
- this.onArrow(1)} /> + this.onArrow(1)} />
diff --git a/src/ts/component/menu/select.tsx b/src/ts/component/menu/select.tsx index e349d5b78c..9a783c4731 100644 --- a/src/ts/component/menu/select.tsx +++ b/src/ts/component/menu/select.tsx @@ -191,7 +191,7 @@ const MenuSelect = observer(class MenuSelect extends React.Component { }; if (active && !active.isInitial) { - window.setTimeout(() => setActive(active, true), 15); + window.setTimeout(() => setActive(active, true), 15); }; this.resize(); diff --git a/src/ts/component/page/auth/pinCheck.tsx b/src/ts/component/page/auth/pinCheck.tsx index b802f9ac41..6360a2fabf 100644 --- a/src/ts/component/page/auth/pinCheck.tsx +++ b/src/ts/component/page/auth/pinCheck.tsx @@ -56,7 +56,7 @@ const PageAuthPinCheck = observer(class PageAuthPinCheck extends React.Component rebind () { this.unbind(); - $(window).on('focus.pin', () => this.ref.focus()); + $(window).on('focus.pin', () => this.ref.focus()); }; onError () { diff --git a/src/ts/component/page/elements/head/controlButtons.tsx b/src/ts/component/page/elements/head/controlButtons.tsx index 44d771cf5c..90a9aabb82 100644 --- a/src/ts/component/page/elements/head/controlButtons.tsx +++ b/src/ts/component/page/elements/head/controlButtons.tsx @@ -151,7 +151,7 @@ const ControlButtons = observer(class ControlButtons extends React.Component { window.clearTimeout(this.timeout); - this.timeout = window.setTimeout(() => onCoverClose(), Constant.delay.menu); + this.timeout = window.setTimeout(() => onCoverClose(), Constant.delay.menu); }, data: { options: options, diff --git a/src/ts/component/page/elements/head/simple.tsx b/src/ts/component/page/elements/head/simple.tsx index e70300e4aa..0a78458303 100644 --- a/src/ts/component/page/elements/head/simple.tsx +++ b/src/ts/component/page/elements/head/simple.tsx @@ -64,7 +64,7 @@ const HeadSimple = observer(class Controls extends React.Component { onFocus={e => this.onFocus(e, item)} onBlur={e => this.onBlur(e, item)} onKeyDown={e => this.onKeyDown(e, item)} - onKeyUp={() => this.onKeyUp()} + onKeyUp={() => this.onKeyUp()} onSelect={e => this.onSelectText(e, item)} onCompositionStart={this.onCompositionStart} /> @@ -169,7 +169,7 @@ const HeadSimple = observer(class Controls extends React.Component { focus.set('title', { from: 0, to: 0 }); }; - window.setTimeout(() => focus.apply(), 10); + window.setTimeout(() => focus.apply(), 10); }; onFocus (e: any, item: any) { diff --git a/src/ts/component/page/main/graph.tsx b/src/ts/component/page/main/graph.tsx index db5e863888..40cbfc32e0 100644 --- a/src/ts/component/page/main/graph.tsx +++ b/src/ts/component/page/main/graph.tsx @@ -74,7 +74,7 @@ const PageMainGraph = observer(class PageMainGraph extends React.Component this.setLoading(false), 100); + this.timeoutLoading = window.setTimeout(() => this.setLoading(false), 100); }; }; @@ -167,7 +167,7 @@ const PageMainGraph = observer(class PageMainGraph extends React.Component loader.hide(), 200); + window.setTimeout(() => loader.hide(), 200); }; }; diff --git a/src/ts/component/page/main/history.tsx b/src/ts/component/page/main/history.tsx index ab32c5b9b8..8fba348552 100644 --- a/src/ts/component/page/main/history.tsx +++ b/src/ts/component/page/main/history.tsx @@ -322,7 +322,7 @@ const PageMainHistory = observer(class PageMainHistory extends React.Component { children.css({ height: 0 }); }, 15); - window.setTimeout(() => children.hide(), 215); + window.setTimeout(() => children.hide(), 215); } else { item.addClass('expanded'); children.show(); diff --git a/src/ts/component/page/main/navigation.tsx b/src/ts/component/page/main/navigation.tsx index 99ff6e275c..1d498f7806 100644 --- a/src/ts/component/page/main/navigation.tsx +++ b/src/ts/component/page/main/navigation.tsx @@ -117,7 +117,7 @@ const PageMainNavigation = observer(class PageMainNavigation extends React.Compo
); diff --git a/src/ts/component/popup/page/settings/appearance.tsx b/src/ts/component/popup/page/settings/appearance.tsx index 503ba9631c..e989886f3e 100644 --- a/src/ts/component/popup/page/settings/appearance.tsx +++ b/src/ts/component/popup/page/settings/appearance.tsx @@ -27,7 +27,7 @@ const PopupSettingsPageAppearance = observer(class PopupSettingsPageAppearance e
this.onTheme(item.id)} + onClick={() => this.onTheme(item.id)} >
diff --git a/src/ts/component/popup/page/settings/data.tsx b/src/ts/component/popup/page/settings/data.tsx index 27c6c18c15..80cbfe570c 100644 --- a/src/ts/component/popup/page/settings/data.tsx +++ b/src/ts/component/popup/page/settings/data.tsx @@ -56,7 +56,7 @@ const PopupSettingsPageDataManagement = observer(class PopupSettingsPageStorageI <Label className="description" text={translate('popupSettingsDataManagementDeleteText')} /> - <Button className="c36" onClick={() => onPage('delete')} color="red" text={translate('popupSettingsDataManagementDeleteButton')} /> + <Button className="c36" onClick={() => onPage('delete')} color="red" text={translate('popupSettingsDataManagementDeleteButton')} /> </React.Fragment> ); diff --git a/src/ts/component/popup/page/settings/head.tsx b/src/ts/component/popup/page/settings/head.tsx index 45dccdf681..d840f8624d 100644 --- a/src/ts/component/popup/page/settings/head.tsx +++ b/src/ts/component/popup/page/settings/head.tsx @@ -16,7 +16,7 @@ class PopupSettingsHead extends React.Component<Props> { return ( <div className="head"> <div className="inner"> - <div className="element" onClick={() => onPage(returnTo || prevPage)}> + <div className="element" onClick={() => onPage(returnTo || prevPage)}> <Icon className="back" /> {name} </div> diff --git a/src/ts/component/popup/page/settings/import/index.tsx b/src/ts/component/popup/page/settings/import/index.tsx index 367cf4db13..b0fc0d420f 100644 --- a/src/ts/component/popup/page/settings/import/index.tsx +++ b/src/ts/component/popup/page/settings/import/index.tsx @@ -17,7 +17,7 @@ const PopupSettingsPageImportIndex = observer(class PopupSettingsPageImportIndex const Item = (item: any) => { return ( - <div className={[ 'item', item.id ].join(' ')} onClick={() => this.onClick(item.id)} > + <div className={[ 'item', item.id ].join(' ')} onClick={() => this.onClick(item.id)} > <Icon className={`import-${item.id}`} /> <div className="name">{item.name}</div> </div> diff --git a/src/ts/component/popup/page/settings/import/notion.tsx b/src/ts/component/popup/page/settings/import/notion.tsx index 81a5b7093d..18bdfddc78 100644 --- a/src/ts/component/popup/page/settings/import/notion.tsx +++ b/src/ts/component/popup/page/settings/import/notion.tsx @@ -50,7 +50,7 @@ class PopupSettingsPageImportNotion extends React.Component<I.PopupSettings, Sta <div className="helpWrapper flex"> <Title text={translate('popupSettingsImportNotionHowTo')} /> - <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 c73cec60d3..acaa8d5be8 100644 --- a/src/ts/component/popup/search.tsx +++ b/src/ts/component/popup/search.tsx @@ -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 50a03b6dab..28271ba393 100644 --- a/src/ts/component/popup/settings.tsx +++ b/src/ts/component/popup/settings.tsx @@ -223,7 +223,7 @@ 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 => this.onMouseDown(e)); }; diff --git a/src/ts/component/preview/index.tsx b/src/ts/component/preview/index.tsx index d844a35d96..a2f9150b01 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/sidebar/index.tsx b/src/ts/component/sidebar/index.tsx index a123829b30..38055e0bc6 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 ddf01283d6..ceb66e0c4f 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 05cb13dbee..cf504f6da7 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 01d158a903..5cdc06abc5 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 aa32642661..80530b1b68 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/widget/index.tsx b/src/ts/component/widget/index.tsx index 0afaf176fc..617f6ffc07 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 a129b1deaa..fc33cfa137 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 82e2b014ad..b3e56e973f 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 aaa5b6c887..c3da8043ba 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 c4f4818981..b3dc70c225 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/object.ts b/src/ts/lib/util/object.ts index be845685e2..c928cd0790 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) {