go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-11-23 21:54:45 +02:00
Code Issues Releases Activity

Refactored methods (#376)

Browse Source 
* Refactored methods

* Fixed errors provided by go vet
This commit is contained in:
Tim Voronov
2019-09-06 23:15:27 -04:00
committed by GitHub
parent c773509469
commit 24370d8178
11 changed files with 65 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/stdlib/html/focus.go
View File

@@ -2,6 +2,7 @@ package html
import (
"context"
"github.com/MontFerret/ferret/pkg/drivers"
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
@@ -17,22 +18,15 @@ func Focus(ctx context.Context, args ...core.Value) (core.Value, error) {
return values.None, err
}
// Document with selector
if len(args) == 2 {
doc, err := drivers.ToDocument(args[0])
if err != nil {
return values.None, err
}
return values.None, doc.FocusBySelector(ctx, values.ToString(args[1]))
}
el, err := drivers.ToElement(args[0])
if err != nil {
return values.None, err
}
return values.None, el.Focus(ctx)
if len(args) == 1 {
return values.None, el.Focus(ctx)
}
return values.None, el.FocusBySelector(ctx, values.ToString(args[1]))
}

62
pkg/stdlib/html/hover.go
View File

@@ -20,63 +20,21 @@ func Hover(ctx context.Context, args ...core.Value) (core.Value, error) {
return values.None, err
}
// page or document or element
err = core.ValidateType(args[0], drivers.HTMLPageType, drivers.HTMLDocumentType, drivers.HTMLElementType)
el, err := drivers.ToElement(args[0])
if err != nil {
return values.None, err
}
selector := values.EmptyString
if len(args) > 1 {
err = core.ValidateType(args[1], types.String)
if err != nil {
return values.None, err
}
selector = args[1].(values.String)
}
switch n := args[0].(type) {
case drivers.HTMLPage:
if selector == values.EmptyString {
return values.None, core.Error(core.ErrMissedArgument, "selector")
}
return values.None, n.GetMainFrame().MoveMouseBySelector(ctx, selector)
case drivers.HTMLDocument:
if selector == values.EmptyString {
return values.None, core.Error(core.ErrMissedArgument, "selector")
}
return values.None, n.MoveMouseBySelector(ctx, selector)
case drivers.HTMLElement:
if selector == values.EmptyString {
return values.None, n.Hover(ctx)
}
found, err := n.QuerySelector(ctx, selector)
if err != nil {
return values.None, err
}
if found == values.None {
return values.None, core.Errorf(core.ErrNotFound, "element by selector %s", selector)
}
el, ok := found.(drivers.HTMLElement)
if !ok {
return values.None, core.Errorf(core.ErrNotFound, "element by selector %s", selector)
}
defer el.Close()
if len(args) == 1 {
return values.None, el.Hover(ctx)
default:
return values.None, core.TypeError(n.Type(), drivers.HTMLDocumentType, drivers.HTMLElementType)
}
err = core.ValidateType(args[1], types.String)
if err != nil {
return values.None, err
}
return values.None, el.HoverBySelector(ctx, values.ToString(args[1]))
}

43
pkg/stdlib/html/select.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/MontFerret/ferret/pkg/drivers"
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
"github.com/MontFerret/ferret/pkg/runtime/values/types"
)
// Select selects a value from an underlying select element.
@@ -21,46 +20,20 @@ func Select(ctx context.Context, args ...core.Value) (core.Value, error) {
return values.None, err
}
arg1 := args[0]
err = core.ValidateType(arg1, drivers.HTMLPageType, drivers.HTMLDocumentType, drivers.HTMLElementType)
el, err := drivers.ToElement(args[0])
if err != nil {
return values.False, err
return values.None, err
}
if arg1.Type() == drivers.HTMLPageType || arg1.Type() == drivers.HTMLDocumentType {
doc, err := drivers.ToDocument(arg1)
if len(args) == 2 {
arr := values.ToArray(ctx, args[1])
if err != nil {
return values.None, err
}
// selector
arg2 := args[1]
err = core.ValidateType(arg2, types.String)
if err != nil {
return values.False, err
}
arg3 := args[2]
err = core.ValidateType(arg3, types.Array)
if err != nil {
return values.False, err
}
return doc.SelectBySelector(ctx, arg2.(values.String), arg3.(*values.Array))
return el.Select(ctx, arr)
}
el := arg1.(drivers.HTMLElement)
arg2 := args[1]
selector := values.ToString(args[1])
arr := values.ToArray(ctx, args[2])
err = core.ValidateType(arg2, types.Array)
if err != nil {
return values.False, err
}
return el.Select(ctx, arg2.(*values.Array))
return el.SelectBySelector(ctx, selector, arr)
}