Merge pull request #114 from sourcelair/fix-copy-nbsp

Stop copying non-breaking spaces into clipboard

diff --git a/src/xterm.js b/src/xterm.js
index a806a03de5ec59c6c77a5f2f2451a3d8461a786d..273fdca5315501b094f81f42e1d7a1353ddc9ded 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -549,17 +549,41 @@
       }, true);
     };
 
+    /**
+     * Prepares text copied from terminal selection, to be saved in the clipboard by:
+     *   1. stripping all trailing white spaces
+     *   2. converting all non-breaking spaces to regular spaces
+     * @param {string} text The copied text that needs processing for storing in clipboard
+     * @returns {string}
+     * @static
+     */
+       Terminal.prepareCopiedTextForClipboard = function (text) {
+      var space = String.fromCharCode(32),
+          nonBreakingSpace = String.fromCharCode(160),
+          allNonBreakingSpaces = new RegExp(nonBreakingSpace, 'g'),
+          processedText = text.split('\n').map(function (line) {
+            /**
+             * Strip all trailing white spaces and convert all non-breaking spaces to regular
+             * spaces.
+             */
+            var processedLine = line.replace(/\s+$/g, '').replace(allNonBreakingSpaces, space);
+
+            return processedLine;
+          }).join('\n');
+
+      return processedText;
+    };
 
     /**
-     * Bind copy event. Stript trailing whitespaces from selection.
+     * Binds copy functionality to the given terminal.
+     * @static
      */
     Terminal.bindCopy = function(term) {
       on(term.element, 'copy', function(ev) {
-        var selectedText = window.getSelection().toString(),
-                                               copiedText = selectedText.split('\n').map(function (element) {
-              return element.replace(/\s+$/g, '');
-            }).join('\n');
-        ev.clipboardData.setData('text/plain', copiedText);
+        var copiedText = window.getSelection().toString(),
+                       text = Terminal.prepareCopiedTextForClipboard(copiedText);
+
+        ev.clipboardData.setData('text/plain', text);
         ev.preventDefault();
       });
     };

diff --git a/test/test.js b/test/test.js
index e603d65fc7fa0b600a506f092e1d6e06f90eb547..ffbc285f73473376d6666348b197d611180f42aa 100644 (file)
--- a/test/test.js
+++ b/test/test.js
@@ -54,4 +54,18 @@ describe('xterm.js', function() {
       assert.equal(xterm.evaluateKeyEscapeSequence({ ctrlKey: true, keyCode: 39 }).key, '\x1b[5C'); // CSI 5 C
     });
   });
+
+  describe('evaluateCopiedTextProcessing', function () {
+    it('should strip trailing whitespaces and replace nbsps with spaces', function () {
+                       var nonBreakingSpace = String.fromCharCode(160),
+          copiedText = 'echo' + nonBreakingSpace + 'hello' + nonBreakingSpace,
+          processedText = Terminal.prepareCopiedTextForClipboard(copiedText);
+
+      // No trailing spaces
+      assert.equal(processedText.match(/\s+$/), null);
+
+      // No non-breaking space
+      assert.equal(processedText.indexOf(nonBreakingSpace), -1);
+    });
+  });
 });