summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2014-08-13 18:06:57 +0200
committerjmoenig <jens@moenig.org>2014-08-13 18:06:57 +0200
commit8f7d1833f6e6b304e706bb84848dbf86a80834c8 (patch)
tree215afe7d637b82daa0d97e457275e5fee8f0e2a9
parent130e105ea34f92429397611ee5f01a75f25438f6 (diff)
downloadsnap-8f7d1833f6e6b304e706bb84848dbf86a80834c8.tar.gz
snap-8f7d1833f6e6b304e706bb84848dbf86a80834c8.zip
Fix #563 (Paste into Chrome), thanks, @Muon, for the hint!
-rwxr-xr-xhistory.txt1
-rw-r--r--morphic.js5
2 files changed, 4 insertions, 2 deletions
diff --git a/history.txt b/history.txt
index 7d60971..d18452e 100755
--- a/history.txt
+++ b/history.txt
@@ -2261,3 +2261,4 @@ ______
140813
------
* Threads, Blocks: enable Zombiefication of JS-Functions
+* Morphic: Fix #563 (Paste into Chrome), thanks, @Muon, for the hint!
diff --git a/morphic.js b/morphic.js
index 2bbdd4e..2a242f2 100644
--- a/morphic.js
+++ b/morphic.js
@@ -1035,7 +1035,7 @@
/*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
FileList, getBlurredShadowSupport*/
-var morphicVersion = '2014-July-29';
+var morphicVersion = '2014-August-13';
var modules = {}; // keep track of additional loaded modules
var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
@@ -10321,7 +10321,8 @@ WorldMorph.prototype.initEventListeners = function () {
}
event.preventDefault();
}
- if (event.ctrlKey || event.metaKey) {
+ if ((event.ctrlKey || event.metaKey) &&
+ (event.keyIdentifier !== 'U+0056')) { // allow pasting-in
event.preventDefault();
}
},