lib/downloader.js - Issue 29801558: Issue 6737 - Use String.includes instead of String.indexOf

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/downloader.js

Issue 29801558: Issue 6737 - Use String.includes instead of String.indexOf (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/

Patch Set: Replace more instances Created June 7, 2018, 9:51 a.m.

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

Jump to:

Index: lib/downloader.js

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

--- a/lib/downloader.js

+++ b/lib/downloader.js

@@ -202,17 +202,17 @@

* @param {Downloadable} downloadable

* @return {string}

getDownloadUrl(downloadable)

{

const {addonName, addonVersion, application, applicationVersion,

platform, platformVersion} = require("info");

let url = downloadable.redirectURL || downloadable.url;

- if (url.indexOf("?") >= 0)

+ if (url.includes("?"))

url += "&";

else

url += "?";

// We limit the download count to 4+ to keep the request anonymized

let {downloadCount} = downloadable;

if (downloadCount > 4)

downloadCount = "4+";

url += "addonName=" + encodeURIComponent(addonName) +

« no previous file with comments | « lib/common.js ('k') | lib/filterClasses.js » ('j') | no next file with comments »