Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

Added loadURL and setProxy functionality #307

Open
true-zero wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Added loadURL and setProxy functionality #307

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
06b1059
Update window.go
true-zero Feb 3, 2021
561d79a
Update event.go
true-zero Feb 3, 2021
ac43ee1
Update window.go
true-zero Feb 4, 2021
5592ea6
Update event.go
true-zero Feb 4, 2021
4b8bf96
Update window.go
true-zero Feb 4, 2021
82a7730
Fix go.mod
true-zero Apr 19, 2021
a2b9bf1
Added intercept string protocol
true-zero Apr 20, 2021
793a155
Added get url
true-zero Apr 28, 2021
676e5d9
Update paths.go
true-zero Apr 28, 2021
1e8cb1c
Update default version
true-zero Apr 28, 2021
3778268
updated download source
true-zero May 7, 2021
782b557
include v
true-zero May 7, 2021
dbf2bb5
allow deletion of the listener
true-zero Jun 21, 2021
51a41f6
add unregister protocol
true-zero Jun 21, 2021
793fe09
remove unnecessary code
true-zero Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type Event struct {
Username string `json:"username,omitempty"`
WindowID string `json:"windowId,omitempty"`
WindowOptions *WindowOptions `json:"windowOptions,omitempty"`
Proxy *WindowProxyOptions `json:"proxy,omitempty"`
Copy link
Copy Markdown
Owner

@asticode asticode Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move this field upwards so that fields are sorted alphabetically?

}

// EventAuthInfo represents an event auth info
Expand Down
22 changes: 22 additions & 0 deletions window.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ const (
EventNameWindowCmdWebContentsCloseDevTools = "window.cmd.web.contents.close.dev.tools"
EventNameWindowCmdWebContentsOpenDevTools = "window.cmd.web.contents.open.dev.tools"
EventNameWindowCmdWebContentsExecuteJavaScript = "window.cmd.web.contents.execute.javascript"
EventNameWindowCmdWebContentsSetProxy = "window.cmd.web.contents.set.proxy"
EventNameWindowCmdLoadURL = "window.cmd.load.url"
Copy link
Copy Markdown
Owner

@asticode asticode Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move this field upwards so that fields are sorted alphabetically?

EventNameWindowEventBlur = "window.event.blur"
EventNameWindowEventClosed = "window.event.closed"
EventNameWindowEventDidFinishLoad = "window.event.did.finish.load"
Expand All @@ -54,8 +56,10 @@ const (
EventNameWindowEventUnresponsive = "window.event.unresponsive"
EventNameWindowEventDidGetRedirectRequest = "window.event.did.get.redirect.request"
EventNameWindowEventWebContentsExecutedJavaScript = "window.event.web.contents.executed.javascript"
EventNameWindowEventWebContentsSetProxy = "window.event.web.contents.set.proxy"
EventNameWindowEventWillNavigate = "window.event.will.navigate"
EventNameWindowEventUpdatedCustomOptions = "window.event.updated.custom.options"
EventNameWindowLoadedURL = "window.event.loaded.url"
Copy link
Copy Markdown
Owner

@asticode asticode Feb 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name should be EventNameWindowEventLoadedURL (with Event in the middle)

Also could you move this field upwards so that fields are sorted alphabetically?

)

// Title bar styles
Expand Down Expand Up @@ -534,6 +538,24 @@ func (w *Window) Unmaximize() (err error) {
return
}

// Loads the url
func (w *Window) LoadURL(url string) (err error) {
if err = w.ctx.Err(); err != nil {
return
}
_, err = synchronousEvent(w.ctx, w, w.w, Event{Name: EventNameWindowCmdLoadURL, TargetID: w.id, URL: url}, EventNameWindowLoadedURL)
return
}

// Sets the proxy
func (w *Window) SetProxy(proxy *WindowProxyOptions) (err error) {
if err = w.ctx.Err(); err != nil {
return
}
_, err = synchronousEvent(w.ctx, w, w.w, Event{Name: EventNameWindowCmdWebContentsSetProxy, TargetID: w.id, Proxy: proxy}, EventNameWindowEventWebContentsSetProxy)
return
}

// UpdateCustomOptions updates the window custom options
func (w *Window) UpdateCustomOptions(o WindowCustomOptions) (err error) {
if err = w.ctx.Err(); err != nil {
Expand Down
⚡