diff options
| -rw-r--r-- | bin/loadTesting/README | 4 | ||||
| -rw-r--r-- | src/package.json | 2 | ||||
| -rw-r--r-- | src/static/js/ace2_inner.js | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/bin/loadTesting/README b/bin/loadTesting/README index 6a778664..2246f7eb 100644 --- a/bin/loadTesting/README +++ b/bin/loadTesting/README @@ -1,3 +1,7 @@ +This is the new load testing file: https://bitbucket.org/rbraakman/etherpad-stresstest + +BELOW is the original load testing file. + This load tester is extremely useful for testing how many dormant clients can connect to etherpad lite. TODO: diff --git a/src/package.json b/src/package.json index aa2a4516..03df87f9 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "require-kernel" : "1.0.5", "resolve" : "0.2.x", "socket.io" : "0.9.x", - "ueberDB" : "0.1.9", + "ueberDB" : "0.1.91", "async" : "0.1.x", "express" : "3.x", "connect" : "2.4.x", diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index c48be1bc..8209c9bf 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3561,6 +3561,11 @@ function Ace2Inner(){ var isModKey = ((!charCode) && ((type == "keyup") || (type == "keydown")) && (keyCode == 16 || keyCode == 17 || keyCode == 18 || keyCode == 20 || keyCode == 224 || keyCode == 91)); if (isModKey) return; + // If the key is a keypress and the browser is opera and the key is enter, do nothign at all as this fires twice. + if (keyCode == 13 && browser.opera && (type == "keypress")){ + return; // This stops double enters in Opera but double Tabs still show on single tab keypress, adding keyCode == 9 to this doesn't help as the event is fired twice + } + var specialHandled = false; var isTypeForSpecialKey = ((browser.msie || browser.safari) ? (type == "keydown") : (type == "keypress")); var isTypeForCmdKey = ((browser.msie || browser.safari) ? (type == "keydown") : (type == "keypress")); @@ -4651,10 +4656,7 @@ function Ace2Inner(){ function bindTheEventHandlers() { $(document).on("keydown", handleKeyEvent); - // Hack for Opera to stop it firing twice on events - if ($.browser.opera){ - $(document).on("keypress", handleKeyEvent); - } + $(document).on("keypress", handleKeyEvent); $(document).on("keyup", handleKeyEvent); $(document).on("click", handleClick); $(root).on("blur", handleBlur); |