Fix copying text

icewolfz · Aug 19, 2017 · dd6dd6e · dd6dd6e
1 parent dbb3e09
commit dd6dd6e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/build/index.html b/build/index.html
@@ -647,15 +647,14 @@
           c.popup(remote.getCurrentWindow());
       }, false);
 
-      ['cut', 'copy', 'paste'].forEach(function (event) {
+      ['cut', 'copy'].forEach(function (event) {
         document.addEventListener(event, function (e) {
-          if (document.activeElement && (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA")) {
-
-            if ($(document.activeElement).val().length > 0 || !client.display.hasSelection)
-              return;
-          }
-          if (client.display.hasSelection > 0)
+          if (client.display.hasSelection)
+          {
             clipboard.writeText(client.display.selection, 'selection');
+            e.preventDefault();
+            e.stopPropagation();
+          }
         });
       });
 

diff --git a/changelog.md b/changelog.md
@@ -7,6 +7,8 @@
   - Added Current color scheme to reset colors back to original colors
   - Add --disable-gpu command line arg
   - Add linux Categories
+- **Changed:**
+  - Changed how copy system works for main client
 - **Fixed:**
   - When picking a predefined color scheme it was not saving
   - Display scrolling in split view or scroll lock when new text added