Merge branch 'user_alexey' PRDEV-930 #review

invigos · Jun 1, 2016 · 838736f · 838736f
2 parents 4fc7fae + 1d97ac6
commit 838736f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/firepad.js b/lib/firepad.js
@@ -460,12 +460,18 @@ firepad.Firepad = (function (global) {
 
     Firepad.prototype.cut = function () {
         var doc = this.codeMirror_.doc;
-        this.copyText = doc.getSelection();
-        doc.replaceSelection('');
+        var selection = doc.getSelection();
+        if (selection) {
+            this.copyText = selection;
+            doc.replaceSelection('');
+        }
     };
     Firepad.prototype.copy = function () {
         var doc = this.codeMirror_.doc;
-        this.copyText = doc.getSelection();
+        var selection = doc.getSelection();
+        if (selection) {
+            this.copyText = selection;
+        }
     };
     Firepad.prototype.paste = function () {
         var cm = this.codeMirror_,