From 1615bcd922b47796563623a64414192ca7d2f83f Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 3 Jun 2021 16:16:30 -0300 Subject: [PATCH] move cut copy and paste functions to NavWindow --- navigator/navigator.js | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/navigator/navigator.js b/navigator/navigator.js index 0e5868d..9f24f92 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -759,22 +759,15 @@ class NavContextMenu { } cut() { - this.nav_window_ref.clip_board = [...this.nav_window_ref.selected_entries]; - this.nav_window_ref.copy_or_move = "move"; - this.nav_window_ref.paste_cwd = this.nav_window_ref.pwd().path_str(); - this.menu_options["paste"].style.display = "block"; + this.nav_window_ref.cut(); } copy() { - this.nav_window_ref.clip_board = [...this.nav_window_ref.selected_entries]; - this.nav_window_ref.copy_or_move = "copy"; - this.nav_window_ref.paste_cwd = this.nav_window_ref.pwd().path_str(); - this.menu_options["paste"].style.display = "block"; + this.nav_window_ref.copy(); } paste() { - this.nav_window_ref.paste_clipboard(); - this.hide_paste(); + this.nav_window_ref.paste(); } rename() { @@ -1063,11 +1056,11 @@ class NavWindow { this.select_all(); e.preventDefault(); } else if (e.keyCode === 67 && e.ctrlKey) { - this.context_menu.copy(); + this.copy(); } else if (e.keyCode === 86 && e.ctrlKey) { - this.context_menu.paste(); + this.paste(); } else if (e.keyCode === 88 && e.ctrlKey) { - this.context_menu.cut(); + this.cut(); } break; default: @@ -1427,6 +1420,25 @@ class NavWindow { this.refresh(); } + cut() { + this.clip_board = [...this.selected_entries]; + this.copy_or_move = "move"; + this.paste_cwd = this.pwd().path_str(); + this.context_menu.menu_options["paste"].style.display = "block"; + } + + copy() { + this.clip_board = [...this.selected_entries]; + this.copy_or_move = "copy"; + this.paste_cwd = this.pwd().path_str(); + this.context_menu.menu_options["paste"].style.display = "block"; + } + + paste() { + this.paste_clipboard(); + this.context_menu.hide_paste(); + } + async paste_clipboard() { this.start_load(); this.context_menu.hide_paste();