Skip to content

Remove dynamic placeholders in the search bar #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lieuwex wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Remove dynamic placeholders in the search bar #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 0 additions & 64 deletions client/app/components/searchBar/searchBar.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,5 @@
CACHE_TIMEOUT = ms.minutes 10

# improve placeholders

placeholders = [
'Samenvattingen voor %class%'
'Woordenlijsten voor %class%'
'%class% Projecten'
'%class% Powerpoint H%num%'
'samenvatting %class% H%num%'
'%class% project H%num%'
'%name%'
]
fallbackClasses = [
'Nederlands'
'Engels'
'Wiskunde'
'Lichamelijke opvoeding'
]
fallbackNames = [
'Piet'
'Piet Jansen'
'Maria'
'Isaac'
'Josephine'
]

getClassName = ->
currentLesson = Helpers.embox ScheduleFunctions.currentLesson
c = (
if currentLesson?
currentLesson.class()
else
_.sample classes().fetch()
)
if c?
if _.random(1) then c.name else c.abbreviations[0]
else
_.sample fallbackClasses

getName = ->
user = _.sample Meteor.users.find({
_id: $ne: Meteor.userId()
'profile.firstName': $ne: ''
}, {
fields:
_id: 1
'profile.firstName': 1
'profile.lastName': 1
transform: null
}).fetch()

if user?
s = user.profile.firstName
s += " #{user.profile.lastName}" if _.random 1
s
else
_.sample fallbackNames

cache = {}
_fetch = _.throttle ((query, callback) ->
Meteor.apply 'search', [ query ],
Expand Down Expand Up @@ -104,13 +47,6 @@ route = (query, d) ->

Meteor.call 'search.analytics.store', query, d._id

Template.searchBar.helpers
placeholder: ->
_.sample(placeholders)
.replace '%class%', getClassName
.replace '%num%', _.random 1, 15
.replace '%name%', getName

Template.searchBar.events
'keyup input': (event) ->
query = event.target.value
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/searchBar/searchBar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="searchBar">
<i class="fa fa-search"></i>
<input
type="search" placeholder="{{placeholder}}"
type="search" placeholder="Zoeken"
spellcheck="on" autocomplete="off"
/>
</div>
Expand Down