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

Handle default parameter of executeJavaScript in C++

Browse source
This commit is contained in:
Cheng Zhao 2016-01-13 12:17:56 +08:00
parent 55dfddba77
commit 350c572a8c
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/lib/web-contents.js
View file

@ -100,10 +100,6 @@ wrapWebContents = function(webContents) {
// webContents has been loaded. // webContents has been loaded.
const executeJavaScript = webContents.executeJavaScript; const executeJavaScript = webContents.executeJavaScript;
webContents.executeJavaScript = function(code, hasUserGesture) { webContents.executeJavaScript = function(code, hasUserGesture) {
// TODO(zcbenz): Use default parameter after Chrome 49.
if (hasUserGesture === undefined)
hasUserGesture = false;
if (this.getURL() && !this.isLoading()) if (this.getURL() && !this.isLoading())
return executeJavaScript.call(this, code, hasUserGesture); return executeJavaScript.call(this, code, hasUserGesture);
else else

7
atom/renderer/api/atom_api_web_frame.cc
View file

@ -122,9 +122,12 @@ void WebFrame::InsertText(const std::string& text) {
web_frame_->insertText(blink::WebString::fromUTF8(text)); web_frame_->insertText(blink::WebString::fromUTF8(text));
} }
void WebFrame::ExecuteJavaScript(const base::string16& code, bool by_user) { void WebFrame::ExecuteJavaScript(const base::string16& code,
mate::Arguments* args) {
bool has_user_gesture = false;
args->GetNext(&has_user_gesture);
scoped_ptr<blink::WebScopedUserGesture> gesture( scoped_ptr<blink::WebScopedUserGesture> gesture(
by_user ? new blink::WebScopedUserGesture : nullptr); has_user_gesture ? new blink::WebScopedUserGesture : nullptr);
web_frame_->executeScriptAndReturnValue(blink::WebScriptSource(code)); web_frame_->executeScriptAndReturnValue(blink::WebScriptSource(code));
} }

2
atom/renderer/api/atom_api_web_frame.h
View file

@ -64,7 +64,7 @@ class WebFrame : public mate::Wrappable {
void InsertText(const std::string& text); void InsertText(const std::string& text);
// Excecuting scripts. // Excecuting scripts.
void ExecuteJavaScript(const base::string16& code, bool by_user); void ExecuteJavaScript(const base::string16& code, mate::Arguments* args);
// mate::Wrappable: // mate::Wrappable:
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(