Unified Diff: src/GlobalJsObject.cpp
Issue 29416603:
Issue 5034 - Part 2: Have NewCallback() return a plain JsValue (Closed)
Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set:
Created April 18, 2017, 9:18 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/FileSystemJsObject.cpp ('k')
|
src/JsEngine.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/GlobalJsObject.cpp |
| =================================================================== |
| --- a/src/GlobalJsObject.cpp |
| +++ b/src/GlobalJsObject.cpp |
| @@ -66,18 +66,18 @@ |
| jsEngine->TriggerEvent(eventName, converted); |
| return v8::Undefined(); |
| } |
| } |
| JsValue& GlobalJsObject::Setup(JsEngine& jsEngine, const AppInfo& appInfo, |
| JsValue& obj) |
| { |
| - obj.SetProperty("setTimeout", *jsEngine.NewCallback(::SetTimeoutCallback)); |
| - obj.SetProperty("_triggerEvent", *jsEngine.NewCallback(::TriggerEventCallback)); |
| + obj.SetProperty("setTimeout", jsEngine.NewCallback(::SetTimeoutCallback)); |
| + obj.SetProperty("_triggerEvent", jsEngine.NewCallback(::TriggerEventCallback)); |
| obj.SetProperty("_fileSystem", |
| FileSystemJsObject::Setup(jsEngine, *jsEngine.NewObject())); |
| obj.SetProperty("_webRequest", |
| WebRequestJsObject::Setup(jsEngine, *jsEngine.NewObject())); |
| obj.SetProperty("console", |
| ConsoleJsObject::Setup(jsEngine, *jsEngine.NewObject())); |
| obj.SetProperty("_appInfo", |
| AppInfoJsObject::Setup(appInfo, *jsEngine.NewObject())); |
« no previous file with comments
|
« src/FileSystemJsObject.cpp ('k')
|
src/JsEngine.cpp » ('j')
|
no next file with comments »
