Merge pull request #8412 from rhysd/patch-4

github-electron: Improve executeJavaScript API following Electron v0.36.10 and compliant fixes
This commit is contained in:
Masahiro Wakame
2016-03-10 22:46:16 +09:00
3 changed files with 10 additions and 7 deletions
+2 -2
View File
@@ -636,7 +636,7 @@ declare module Electron {
* Evaluates code in page.
* @param code Code to evaluate.
*/
executeJavaScript(code: string): void;
executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
/**
* Executes Edit -> Undo command in page.
*/
@@ -1597,7 +1597,7 @@ declare module Electron {
* invoked by a gesture from the user. Setting `userGesture` to `true` will remove
* this limitation.
*/
executeJavaScript(code: string, userGesture?: boolean): void;
executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void;
}
// Type definitions for main process