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

Added INPUT_CLEAR function (#366)

* Added INPUT_CLEAR function

* Fixed linting issue

* Fixed formatting
This commit is contained in:
Tim Voronov
2019-09-01 16:09:35 -04:00
committed by GitHub
parent 2a8135657d
commit af1125c8e9
17 changed files with 1705 additions and 88 deletions

33
pkg/stdlib/html/clear.go Normal file
View File

@@ -0,0 +1,33 @@
package html
import (
"context"
"github.com/MontFerret/ferret/pkg/drivers"
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
)
// InputClear clears a value from an underlying input element.
// @param source (HTMLPage | HTMLDocument | HTMLElement) - Event target.
// @param selector (String, options) - Selector.
func InputClear(ctx context.Context, args ...core.Value) (core.Value, error) {
err := core.ValidateArgs(args, 1, 2)
if err != nil {
return values.None, err
}
el, err := drivers.ToElement(args[0])
if err != nil {
return values.None, err
}
// CLEAR(el)
if len(args) == 1 {
return values.None, el.Clear(ctx)
}
return values.None, el.ClearBySelector(ctx, values.ToString(args[1]))
}

View File

@@ -2,7 +2,6 @@ package html
import (
"context"
"github.com/MontFerret/ferret/pkg/drivers"
"github.com/MontFerret/ferret/pkg/runtime/core"
"github.com/MontFerret/ferret/pkg/runtime/values"
@@ -10,93 +9,74 @@ import (
)
// Input types a value to an underlying input element.
// @param source (Open | GetElement) - Event target.
// @param source (HTMLPage | HTMLDocument | HTMLElement) - Event target.
// @param valueOrSelector (String) - Selector or a value.
// @param value (String) - Target value.
// @param delay (Int, optional) - Waits delay milliseconds between keystrokes
// @param delay (Int, optional) - Target value.
// @returns (Boolean) - Returns true if an element was found.
func Input(ctx context.Context, args ...core.Value) (core.Value, error) {
err := core.ValidateArgs(args, 2, 4)
if err != nil {
return values.None, err
return values.False, 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
}
if arg1.Type() == drivers.HTMLPageType || arg1.Type() == drivers.HTMLDocumentType {
doc, err := drivers.ToDocument(arg1)
delay := values.NewInt(25)
if err != nil {
return values.False, err
}
// INPUT(el, value)
if len(args) == 2 {
return values.True, el.Input(ctx, args[1], delay)
}
// selector
arg2 := args[1]
err = core.ValidateType(arg2, types.String)
var selector values.String
var value core.Value
if err != nil {
return values.False, err
}
// INPUT(el, valueOrSelector, valueOrOpts)
if len(args) == 3 {
switch v := args[2].(type) {
// INPUT(el, value, delay)
case values.Int, values.Float:
value = args[1]
delay = values.ToInt(v)
selector := values.ToString(arg2)
delay := values.Int(0)
if len(args) == 4 {
arg4 := args[3]
err = core.ValidateType(arg4, types.Int)
return values.True, el.Input(ctx, value, delay)
default:
// INPUT(el, selector, value)
err := core.ValidateType(args[1], types.String)
if err != nil {
return values.False, err
}
delay = values.ToInt(arg4)
selector = values.ToString(args[1])
value = args[2]
}
exists, err := doc.ExistsBySelector(ctx, selector)
} else {
// INPUT(el, selector, value, delay)
err := core.ValidateType(args[3], types.Int)
if err != nil {
return values.False, err
}
if !exists {
return values.False, nil
}
return values.True, doc.InputBySelector(ctx, selector, args[2], delay)
delay = values.ToInt(args[3])
}
el, err := drivers.ToElement(arg1)
if err != nil {
return values.None, err
}
delay := values.Int(0)
if len(args) == 3 {
arg3 := args[2]
err = core.ValidateType(arg3, types.Int)
if err != nil {
return values.False, err
}
delay = arg3.(values.Int)
}
err = el.Input(ctx, args[1], delay)
exists, err := el.ExistsBySelector(ctx, selector)
if err != nil {
return values.False, err
}
return values.True, nil
if !exists {
return values.False, nil
}
return values.True, el.InputBySelector(ctx, selector, value, delay)
}

View File

@@ -37,6 +37,7 @@ func RegisterLib(ns core.Namespace) error {
"INNER_TEXT_SET": SetInnerText,
"INNER_TEXT_ALL": GetInnerTextAll,
"INPUT": Input,
"INPUT_CLEAR": InputClear,
"MOUSE": MouseMoveXY,
"NAVIGATE": Navigate,
"NAVIGATE_BACK": NavigateBack,