Replace "Url" in API names with "URL"
This commit is contained in:
parent
8f56387bd9
commit
fbb8e61958
57 changed files with 251 additions and 212 deletions
|
@ -5,14 +5,14 @@ requestId = 0
|
|||
WEB_VIEW_EVENTS =
|
||||
'load-commit': ['url', 'isMainFrame']
|
||||
'did-finish-load': []
|
||||
'did-fail-load': ['errorCode', 'errorDescription', 'validatedUrl']
|
||||
'did-fail-load': ['errorCode', 'errorDescription', 'validatedURL']
|
||||
'did-frame-finish-load': ['isMainFrame']
|
||||
'did-start-loading': []
|
||||
'did-stop-loading': []
|
||||
'did-get-response-details': ['status', 'newUrl', 'originalUrl',
|
||||
'did-get-response-details': ['status', 'newURL', 'originalURL',
|
||||
'httpResponseCode', 'requestMethod', 'referrer',
|
||||
'headers']
|
||||
'did-get-redirect-request': ['oldUrl', 'newUrl', 'isMainFrame']
|
||||
'did-get-redirect-request': ['oldURL', 'newURL', 'isMainFrame']
|
||||
'dom-ready': []
|
||||
'console-message': ['level', 'message', 'line', 'sourceId']
|
||||
'new-window': ['url', 'frameName', 'disposition', 'options']
|
||||
|
|
|
@ -6,7 +6,7 @@ webViewConstants = require './web-view-constants'
|
|||
|
||||
# Helper function to resolve url set in attribute.
|
||||
a = document.createElement 'a'
|
||||
resolveUrl = (url) ->
|
||||
resolveURL = (url) ->
|
||||
a.href = url
|
||||
a.href
|
||||
|
||||
|
@ -116,7 +116,7 @@ class SrcAttribute extends WebViewAttribute
|
|||
|
||||
getValue: ->
|
||||
if @webViewImpl.webviewNode.hasAttribute @name
|
||||
resolveUrl @webViewImpl.webviewNode.getAttribute(@name)
|
||||
resolveURL @webViewImpl.webviewNode.getAttribute(@name)
|
||||
else
|
||||
''
|
||||
|
||||
|
@ -178,7 +178,7 @@ class SrcAttribute extends WebViewAttribute
|
|||
if useragent then opts.userAgent = useragent
|
||||
|
||||
guestContents = remote.getGuestWebContents(@webViewImpl.guestInstanceId)
|
||||
guestContents.loadUrl @getValue(), opts
|
||||
guestContents.loadURL @getValue(), opts
|
||||
|
||||
# Attribute specifies HTTP referrer.
|
||||
class HttpReferrerAttribute extends WebViewAttribute
|
||||
|
@ -197,7 +197,7 @@ class PreloadAttribute extends WebViewAttribute
|
|||
|
||||
getValue: ->
|
||||
return '' unless @webViewImpl.webviewNode.hasAttribute @name
|
||||
preload = resolveUrl @webViewImpl.webviewNode.getAttribute(@name)
|
||||
preload = resolveURL @webViewImpl.webviewNode.getAttribute(@name)
|
||||
protocol = preload.substr 0, 5
|
||||
unless protocol is 'file:'
|
||||
console.error webViewConstants.ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{webFrame, remote} = require 'electron'
|
||||
{deprecate, webFrame, remote} = require 'electron'
|
||||
v8Util = process.atomBinding 'v8_util'
|
||||
|
||||
guestViewInternal = require './guest-view-internal'
|
||||
|
@ -252,49 +252,49 @@ registerWebViewElement = ->
|
|||
|
||||
# Public-facing API methods.
|
||||
methods = [
|
||||
"getUrl"
|
||||
"getTitle"
|
||||
"isLoading"
|
||||
"isWaitingForResponse"
|
||||
"stop"
|
||||
"reload"
|
||||
"reloadIgnoringCache"
|
||||
"canGoBack"
|
||||
"canGoForward"
|
||||
"canGoToOffset"
|
||||
"clearHistory"
|
||||
"goBack"
|
||||
"goForward"
|
||||
"goToIndex"
|
||||
"goToOffset"
|
||||
"isCrashed"
|
||||
"setUserAgent"
|
||||
"getUserAgent"
|
||||
"executeJavaScript"
|
||||
"insertCSS"
|
||||
"openDevTools"
|
||||
"closeDevTools"
|
||||
"isDevToolsOpened"
|
||||
"inspectElement"
|
||||
"setAudioMuted"
|
||||
"isAudioMuted"
|
||||
"undo"
|
||||
"redo"
|
||||
"cut"
|
||||
"copy"
|
||||
"paste"
|
||||
"pasteAndMatchStyle"
|
||||
"delete"
|
||||
"selectAll"
|
||||
"unselect"
|
||||
"replace"
|
||||
"replaceMisspelling"
|
||||
"send"
|
||||
"getId"
|
||||
"inspectServiceWorker"
|
||||
"print"
|
||||
"printToPDF"
|
||||
"sendInputEvent"
|
||||
'getURL'
|
||||
'getTitle'
|
||||
'isLoading'
|
||||
'isWaitingForResponse'
|
||||
'stop'
|
||||
'reload'
|
||||
'reloadIgnoringCache'
|
||||
'canGoBack'
|
||||
'canGoForward'
|
||||
'canGoToOffset'
|
||||
'clearHistory'
|
||||
'goBack'
|
||||
'goForward'
|
||||
'goToIndex'
|
||||
'goToOffset'
|
||||
'isCrashed'
|
||||
'setUserAgent'
|
||||
'getUserAgent'
|
||||
'executeJavaScript'
|
||||
'insertCSS'
|
||||
'openDevTools'
|
||||
'closeDevTools'
|
||||
'isDevToolsOpened'
|
||||
'inspectElement'
|
||||
'setAudioMuted'
|
||||
'isAudioMuted'
|
||||
'undo'
|
||||
'redo'
|
||||
'cut'
|
||||
'copy'
|
||||
'paste'
|
||||
'pasteAndMatchStyle'
|
||||
'delete'
|
||||
'selectAll'
|
||||
'unselect'
|
||||
'replace'
|
||||
'replaceMisspelling'
|
||||
'send'
|
||||
'getId'
|
||||
'inspectServiceWorker'
|
||||
'print'
|
||||
'printToPDF'
|
||||
'sendInputEvent'
|
||||
]
|
||||
|
||||
# Forward proto.foo* method calls to WebViewImpl.foo*.
|
||||
|
@ -304,6 +304,9 @@ registerWebViewElement = ->
|
|||
internal.webContents[m] args...
|
||||
proto[m] = createHandler m for m in methods
|
||||
|
||||
# Deprecated.
|
||||
deprecate.rename proto, 'getUrl', 'getURL'
|
||||
|
||||
window.WebView = webFrame.registerEmbedderCustomElement 'webview',
|
||||
prototype: proto
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue