src/Notification.cpp - Issue 29417624: Issue 5034 - Part 4: JsEngine::Evaluate() return a JsValue

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: src/Notification.cpp

Issue 29417624: Issue 5034 - Part 4: JsEngine::Evaluate() return a JsValue (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/

Patch Set: Created April 19, 2017, 6:18 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: src/Notification.cpp

===================================================================

--- a/src/Notification.cpp

+++ b/src/Notification.cpp

@@ -64,17 +64,17 @@

NotificationType Notification::GetType() const

{

return StringToNotificationType(GetProperty("type").AsString());

}

NotificationTexts Notification::GetTexts() const

{

- JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*this);

+ JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts").Call(*this);

NotificationTexts notificationTexts;

JsValue jsTitle = jsTexts.GetProperty("title");

if (jsTitle.IsString())

{

notificationTexts.title = jsTitle.AsString();

}

JsValue jsMessage = jsTexts.GetProperty("message");

if (jsMessage.IsString())

@@ -97,10 +97,10 @@

{

retValue.push_back(link.AsString());

}

return retValue;

}

void Notification::MarkAsShown()

{

- jsEngine->Evaluate("API.markNotificationAsShown")->Call(GetProperty("id"));

+ jsEngine->Evaluate("API.markNotificationAsShown").Call(GetProperty("id"));

}