aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsridhar2013-04-11 13:58:14 (EDT)
committerkwalker2013-04-11 13:58:14 (EDT)
commit98698b96834c74d2c3ca7f5cf221f1a5c16a10d7 (patch)
treec99a94a563991445f12c52bb2016d5d585e00925
parentdccb15e37740c4b1ed90469490861faf85c3cf82 (diff)
downloadorg.eclipse.orion.client-98698b96834c74d2c3ca7f5cf221f1a5c16a10d7.zip
org.eclipse.orion.client-98698b96834c74d2c3ca7f5cf221f1a5c16a10d7.tar.gz
org.eclipse.orion.client-98698b96834c74d2c3ca7f5cf221f1a5c16a10d7.tar.bz2
Bug 391949 - Firefox pops up context menu on Ctrl-Space which is our content assist
-rw-r--r--bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
index 6c57c35..8bb8fe5 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/textView.js
@@ -2651,6 +2651,9 @@ define("orion/editor/textView", ['orion/editor/textModel', 'orion/keyBinding', '
evt.screenY = e.screenY;
this.onContextMenu(evt);
preventDefault = evt.defaultPrevented;
+ } else if (util.isMac && util.isFirefox && e.button === 0) {
+ // hack to prevent CTRL+Space from showing the browser context menu
+ preventDefault = true;
}
if (preventDefault) {
if (e.preventDefault) { e.preventDefault(); }