projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9f18a6e
)
:art: Remove extra returns
author
Kevin Sawicki
<kevinsawicki@gmail.com>
Thu, 3 Nov 2016 16:51:01 +0000
(09:51 -0700)
committer
Kevin Sawicki
<kevinsawicki@gmail.com>
Thu, 3 Nov 2016 16:51:01 +0000
(09:51 -0700)
lib/browser/api/web-contents.js
patch
|
blob
|
history
diff --git
a/lib/browser/api/web-contents.js
b/lib/browser/api/web-contents.js
index 695ec8a4092d80d44240376e27e0b02af8b3e5b1..d363bb051b8bafa972c9b142901bd2501453b0c5 100644
(file)
--- a/
lib/browser/api/web-contents.js
+++ b/
lib/browser/api/web-contents.js
@@
-113,9
+113,12
@@
const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
return new Promise((resolve, reject) => {
this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args)
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, error, result) {
- if (callback && !error) callback(result)
- if (error) return reject(error)
- return resolve(result)
+ if (error == null) {
+ if (callback != null) callback(result)
+ resolve(result)
+ } else {
+ reject(error)
+ }
})
})
}