mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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 destroyGuest oldGuestInstanceId
webViewManager.addGuest guestInstanceId, elementInstanceId, embedder, guest, webViewManager.addGuest guestInstanceId, elementInstanceId, embedder, guest,
nodeIntegration: params.nodeIntegration nodeIntegration: params.nodeintegration
plugins: params.plugins plugins: params.plugins
preloadUrl: params.preload ? '' 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_PARTITION] = new PartitionAttribute(this)
@attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this) @attributes[webViewConstants.ATTRIBUTE_SRC] = new SrcAttribute(this)
@attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(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 = [ autosizeAttributes = [
webViewConstants.ATTRIBUTE_MAXHEIGHT webViewConstants.ATTRIBUTE_MAXHEIGHT

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

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