Merge branch 'master' into 713_dblclick_word_separators

README.md

@@ -36,6 +36,7 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**RStudio**](https://www.rstudio.com/products/RStudio "RStudio"): RStudio is an integrated development environment (IDE) for R.
 - [**Terminal for Atom**](https://github.com/jsmecham/atom-terminal-tab): A simple terminal for the Atom text editor.
 - [**Eclipse Orion**](https://orionhub.org): A modern, open source software development environment that runs in the cloud. Code, deploy and run in the cloud.
+- [**Gravitational Teleport**](https://github.com/gravitational/teleport): Gravitational Teleport is a modern SSH server for remotely accessing clusters of Linux servers via SSH or HTTPS.
 
 Do you use xterm.js in your application as well? Please [open a Pull Request](https://github.com/sourcelair/xterm.js/pulls) to include it here. We would love to have it in our list.
 

src/handlers/Clipboard.test.ts

@@ -9,6 +9,6 @@ describe('evaluatePastedTextProcessing', function () {
           windowsProcessedText = Clipboard.prepareTextForTerminal(pastedText, true);
 
     assert.equal(processedText, 'foo\r\nbar\r\n');
-    assert.equal(windowsProcessedText, 'foo\nbar\n');
+    assert.equal(windowsProcessedText, 'foo\rbar\r');
   });
 });

src/handlers/Clipboard.ts

@@ -22,7 +22,7 @@ declare var window: IWindow;
  */
 export function prepareTextForTerminal(text: string, isMSWindows: boolean): string {
   if (isMSWindows) {
-    return text.replace(/\r?\n/g, '\n');
+    return text.replace(/\r?\n/g, '\r');
   }
   return text;
 }