aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihai Sucan2011-06-15 15:01:20 (EDT)
committerFelipe Heidrich2011-06-15 15:35:18 (EDT)
commitb2345f9d8d9676d98a5dd1512d33aff2887d1405 (patch)
tree410a36382931793c8b9d0a54961719ebefa56db0
parentd0d8135778479197be294e3d05a04444eedde9eb (diff)
downloadorg.eclipse.orion.client-b2345f9d8d9676d98a5dd1512d33aff2887d1405.zip
org.eclipse.orion.client-b2345f9d8d9676d98a5dd1512d33aff2887d1405.tar.gz
org.eclipse.orion.client-b2345f9d8d9676d98a5dd1512d33aff2887d1405.tar.bz2
Fix for bug 349485.
-rw-r--r--bundles/org.eclipse.orion.client.editor/web/examples/textview/demo.js4
-rw-r--r--bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js12
2 files changed, 9 insertions, 7 deletions
diff --git a/bundles/org.eclipse.orion.client.editor/web/examples/textview/demo.js b/bundles/org.eclipse.orion.client.editor/web/examples/textview/demo.js
index 759516c..683cec3 100644
--- a/bundles/org.eclipse.orion.client.editor/web/examples/textview/demo.js
+++ b/bundles/org.eclipse.orion.client.editor/web/examples/textview/demo.js
@@ -138,7 +138,7 @@ function(mKeyBinding, mTextModel, mTextView, mRulers, mUndoStack, mTextStyler) {
function createJavaScriptSample() {
checkView();
- var file = getFile("/orion/textview/textview.js");
+ var file = getFile("/orion/textview/textView.js");
if (styler) {
styler.destroy();
styler = null;
@@ -196,4 +196,4 @@ function(mKeyBinding, mTextModel, mTextView, mRulers, mUndoStack, mTextStyler) {
document.getElementById("test").onclick = test;
document.getElementById("performanceTest").onclick = performanceTest;
- }); \ No newline at end of file
+ });
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js b/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
index 0bd5b27..983a0b2 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
@@ -8,7 +8,7 @@
* Contributors:
* Felipe Heidrich (IBM Corporation) - initial API and implementation
* Silenio Quarti (IBM Corporation) - initial API and implementation
- * Mihai Sucan (Mozilla Foundation) - fix for Bugs 334583, 348471
+ * Mihai Sucan (Mozilla Foundation) - fix for Bugs 334583, 348471, 349485
******************************************************************************/
/*global window document navigator setTimeout clearTimeout XMLHttpRequest define */
@@ -2747,10 +2747,12 @@ orion.textview.TextView = (function() {
*
* Note that Chrome applies the styles on the Mac with Ctrl instead of Cmd.
*/
- var isMacChrome = isMac && isChrome;
- bindings.push({name: null, keyBinding: new KeyBinding('u', !isMacChrome, false, false, isMacChrome), predefined: true});
- bindings.push({name: null, keyBinding: new KeyBinding('i', !isMacChrome, false, false, isMacChrome), predefined: true});
- bindings.push({name: null, keyBinding: new KeyBinding('b', !isMacChrome, false, false, isMacChrome), predefined: true});
+ if (!isFirefox) {
+ var isMacChrome = isMac && isChrome;
+ bindings.push({name: null, keyBinding: new KeyBinding('u', !isMacChrome, false, false, isMacChrome), predefined: true});
+ bindings.push({name: null, keyBinding: new KeyBinding('i', !isMacChrome, false, false, isMacChrome), predefined: true});
+ bindings.push({name: null, keyBinding: new KeyBinding('b', !isMacChrome, false, false, isMacChrome), predefined: true});
+ }
if (isFirefox) {
bindings.push({name: "copy", keyBinding: new KeyBinding(45, true), predefined: true});