github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-23 01:59:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4490 from cpradio/options-to-full-search

Browse Source 
FEATURE: search menu options opens full page search
This commit is contained in:
Jeff Atwood 2016-10-12 02:27:05 +02:00 committed by GitHub
commit f73f4fa2e2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/controllers/full-page-search.js.es6
View File

@ -18,9 +18,10 @@ export default Ember.Controller.extend({
bulkSelectEnabled: null, bulkSelectEnabled: null,
loading: Em.computed.not("model"), loading: Em.computed.not("model"),
queryParams: ["q", "context_id", "context", "skip_context"], queryParams: ["q", "isExpanded", "context_id", "context", "skip_context"],
q: null, q: null,
selected: [], selected: [],
isExpanded: false,
context_id: null, context_id: null,
context: null, context: null,
searching: false, searching: false,

2
app/assets/javascripts/discourse/routes/full-page-search.js.es6
View File

@ -5,7 +5,7 @@ import PreloadStore from 'preload-store';
import { getTransient, setTransient } from 'discourse/lib/page-tracker'; import { getTransient, setTransient } from 'discourse/lib/page-tracker';
export default Discourse.Route.extend({ export default Discourse.Route.extend({
queryParams: { q: {}, context_id: {}, context: {}, skip_context: {} }, queryParams: { q: {}, isExpanded: false, context_id: {}, context: {}, skip_context: {} },
model(params) { model(params) {
const cached = getTransient('lastSearch'); const cached = getTransient('lastSearch');

2
app/assets/javascripts/discourse/widgets/search-menu-controls.js.es6
View File

@ -44,7 +44,7 @@ createWidget('search-context', {
])); ]));
} }
result.push(this.attach('link', { action: 'showSearchHelp', result.push(this.attach('link', { href: '/search?isExpanded=true',
label: 'show_help', label: 'show_help',
className: 'show-help' })); className: 'show-help' }));
result.push(h('div.clearfix')); result.push(h('div.clearfix'));