Merge pull request #8 from carbonblack/allow-copy-paste

Allow pasting on windows
kobra-dev · Nov 27, 2017 · 5c52eb0 · 5c52eb0
2 parents 9502267 + 8dcaee9
commit 5c52eb0
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 21 deletions.
diff --git a/dist/dist-min.tar.gz b/dist/dist-min.tar.gz
diff --git a/dist/dist-min.zip b/dist/dist-min.zip
diff --git a/dist/dist-min/react-console.min.js b/dist/dist-min/react-console.min.js
diff --git a/dist/dist-min/react-console.min.js.map b/dist/dist-min/react-console.min.js.map
diff --git a/dist/dist.tar.gz b/dist/dist.tar.gz
diff --git a/dist/dist.zip b/dist/dist.zip
diff --git a/dist/dist/react-console.js b/dist/dist/react-console.js
diff --git a/dist/dist/react-console.js.map b/dist/dist/react-console.js.map
diff --git a/lib/react-console.js b/lib/react-console.js
diff --git a/lib/react-console.js.map b/lib/react-console.js.map
diff --git a/src/react-console.tsx b/src/react-console.tsx
@@ -484,8 +484,9 @@ 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();