go/ferret
1
0
Fork 0
mirror of https://github.com/MontFerret/ferret.git synced 2025-10-30 23:37:40 +02:00
Code Issues Releases Activity

Fixes (#187)

Browse Source
This commit is contained in:
Tim Voronov
2018-11-21 22:45:00 -05:00
committed by GitHub
parent d94a2fb004
commit 1af1cc2486
18 changed files with 285 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/stdlib/html/inner_html.go
View File

@@ -7,12 +7,12 @@ import (
"github.com/MontFerret/ferret/pkg/runtime/values"
)
// InnerHTML Returns inner HTML string of a matched element
// InnerHTML Returns inner HTML string of a given or matched by CSS selector element
// @param doc (Document|Element) - Parent document or element.
// @param selector (String) - String of CSS selector.
// @param selector (String, optional) - String of CSS selector.
// @returns (String) - Inner HTML string if an element found, otherwise empty string.
func InnerHTML(_ context.Context, args ...core.Value) (core.Value, error) {
err := core.ValidateArgs(args, 2, 2)
err := core.ValidateArgs(args, 1, 2)
if err != nil {
return values.EmptyString, err
@@ -24,13 +24,18 @@ func InnerHTML(_ context.Context, args ...core.Value) (core.Value, error) {
return values.None, err
}
node := args[0].(values.HTMLNode)
if len(args) == 1 {
return node.InnerHTML(), nil
}
err = core.ValidateType(args[1], core.StringType)
if err != nil {
return values.None, err
}
node := args[0].(values.HTMLNode)
selector := args[1].(values.String)
return node.InnerHTMLBySelector(selector), nil

15
pkg/stdlib/html/inner_text.go
View File

@@ -7,12 +7,12 @@ import (
"github.com/MontFerret/ferret/pkg/runtime/values"
)
// InnerText returns inner text of a matched element
// InnerText returns inner text string of a given or matched by CSS selector element
// @param doc (HTMLDocument|HTMLElement) - Parent document or element.
// @param selector (String) - String of CSS selector.
// @param selector (String, optional) - String of CSS selector.
// @returns (String) - Inner text if an element found, otherwise empty string.
func InnerText(_ context.Context, args ...core.Value) (core.Value, error) {
err := core.ValidateArgs(args, 2, 2)
err := core.ValidateArgs(args, 1, 2)
if err != nil {
return values.EmptyString, err
@@ -24,14 +24,19 @@ func InnerText(_ context.Context, args ...core.Value) (core.Value, error) {
return values.None, err
}
node := args[0].(values.HTMLNode)
if len(args) == 1 {
return node.InnerText(), nil
}
err = core.ValidateType(args[1], core.StringType)
if err != nil {
return values.None, err
}
doc := args[0].(values.HTMLNode)
selector := args[1].(values.String)
return doc.InnerTextBySelector(selector), nil
return node.InnerTextBySelector(selector), nil
}