Display details about the search context in the placeholder

This commit is contained in:
Robin Ward 2013-05-29 12:19:03 -04:00
parent b1bdebd611
commit 4cf1d9c266
7 changed files with 45 additions and 8 deletions

View file

@ -15,7 +15,7 @@ Discourse.Category = Discourse.Model.extend({
}, },
searchContext: function() { searchContext: function() {
return ({ type: 'category', id: this.get('id') }); return ({ type: 'category', id: this.get('id'), category: this });
}.property('id'), }.property('id'),
url: function() { url: function() {

View file

@ -29,7 +29,7 @@ Discourse.User = Discourse.Model.extend({
}).property('username'), }).property('username'),
searchContext: function() { searchContext: function() {
return ({ type: 'user', id: this.get('username_lower') }); return ({ type: 'user', id: this.get('username_lower'), user: this });
}.property('username_lower'), }.property('username_lower'),
/** /**

View file

@ -18,6 +18,9 @@ Discourse.UserRoute = Discourse.Route.extend({
setupController: function(controller, user) { setupController: function(controller, user) {
user.findDetails(); user.findDetails();
// Add a search context
this.controllerFor('search').set('searchContext', user.get('searchContext'));
}, },
activate: function() { activate: function() {
@ -26,9 +29,6 @@ Discourse.UserRoute = Discourse.Route.extend({
Discourse.MessageBus.subscribe("/users/" + user.get('username_lower'), function(data) { Discourse.MessageBus.subscribe("/users/" + user.get('username_lower'), function(data) {
user.loadUserAction(data); user.loadUserAction(data);
}); });
// Add a search context
this.controllerFor('search').set('searchContext', user.get('searchContext'));
}, },
deactivate: function() { deactivate: function() {

View file

@ -1,4 +1,4 @@
{{textField value=term placeholderKey="search.placeholder"}} {{view Discourse.SearchTextField valueBinding="term" searchContextBinding="searchContext"}}
{{#unless loading}} {{#unless loading}}
{{#unless noResults}} {{#unless noResults}}
{{#each resultType in content}} {{#each resultType in content}}

View file

@ -9,13 +9,13 @@
Discourse.TextField = Ember.TextField.extend({ Discourse.TextField = Ember.TextField.extend({
attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus'], attributeBindings: ['autocorrect', 'autocapitalize', 'autofocus'],
placeholder: (function() { placeholder: function() {
if( this.get('placeholderKey') ) { if( this.get('placeholderKey') ) {
return Em.String.i18n(this.get('placeholderKey')); return Em.String.i18n(this.get('placeholderKey'));
} else { } else {
return ''; return '';
} }
}).property('placeholderKey') }.property('placeholderKey')
}); });

View file

@ -0,0 +1,33 @@
/**
This is a text field that supports a dynamic placeholder based on search context.
@class SearchTextField
@extends Discourse.TextField
@namespace Discourse
@module Discourse
**/
Discourse.SearchTextField = Discourse.TextField.extend({
/**
A dynamic placeholder for the search field based on our context
@property placeholder
**/
placeholder: function() {
var ctx = this.get('searchContext');
if (ctx) {
switch(Em.get(ctx, 'type')) {
case 'user':
return Em.String.i18n('search.prefer.user', {username: Em.get(ctx, 'user.username')});
case 'category':
return Em.String.i18n('search.prefer.category', {category: Em.get(ctx, 'category.name')});
}
}
return Em.String.i18n('search.placeholder');
}.property('searchContext')
});

View file

@ -435,6 +435,10 @@ en:
no_results: "No results found." no_results: "No results found."
searching: "Searching ..." searching: "Searching ..."
prefer:
user: "search will prefer results by @{{username}}"
category: "search will prefer results in {{category}}"
site_map: "go to another topic list or category" site_map: "go to another topic list or category"
go_back: 'go back' go_back: 'go back'
current_user: 'go to your user page' current_user: 'go to your user page'