Merge branch 'master' into test

This commit is contained in:
Jesse Duffield 2019-06-18 20:39:19 +10:00
commit 32ede4ec70
2 changed files with 2 additions and 2 deletions

View file

@ -28,7 +28,7 @@ jobs:
name: Compile project on every platform name: Compile project on every platform
command: | command: |
go get github.com/mitchellh/gox go get github.com/mitchellh/gox
gox -parallel 10 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64" gox -parallel 10 -os "linux freebsd" -osarch "darwin/i386 darwin/amd64"
- save_cache: - save_cache:
key: pkg-cache-{{ checksum "Gopkg.lock" }}-v4 key: pkg-cache-{{ checksum "Gopkg.lock" }}-v4
paths: paths:

View file

@ -293,7 +293,7 @@ func (gui *Gui) focusPointInView(view *gocui.View) error {
"images": {selectedLine: gui.State.Panels.Images.SelectedLine, lineCount: len(gui.DockerCommand.Images)}, "images": {selectedLine: gui.State.Panels.Images.SelectedLine, lineCount: len(gui.DockerCommand.Images)},
"volumes": {selectedLine: gui.State.Panels.Volumes.SelectedLine, lineCount: len(gui.DockerCommand.Volumes)}, "volumes": {selectedLine: gui.State.Panels.Volumes.SelectedLine, lineCount: len(gui.DockerCommand.Volumes)},
"services": {selectedLine: gui.State.Panels.Services.SelectedLine, lineCount: len(gui.DockerCommand.Services)}, "services": {selectedLine: gui.State.Panels.Services.SelectedLine, lineCount: len(gui.DockerCommand.Services)},
"menu": listViewState{selectedLine: gui.State.Panels.Menu.SelectedLine, lineCount: gui.State.MenuItemCount}, "menu": {selectedLine: gui.State.Panels.Menu.SelectedLine, lineCount: gui.State.MenuItemCount},
} }
if state, ok := listViews[view.Name()]; ok { if state, ok := listViews[view.Name()]; ok {