diff options
| author | Stefan <stefan@stefans-entwicklerecke.de> | 2015-04-13 17:27:37 +0200 |
|---|---|---|
| committer | Stefan <stefan@stefans-entwicklerecke.de> | 2015-04-13 17:27:37 +0200 |
| commit | 24b0712d77abb91ebea2d67f06f565861ec008f0 (patch) | |
| tree | 8e7f6d9010151984ecfd99c133b6c23e163aaf5d /src/static/js/ace2_inner.js | |
| parent | cc34f4e325830f798321b8152095c4dccd6b465f (diff) | |
| parent | 64d94cb3464303a2564ee8dca28b2a872c30d650 (diff) | |
| download | etherpad-lite-24b0712d77abb91ebea2d67f06f565861ec008f0.zip | |
Merge new release into master branch!
Diffstat (limited to 'src/static/js/ace2_inner.js')
| -rw-r--r-- | src/static/js/ace2_inner.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index cf062d26..1120b2c1 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -1923,7 +1923,11 @@ function Ace2Inner(){ if (charsLeft === 0) { var index = 0; - browser.msie = false; // Temp fix to resolve enter and backspace issues.. + + if (browser.msie && parseInt(browser.version) >= 11) { + browser.msie = false; // Temp fix to resolve enter and backspace issues.. + // Note that this makes MSIE behave like modern browsers.. + } if (browser.msie && line == (rep.lines.length() - 1) && lineNode.childNodes.length === 0) { // best to stay at end of last empty div in IE @@ -4955,7 +4959,10 @@ function Ace2Inner(){ // Don't paste on middle click of links $(root).on("paste", function(e){ - if(e.target.a){ + // TODO: this breaks pasting strings into URLS when using + // Control C and Control V -- the Event is never available + // here.. :( + if(e.target.a || e.target.localName === "a"){ e.preventDefault(); } }) |