diff options
Diffstat (limited to 'tour.go')
| -rw-r--r-- | tour.go | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -49,10 +49,10 @@ func parseURLs(state *BrowserState, defaultScheme, str string) ([]*url.URL, erro return []*url.URL{u}, nil } -func TourAdd(state *BrowserState, conf *Config, targets []string) error { +func TourAdd(state *BrowserState, targets []string) error { newurls := []*url.URL{} for _, target := range targets { - urls, err := parseURLs(state, conf.DefaultScheme, target) + urls, err := parseURLs(state, state.DefaultScheme, target) if err != nil { return err } @@ -69,10 +69,10 @@ func TourAdd(state *BrowserState, conf *Config, targets []string) error { return Print(state) } -func TourAddNext(state *BrowserState, conf *Config, targets []string) error { +func TourAddNext(state *BrowserState, targets []string) error { newurls := []*url.URL{} for _, target := range targets { - urls, err := parseURLs(state, conf.DefaultScheme, target) + urls, err := parseURLs(state, state.DefaultScheme, target) if err != nil { return err } @@ -113,7 +113,7 @@ func TourShow(state *BrowserState) error { return Print(state) } -func TourNext(state *BrowserState, conf *Config) error { +func TourNext(state *BrowserState) error { tour := state.CurrentTour if tour.Index >= len(tour.Links) || len(tour.Links) == 0 { return ErrEndOfTour @@ -121,10 +121,10 @@ func TourNext(state *BrowserState, conf *Config) error { page := tour.Links[tour.Index] tour.Index += 1 - return Navigate(state, page, -1, conf) + return Navigate(state, page, -1) } -func TourPrevious(state *BrowserState, conf *Config) error { +func TourPrevious(state *BrowserState) error { tour := state.CurrentTour if tour.Index <= 0 { return ErrStartOfTour @@ -135,7 +135,7 @@ func TourPrevious(state *BrowserState, conf *Config) error { } page := tour.Links[tour.Index-1] - return Navigate(state, page, -1, conf) + return Navigate(state, page, -1) } func TourClear(state *BrowserState) error { @@ -173,7 +173,7 @@ func TourList(state *BrowserState) error { return Print(state) } -func TourGo(state *BrowserState, conf *Config, pos string) error { +func TourGo(state *BrowserState, pos string) error { tour := state.CurrentTour i, _ := strconv.Atoi(pos) @@ -182,7 +182,7 @@ func TourGo(state *BrowserState, conf *Config, pos string) error { } tour.Index = i + 1 - return Navigate(state, tour.Links[i], -1, conf) + return Navigate(state, tour.Links[i], -1) } func TourSelect(state *BrowserState, name string) error { |