commons_go/chromedp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing bad merge from last commit

Browse Source
This commit is contained in:
Kenneth Shaw 2017-02-22 20:57:02 +07:00
parent 35dfe7af26
commit 320373de1a
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
nav.go
View File

@ -41,31 +41,35 @@ func NavigateToHistoryEntry(entryID int64) Action {
} }
// NavigateBack navigates the current frame backwards in its history. // NavigateBack navigates the current frame backwards in its history.
func NavigateBack(ctxt context.Context, h cdp.Handler) error { func NavigateBack() Action {
cur, entries, err := page.GetNavigationHistory().Do(ctxt, h) return ActionFunc(func(ctxt context.Context, h cdp.Handler) error {
if err != nil { cur, entries, err := page.GetNavigationHistory().Do(ctxt, h)
return err if err != nil {
} return err
}
if cur <= 0 || cur > int64(len(entries)-1) { if cur <= 0 || cur > int64(len(entries)-1) {
return errors.New("invalid navigation entry") return errors.New("invalid navigation entry")
} }
return page.NavigateToHistoryEntry(entries[cur-1].ID).Do(ctxt, h) return page.NavigateToHistoryEntry(entries[cur-1].ID).Do(ctxt, h)
})
} }
// NavigateForward navigates the current frame forwards in its history. // NavigateForward navigates the current frame forwards in its history.
func NavigateForward(ctxt context.Context, h cdp.Handler) error { func NavigateForward() Action {
cur, entries, err := page.GetNavigationHistory().Do(ctxt, h) return ActionFunc(func(ctxt context.Context, h cdp.Handler) error {
if err != nil { cur, entries, err := page.GetNavigationHistory().Do(ctxt, h)
return err if err != nil {
} return err
}
if cur < 0 || cur >= int64(len(entries)-1) { if cur < 0 || cur >= int64(len(entries)-1) {
return errors.New("invalid navigation entry") return errors.New("invalid navigation entry")
} }
return page.NavigateToHistoryEntry(entries[cur+1].ID).Do(ctxt, h) return page.NavigateToHistoryEntry(entries[cur+1].ID).Do(ctxt, h)
})
} }
// Stop stops all navigation and pending resource retrieval. // Stop stops all navigation and pending resource retrieval.