Merge branch 'master' into v0.94

rstudio · Apr 16, 2011 · 6df52c0 · 6df52c0
2 parents 65c2399 + 159995b
commit 6df52c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/console/consoleStyles.css b/src/gwt/src/org/rstudio/studio/client/workbench/views/console/consoleStyles.css
@@ -11,7 +11,7 @@
    border: none;
    outline: none;
    word-wrap: break-word;
-   white-space: pre-wrap;
+   white-space: pre-wrap !important;
    cursor: text;
 }
 .console td {
@@ -21,7 +21,7 @@
 .output {
    outline: none;
    border: none;
-   white-space: pre-wrap;
+   white-space: pre-wrap !important;
    margin: 0;
 }
 .output .command, .input {

diff --git a/...c/org/rstudio/studio/client/workbench/views/source/editors/text/AceCompletionAdapter.java b/...c/org/rstudio/studio/client/workbench/views/source/editors/text/AceCompletionAdapter.java
@@ -56,6 +56,11 @@ private boolean onTextInput(String text)
    {
       if (text == null)
          return false;
+
+      // Escape key comes in as a character on desktop builds
+      if (text.equals("\u001B"))
+         return true;
+
       for (int i = 0; i < text.length(); i++)
          if (completionManager_.previewKeyPress(text.charAt(i)))
             return true;