Skip to content

amend typos in keys.lua #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hugeblank wants to merge 2 commits into
base: master
Choose a base branch
from
Open

amend typos in keys.lua #543

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c5d57
amend typo in keys.lua
hugeblank May 8, 2018
afa0021
amend additional typo in keys.lua
hugeblank May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/resources/assets/computercraft/lua/rom/apis/keys.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ local tKeys = {
"comma", "period", "slash", "rightShift","multiply", -- 51
"leftAlt", "space", "capsLock", "f1", "f2", -- 56
"f3", "f4", "f5", "f6", "f7", -- 61
"f8", "f9", "f10", "numLock", "scollLock", -- 66
"f8", "f9", "f10", "numLock", "scrollLock", -- 66
"numPad7", "numPad8", "numPad9", "numPadSubtract","numPad4", -- 71
"numPad5", "numPad6", "numPadAdd","numPad1", "numPad2", -- 76
"numPad3", "numPad0", "numPadDecimal",nil, nil, -- 81
Expand Down Expand Up @@ -53,6 +53,7 @@ for nKey, sKey in pairs( tKeys ) do
keys[sKey] = nKey
end
keys["return"] = keys.enter
keys.scollLock = keys.scrollLock
Copy link
Copy Markdown
Contributor

@Lupus590 Lupus590 May 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might as well change this to keys["scrollLock"] to be consistent with the line above.

Copy link
Copy Markdown
Contributor

@SquidDev SquidDev May 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's only ["return"] because that is a Lua keyword, and so keys.return is invalid syntax.

Copy link
Copy Markdown

@KnightMiner KnightMiner May 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should add a comment here explaining why the old name is kept for after this is merged, something like "typo kept to avoid a breaking change"

Copy link
Copy Markdown
Author

@hugeblank hugeblank May 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about it, I wasn’t sure if it was worth commenting though. I’ll add it when I get the chance.

Copy link
Copy Markdown
Author

@hugeblank hugeblank May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KnightMiner I should mention I did this in the most recent commit.


function getName( _nKey )
if type( _nKey ) ~= "number" then
Expand Down