Minor bug with focus and ace · fetacore/Infinitex@fb6e31d · GitHub
Skip to content

Commit fb6e31d

Browse files
fetacorefetacore
committed
Minor bug with focus and ace
1 parent 0d24171 commit fb6e31d

6 files changed

Lines changed: 189 additions & 309 deletions

File tree

‎beforePackage.js‎

Lines changed: 1 addition & 1 deletion

‎package.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "InfiniTex",
33
"productName": "InfiniTex",
4-
"version": "0.9.8",
4+
"version": "0.9.9",
55
"description": "A new age editor for academics who seek freedom and people with cryptography needs in rich text environments.",
66
"main": "src/index.js",
77
"scripts": {
@@ -43,7 +43,10 @@
4343
]
4444
},
4545
"win": {
46-
"target": ["nsis", "portable"],
46+
"target": [
47+
"nsis",
48+
"portable"
49+
],
4750
"icon": "src/static/icons/icon.ico"
4851
},
4952
"nsis": {
@@ -103,7 +106,7 @@
103106
"license": "GPL-3.0",
104107
"dependencies": {
105108
"electron-compile": "^6.4.2",
106-
"electron-updater": "2.21.0",
109+
"electron-updater": "^2.21.3",
107110
"katex": "^0.9.0",
108111
"shelljs": "^0.8.1"
109112
},
@@ -118,14 +121,14 @@
118121
"babelify": "^8.0.0",
119122
"brace": "^0.11.1",
120123
"browserify": "^16.1.1",
121-
"electron-builder": "^20.5.1",
124+
"electron-builder": "20.7.1",
122125
"electron-devtools-installer": "^2.2.3",
123-
"electron-prebuilt-compile": "2.0.0-beta.1",
126+
"electron-prebuilt-compile": "2.0.0-beta.5",
124127
"electron-reload": "^1.2.2",
125128
"envify": "^4.1.0",
126129
"jssoup": "0.0.6",
127130
"material-ui": "^0.20.0",
128-
"node-minify": "^2.4.1",
131+
"node-minify": "^2.4.2",
129132
"pdfjs-dist": "^2.0.402",
130133
"prop-types": "^15.6.1",
131134
"quill": "^1.3.6",
@@ -134,12 +137,12 @@
134137
"react-dom": "^16.2.0",
135138
"react-grid-layout": "^0.16.6",
136139
"react-hot-loader": "^4.0.0",
137-
"react-pdf": "3.0.0-alpha.4",
140+
"react-pdf": "^3.0.2",
138141
"react-quill": "^1.2.6",
139142
"react-resizable": "^1.7.5",
140143
"react-transition-group": "^2.2.1",
141144
"request": "^2.85.0",
142-
"uglify-js": "^3.3.15",
145+
"uglify-js": "^3.3.16",
143146
"uglifyify": "^4.0.5"
144147
}
145148
}

‎src/index.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@ const createWindow = async () => {
8787
plugins: false
8888
}
8989
})
90-
mainWindow.maximize()
9190
// and load the index.html of the app.
9291
mainWindow.loadURL(`file://${__dirname}/index.html`)
93-
9492
mainWindow.setMenu(null)
93+
mainWindow.maximize()
9594

9695
// Open the DevTools.
9796
if (isDevMode) {
@@ -106,8 +105,8 @@ const createWindow = async () => {
106105
})
107106

108107
mainWindow.on('ready-to-show', () => {
109-
mainWindow.show();
110-
mainWindow.focus();
108+
mainWindow.show()
109+
mainWindow.focus()
111110
});
112111

113112
mainWindow.on('focus', registerShortcuts)

‎src/react/Grid.jsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ You can refer to the graph as \\ref{figure:nickname}\n'
638638
this.refs.mainEditor.editor.clearSelection()
639639
setTimeout(() => {
640640
this.focusEditor(0)
641-
}, 0.1)
641+
}, 10)
642642
})
643643
}
644644

@@ -653,7 +653,7 @@ You can refer to the graph as \\ref{figure:nickname}\n'
653653
this.refs.bibEditor.editor.clearSelection()
654654
setTimeout(() => {
655655
this.focusEditor(1)
656-
}, 0.1)
656+
}, 10)
657657
})
658658
}
659659

@@ -668,7 +668,7 @@ You can refer to the graph as \\ref{figure:nickname}\n'
668668
this.refs.splitEditor.editor.clearSelection()
669669
setTimeout(() => {
670670
this.focusEditor(2)
671-
}, 0.1)
671+
}, 10)
672672
})
673673
}
674674

@@ -1017,19 +1017,19 @@ note = ,\n\u007D\n'
10171017
if (index == 0) {
10181018
this.refs.mainEditor.editor.clearSelection()
10191019
this.refs.mainEditor.editor.moveCursorTo(this.state.texRow, this.state.texColumn)
1020-
this.refs.mainEditor.editor.scrollToLine(this.state.texRow, true, true)
1020+
this.refs.mainEditor.editor.scrollToLine(this.state.texRow, false, true)
10211021
this.refs.mainEditor.editor.focus()
10221022
this.refs.mainEditor.editor.clearSelection()
10231023
} else if (index == 2){
10241024
this.refs.splitEditor.editor.clearSelection()
10251025
this.refs.splitEditor.editor.moveCursorTo(this.state.splitRow, this.state.splitColumn)
1026-
this.refs.splitEditor.editor.scrollToLine(this.state.splitRow, true, true)
1026+
this.refs.splitEditor.editor.scrollToLine(this.state.splitRow, false, true)
10271027
this.refs.splitEditor.editor.focus()
10281028
this.refs.splitEditor.editor.clearSelection()
10291029
} else {
10301030
this.refs.bibEditor.editor.clearSelection()
10311031
this.refs.bibEditor.editor.moveCursorTo(this.state.bibRow, this.state.bibColumn)
1032-
this.refs.bibEditor.editor.scrollToLine(this.state.bibRow, true, true)
1032+
this.refs.bibEditor.editor.scrollToLine(this.state.bibRow, false, true)
10331033
this.refs.bibEditor.editor.focus()
10341034
this.refs.bibEditor.editor.clearSelection()
10351035
}
@@ -1499,7 +1499,7 @@ note = ,\n\u007D\n'
14991499
splitSession.setUndoManager(splitUndoManager)
15001500
setTimeout(() => {
15011501
this.focusEditor(2)
1502-
}, 5)
1502+
}, 10)
15031503
})}
15041504
/>
15051505
const bottomButton2WildCard = <BottomNavigationItem
@@ -1523,7 +1523,7 @@ note = ,\n\u007D\n'
15231523
splitSession.setUndoManager(splitUndoManager)
15241524
setTimeout(() => {
15251525
this.focusEditor(2)
1526-
}, 5)
1526+
}, 10)
15271527
})}
15281528
/>
15291529
const bottomButton2Split = <BottomNavigationItem

‎src/react/InfiniTex.jsx‎

Lines changed: 0 additions & 2 deletions

0 commit comments

Comments
 (0)