f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-09 11:32:39 +00:00
Code Wiki Activity

Fix merge

Browse Source
This commit is contained in:
David Bolack
2024-08-21 21:19:10 -05:00
parent 5431d3ed9b
commit 695293333f
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/homebrew/editor/editor.jsx
View File

@@ -111,8 +111,13 @@ const Editor = createClass({
}, },
handleControlKeys : function(e){ handleControlKeys : function(e){
const END_KEY = 35;
const HOME_KEY = 36;
const LEFTARROW_KEY = 37;
const RIGHTARROW_KEY = 39;
if(this.props.liveScroll) { if(this.props.liveScroll) {
const movementKeys = [ 13, 33, 34, 37, 38, 39, 40 ]; const movementKeys = [ 13, 33, 34, LEFTARROW_KEY, 38, RIGHTARROW_KEY, 40 ];
if (movementKeys.includes(e.keyCode)) { if (movementKeys.includes(e.keyCode)) {
const curPage = this.getCurrentPage(); const curPage = this.getCurrentPage();
if( curPage != lastPage ) { if( curPage != lastPage ) {
@@ -121,30 +126,15 @@ const Editor = createClass({
} }
} }
} }
const X_KEY = 88;
const END_KEY = 35;
const HOME_KEY = 36;
if(!(e.ctrlKey || e.metaKey)) return; if(!(e.ctrlKey || e.metaKey)) return;
<<<<<<< HEAD console.log(e);
// Handle CTRL-HOME and CTRL-END // Handle CTRL-HOME and CTRL-END
if(((e.keyCode == END_KEY) || (e.keyCode == HOME_KEY)) && this.props.liveScroll) this.brewJump(); if(((e.keyCode == END_KEY) || (e.keyCode == HOME_KEY)) && this.props.liveScroll) this.brewJump();
// Brew Jump on CTRL-J
if((!e.shiftKey) && (e.keyCode == M_KEY)) this.brewJump();
// Source Jump on Shift-CTRL-J
if ((e.shiftKey) && (!e.altKey) && (e.keyCode == X_KEY)) this.sourceJump();
if( e.keyCode == X_KEY) {
=======
console.log(e);
const LEFTARROW_KEY = 37;
const RIGHTARROW_KEY = 39;
if (e.shiftKey && (e.keyCode == RIGHTARROW_KEY)) this.brewJump(); if (e.shiftKey && (e.keyCode == RIGHTARROW_KEY)) this.brewJump();
if (e.shiftKey && (e.keyCode == LEFTARROW_KEY)) this.sourceJump(); if (e.shiftKey && (e.keyCode == LEFTARROW_KEY)) this.sourceJump();
if ((e.keyCode == LEFTARROW_KEY) || (e.keyCode == RIGHTARROW_KEY)) { if ((e.keyCode == LEFTARROW_KEY) || (e.keyCode == RIGHTARROW_KEY)) {
>>>>>>> master
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
} }