MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-14 17:51:44 +03:00
Code Issues Projects Releases Wiki Activity

Remove old label editing code from showBug

Browse Source
This commit is contained in:
Luke Adams 2018-10-04 13:30:04 -06:00
parent 59658bb98e
commit da1af34584
1 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
termui/show_bug.go
View File

@ -95,13 +95,7 @@ func (sb *showBug) layout(g *gocui.Gui) error {
}
v.Clear()
fmt.Fprintf(v, "[q] Save and return [←↓↑→,hjkl] Navigation ")
if sb.isOnSide {
fmt.Fprint(v, "[a] Add label [r] Remove label")
} else {
fmt.Fprint(v, "[o] Toggle open/close [e] Edit [c] Comment [t] Change title")
}
fmt.Fprintf(v, "[q] Save and return [←↓↑→,hjkl] Navigation [o] Toggle open/close [e] Edit [c] Comment [t] Change title")
_, err = g.SetViewOnTop(showBugInstructionView)
if err != nil {
@ -190,16 +184,6 @@ func (sb *showBug) keybindings(g *gocui.Gui) error {
return err
}
// Labels
if err := g.SetKeybinding(showBugView, 'a', gocui.ModNone,
sb.addLabel); err != nil {
return err
}
if err := g.SetKeybinding(showBugView, 'r', gocui.ModNone,
sb.removeLabel); err != nil {
return err
}
return nil
}
@ -658,61 +642,3 @@ func (sb *showBug) editLabels(g *gocui.Gui, snap *bug.Snapshot) error {
ui.labelSelect.SetBug(sb.cache, sb.bug)
return ui.activateWindow(ui.labelSelect)
}
func (sb *showBug) addLabel(g *gocui.Gui, v *gocui.View) error {
c := ui.inputPopup.Activate("Add labels")
go func() {
input := <-c
labels := strings.FieldsFunc(input, func(r rune) bool {
return r == ' ' || r == ','
})
_, err := sb.bug.ChangeLabels(trimLabels(labels), nil)
if err != nil {
ui.msgPopup.Activate(msgPopupErrorTitle, err.Error())
}
g.Update(func(gui *gocui.Gui) error {
return nil
})
}()
return nil
}
func (sb *showBug) removeLabel(g *gocui.Gui, v *gocui.View) error {
c := ui.inputPopup.Activate("Remove labels")
go func() {
input := <-c
labels := strings.FieldsFunc(input, func(r rune) bool {
return r == ' ' || r == ','
})
_, err := sb.bug.ChangeLabels(nil, trimLabels(labels))
if err != nil {
ui.msgPopup.Activate(msgPopupErrorTitle, err.Error())
}
g.Update(func(gui *gocui.Gui) error {
return nil
})
}()
return nil
}
func trimLabels(labels []string) []string {
var result []string
for _, label := range labels {
trimmed := strings.TrimSpace(label)
if len(trimmed) > 0 {
result = append(result, trimmed)
}
}
return result
}