diff options
Diffstat (limited to 'pkg/gui/remotes_panel.go')
| -rw-r--r-- | pkg/gui/remotes_panel.go | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkg/gui/remotes_panel.go b/pkg/gui/remotes_panel.go index 3f11ec47a..137a7545e 100644 --- a/pkg/gui/remotes_panel.go +++ b/pkg/gui/remotes_panel.go @@ -80,9 +80,8 @@ func (gui *Gui) handleRemoteEnter() error { } func (gui *Gui) handleAddRemote(g *gocui.Gui, v *gocui.View) error { - branchesView := gui.getBranchesView() - return gui.prompt(branchesView, gui.Tr.SLocalize("newRemoteName"), "", func(remoteName string) error { - return gui.prompt(branchesView, gui.Tr.SLocalize("newRemoteUrl"), "", func(remoteUrl string) error { + return gui.prompt(gui.Tr.SLocalize("newRemoteName"), "", func(remoteName string) error { + return gui.prompt(gui.Tr.SLocalize("newRemoteUrl"), "", func(remoteUrl string) error { if err := gui.GitCommand.AddRemote(remoteName, remoteUrl); err != nil { return err } @@ -98,10 +97,8 @@ func (gui *Gui) handleRemoveRemote(g *gocui.Gui, v *gocui.View) error { } return gui.ask(askOpts{ - returnToView: v, - returnFocusOnClose: true, - title: gui.Tr.SLocalize("removeRemote"), - prompt: gui.Tr.SLocalize("removeRemotePrompt") + " '" + remote.Name + "'?", + title: gui.Tr.SLocalize("removeRemote"), + prompt: gui.Tr.SLocalize("removeRemotePrompt") + " '" + remote.Name + "'?", handleConfirm: func() error { if err := gui.GitCommand.RemoveRemote(remote.Name); err != nil { return err @@ -113,7 +110,6 @@ func (gui *Gui) handleRemoveRemote(g *gocui.Gui, v *gocui.View) error { } func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error { - branchesView := gui.getBranchesView() remote := gui.getSelectedRemote() if remote == nil { return nil @@ -126,7 +122,7 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error { }, ) - return gui.prompt(branchesView, editNameMessage, "", func(updatedRemoteName string) error { + return gui.prompt(editNameMessage, "", func(updatedRemoteName string) error { if updatedRemoteName != remote.Name { if err := gui.GitCommand.RenameRemote(remote.Name, updatedRemoteName); err != nil { return gui.surfaceError(err) @@ -140,7 +136,7 @@ func (gui *Gui) handleEditRemote(g *gocui.Gui, v *gocui.View) error { }, ) - return gui.prompt(branchesView, editUrlMessage, "", func(updatedRemoteUrl string) error { + return gui.prompt(editUrlMessage, "", func(updatedRemoteUrl string) error { if err := gui.GitCommand.UpdateRemoteUrl(updatedRemoteName, updatedRemoteUrl); err != nil { return gui.surfaceError(err) } |