lib/filterValidation.js - Issue 29338107: Issue 3771 - Update adblockpluscore dependency and adapt filter validation

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: lib/filterValidation.js

Issue 29338107: Issue 3771 - Update adblockpluscore dependency and adapt filter validation (Closed)

Patch Set: Updated adblockplus dependecy and import new strings Created March 11, 2016, 3:29 p.m.

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

Jump to:

Index: lib/filterValidation.js

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

--- a/lib/filterValidation.js

+++ b/lib/filterValidation.js

@@ -18,6 +18,7 @@

/** @module filterValidation */

let {Filter, InvalidFilter, ElemHideBase} = require("filterClasses");

+let {Utils} = require("utils");

/**

* An error returned by

@@ -64,10 +65,14 @@

toString: function()

{

- let message = this.reason || ext.i18n.getMessage(

- this.type.replace(/-/g, "_"),

- "selector" in this ? "'" + this.selector + "'" : null

- );

+ let message;

+ if (this.reason)

+ message = Utils.getString(this.reason);

+ else

+ message = ext.i18n.getMessage(

+ this.type.replace(/-/g, "_"),

+ "selector" in this ? "'" + this.selector + "'" : null

+ );

if (this.lineno)

message = ext.i18n.getMessage("line", this.lineno.toLocaleString()) + ": " + message;

« no previous file with comments | « dependencies ('k') | metadata.common » ('j') | no next file with comments »