Skip to content

Commit acc6df4

Browse files
committed
updated keyboard helper keys
1 parent 99790da commit acc6df4

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

js/caret.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ Caret.prototype = {
6868

6969
show: function() {
7070
let html = `<div id="caret_${this.page.getId()}_${this.id}" class="caret"></div>`;
71-
// let parent = document.getElementById(`${this.page.getId()}`);
7271
document.body.innerHTML += html;
7372

7473
this.setPos(this.row, this.col);

js/index.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,17 @@ $(document).ready(function() {
2222
// prevent TAB KEY from switching focus
2323
if(event.keyCode == 9) event.preventDefault();
2424

25-
// detect capslock
25+
// toggle capslock
2626
if (event.originalEvent.getModifierState("CapsLock")) capsLockKey.press();
2727
else capsLockKey.release();
28+
29+
// toggle shiftkey
30+
if(event.shiftKey) shiftKey.press();
31+
else shiftKey.release();
32+
33+
// toggle ctrlKey
34+
if(event.ctrlKey) ctrlKey.press();
35+
else ctrlKey.release();
2836

2937
// handle key pressed
3038
handleKeyDown(page0, event.keyCode);

js/keyboard.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ const handleKeyDown = function(page, keyCode) {
4848
var tmpkey = String.fromCharCode(keyCode);
4949
// console.log(tmpkey + ' ' + keyCode);
5050

51-
// TRIGGER HELPER KEYS: CTRL, SHIFT
52-
if(keyCode == shiftKey.keyCode) {
53-
shiftKey.press();
54-
} else if(keyCode == ctrlKey.keyCode) {
55-
ctrlKey.press();
56-
}
57-
5851
// Ignore Keys --------------------------------------------------------------------
5952
if(keyCode == 20) {}
6053

@@ -139,9 +132,5 @@ const handleKeyDown = function(page, keyCode) {
139132

140133
// KEYUP
141134
const handleKeyUp = function(keyCode) {
142-
if(keyCode == shiftKey.keyCode) {
143-
shiftKey.release();
144-
} else if(keyCode == ctrlKey.keyCode) {
145-
ctrlKey.release();
146-
}
135+
147136
}

js/page.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Page.prototype = {
1818
return this.width;
1919
},
2020
setWidth: function(width) {
21-
document.getElementById("page").style.width = `${width}px`;
21+
document.getElementById(`${this.id}`).style.width = `${width}px`;
2222
},
2323
getHeight: function() {
2424
return this.height;
2525
},
2626
setHeight: function(height) {
27-
document.getElementById("page").style.height = `${height}`;
27+
document.getElementById(`${this.id}`).style.height = `${height}`;
2828
},
2929

3030
getLineRef: function(lineNum) {

0 commit comments

Comments
 (0)