Skip to content

Commit

Permalink
Merge pull request #9 from carbonblack/revert-8-allow-copy-paste
Browse files Browse the repository at this point in the history
Revert "Allow pasting on windows"
  • Loading branch information
snowak-cb authored Nov 27, 2017
2 parents 5c52eb0 + ac97b39 commit 6a2083f
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 14 deletions.
Binary file modified dist/dist-min.tar.gz
Binary file not shown.
Binary file modified dist/dist-min.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/dist-min/react-console.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dist-min/react-console.min.js.map

Large diffs are not rendered by default.

Binary file modified dist/dist.tar.gz
Binary file not shown.
Binary file modified dist/dist.zip
Binary file not shown.
12 changes: 8 additions & 4 deletions dist/dist/react-console.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/dist/react-console.js.map

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions lib/react-console.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/react-console.js.map

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/react-console.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -484,9 +484,8 @@ export default class extends React.Component<ConsoleProps,ConsoleState> {
if (e.keyCode in ctrlCodes) {
ctrlCodes[e.keyCode]();
e.preventDefault();
}else if(e.keyCode !== 86){ // allow ctrl+v for paste on windows
e.preventDefault();
}
e.preventDefault();
} else if (e.keyCode in keyCodes) {
keyCodes[e.keyCode]();
e.preventDefault();
Expand Down

0 comments on commit 6a2083f

Please sign in to comment.