github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-24 14:57:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move "nodeintegration" and "plugins" to web-view-attributes

Browse Source
This commit is contained in:
Cheng Zhao
2014-12-09 14:51:35 -08:00
parent 68381e1b76
commit 9d23cce2b6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/browser/lib/guest-view-manager.coffee
View File

@@ -87,7 +87,7 @@ attachGuest = (embedder, elementInstanceId, guestInstanceId, params) ->
destroyGuest oldGuestInstanceId
webViewManager.addGuest guestInstanceId, elementInstanceId, embedder, guest,
nodeIntegration: params.nodeIntegration
nodeIntegration: params.nodeintegration
plugins: params.plugins
preloadUrl: params.preload ? ''

2
atom/renderer/lib/web-view/web-view-attributes.coffee
View File

@@ -170,6 +170,8 @@ WebViewImpl::setupWebViewAttributes = ->
@attributes[webViewConstants.ATTRIBUTE_PARTITION] = new PartitionAttribute(this)
@attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this)
@attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this)
@attributes[webViewConstants.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(webViewConstants.ATTRIBUTE_NODEINTEGRATION, this)
@attributes[webViewConstants.ATTRIBUTE_PLUGINS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_PLUGINS, this)
autosizeAttributes = [
webViewConstants.ATTRIBUTE_MAXHEIGHT

2
atom/renderer/lib/web-view/web-view.coffee
View File

@@ -180,8 +180,6 @@ class WebViewImpl
params =
instanceId: @viewInstanceId
userAgentOverride: @userAgentOverride
nodeIntegration: @webviewNode.hasAttribute webViewConstants.ATTRIBUTE_NODEINTEGRATION
plugins: @webviewNode.hasAttribute webViewConstants.ATTRIBUTE_PLUGINS
for attributeName, attribute of @attributes
params[attributeName] = attribute.getValue()
if @webviewNode.hasAttribute webViewConstants.ATTRIBUTE_PRELOAD