diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2013-03-15 21:43:58 +0100 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2013-03-15 21:43:58 +0100 |
| commit | a31605216fe72b8ae213394385aecee0bfb24ff2 (patch) | |
| tree | 9c7946c3ea5f8ec75cf7929f122dac6d74f5a28b /src/static/js/ace2_inner.js | |
| parent | 844012864ff4a7ecb5b236983578d3e36b915304 (diff) | |
| parent | 54433db47f5083faa921da6050b4e4e4b55dfb20 (diff) | |
| download | etherpad-lite-a31605216fe72b8ae213394385aecee0bfb24ff2.zip | |
Merge branch 'release/1.2.9'
Diffstat (limited to 'src/static/js/ace2_inner.js')
| -rw-r--r-- | src/static/js/ace2_inner.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index b8b59b84..2dc6408b 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3583,7 +3583,7 @@ function Ace2Inner(){ } var specialHandled = false; - var isTypeForSpecialKey = ((browser.msie || browser.safari) ? (type == "keydown") : (type == "keypress")); + var isTypeForSpecialKey = ((browser.msie || browser.safari || browser.chrome) ? (type == "keydown") : (type == "keypress")); var isTypeForCmdKey = ((browser.msie || browser.safari || browser.chrome) ? (type == "keydown") : (type == "keypress")); var stopped = false; @@ -5125,7 +5125,7 @@ function Ace2Inner(){ function initLineNumbers() { lineNumbersShown = 1; - sideDiv.innerHTML = '<table border="0" cellpadding="0" cellspacing="0" align="right">' + '<tr><td id="sidedivinner"><div>1</div></td></tr></table>'; + sideDiv.innerHTML = '<table border="0" cellpadding="0" cellspacing="0" align="right"><tr><td id="sidedivinner"><div>1</div></td></tr></table>'; sideDivInner = outerWin.document.getElementById("sidedivinner"); } |