github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 00:07:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

SubredditSelector searches optional.

Browse Source
This commit is contained in:
Brian Simpson
2013-09-19 04:19:37 -04:00
parent c6419bf21d
commit d11a16dee8
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
r2/r2/lib/pages/pages.py
View File

@@ -4253,7 +4253,8 @@ class SubscribeButton(Templated):
class SubredditSelector(Templated):
def __init__(self, default_sr=None, extra_subreddits=None, required=False):
def __init__(self, default_sr=None, extra_subreddits=None, required=False,
include_searches=True):
Templated.__init__(self)
if extra_subreddits:
@@ -4268,9 +4269,13 @@ class SubredditSelector(Templated):
self.default_sr = default_sr
self.required = required
self.sr_searches = simplejson.dumps(
popular_searches(include_over_18=c.over18)
)
if include_searches:
self.sr_searches = simplejson.dumps(
popular_searches(include_over_18=c.over18)
)
else:
self.sr_searches = simplejson.dumps({})
self.include_searches = include_searches
@property
def subreddit_names(self):

4
r2/r2/templates/subredditselector.html
View File

@@ -8,7 +8,9 @@
<div id="sr-autocomplete-area">
<input id="sr-autocomplete" name="sr" type="text"
autocomplete="off"
onkeyup="sr_name_up(event)"
%if thing.include_searches:
onkeyup="sr_name_up(event)"
%endif
onkeydown="return sr_name_down(event)"
onblur="hide_sr_name_list()"
% if thing.default_sr: