options.js - Issue 29339613: Issue 3907 - Make sure that the title of Acceptable Ads subscription used

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: options.js

Issue 29339613: Issue 3907 - Make sure that the title of Acceptable Ads subscription used (Closed)

Patch Set: Created April 8, 2016, 4:47 p.m.

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

Jump to:

Index: options.js

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

--- a/options.js

+++ b/options.js

@@ -65,12 +65,11 @@

Collection.prototype._getItemTitle = function(item, i)

{

- var title = null;

- if (this.details[i].useOriginalTitle)

- title = item.originalTitle;

- if (!title)

- title = item.title || item.url || item.text;

- return title;

+ if (item.url == acceptableAdsUrl)

+ return getMessage("options_acceptableAds_description");

+ if (this.details[i].useOriginalTitle && item.originalTitle)

+ return item.originalTitle;

+ return item.title || item.url || item.text;

};

Collection.prototype.addItems = function()

@@ -872,8 +871,7 @@

acceptableAdsUrl = url;

updateSubscription({

url: acceptableAdsUrl,

- disabled: true,

- title: getMessage("options_acceptableAds_description")

+ disabled: true

});

// Load user subscriptions

« no previous file with comments | « no previous file | no next file » | no next file with comments »