Skip to content
This repository was archived by the owner on Nov 10, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions addon/components/hyper-search.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ export default Component.extend({
debounceRate: 0,
endpoint: null,
resultKey: null,
resultsArray: null,
placeholder: null,
resultsAreVisible: false,

init() {
this._super(...arguments);
this._cache = {};
this.results = emberArray();
this.set('register-as', this);
},

willDestroyElement() {
Expand Down Expand Up @@ -86,6 +89,7 @@ export default Component.extend({

fetch(query) {
if (isBlank(query) || (query.length < get(this, 'minQueryLength'))) {
this.set('results', []);
return reject();
}

Expand Down Expand Up @@ -117,6 +121,12 @@ export default Component.extend({
url: get(this, 'endpoint'),
data: { q: query }
})
.then(results => {
if (get(this, 'resultsArray')) {
results = results[get(this, 'resultsArray')];
}
return results;
})
.then(resolve, reject);
});
},
Expand Down Expand Up @@ -146,13 +156,29 @@ export default Component.extend({
}
},

resultsAreAvailable : Ember.computed('results', function () {
return get(this, 'results').length > 0;
}),

actions: {

clear () {
this.set('results', emberArray());
},

search(_event, query) {
debounce(this, '_search', query, get(this, 'debounceRate'), true);
},

selectResult(result) {
this._handleAction('selectResult', result);
if (this.get('clearOnSelect')) {
this.set('results', emberArray());
}
},

toggleResults () {
this.toggleProperty('resultsAreVisible');
}
}
});
21 changes: 21 additions & 0 deletions addon/helpers/format-result.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Ember from 'ember';
const {
get,
isPresent
} = Ember;

export function formatResult(params) {
let [keys, result] = params;
if (isPresent(keys) && isPresent(result)) {
keys = keys.split(/([^a-z0-9_$])/gi).filter(x => x).map(key => {
return (key && !/([^a-z0-9_$])/gi.test(key) && get(result, key.trim())) || key
});
return keys.join('');
} else {
let error = [[keys,'Keys'],[result, 'Result']].filter(x => x[0]).map(x => x[1]).join(', and ');
console.warn(`HYPER-SEARCH::Missing ${error}`);
return "";
}
}

export default Ember.Helper.helper(formatResult);
36 changes: 22 additions & 14 deletions addon/templates/components/hyper-search.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,27 @@
type="text"
placeholder=placeholder
update=(action "search")
autocomplete="off"
onblur=(action 'clear')
}}
<ul class="hypersearch-results">
{{#each results as |result|}}
<li class="hypersearch-result">
<span {{action "selectResult" result on="click"}}>
{{#if resultKey}}
{{get result resultKey}}
{{else}}
{{result}}
{{/if}}
</span>
</li>
{{/each}}
</ul>
{{#if resultsAreAvailable}}
<ul class="hypersearch-results">
{{#each results as |result|}}
<li class="hypersearch-result" {{action "selectResult" result on="mouseDown"}}>
<span>
{{#if resultKey}}
{{format-result format (get result resultKey) }}
{{else}}
{{#if format}}
{{format-result format result}}
{{else}}
{{result}}
{{/if}}
{{/if}}
</span>
</li>
{{/each}}
</ul>
{{/if}}
</form>
{{/if}}
{{/if}}
1 change: 1 addition & 0 deletions app/helpers/format-result.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'ember-hypersearch/helpers/format-result';
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-hypersearch",
"version": "0.2.0",
"version": "0.2.2",
"description": "Hyperspeed real-time search with caching",
"directories": {
"doc": "doc",
Expand Down Expand Up @@ -46,9 +46,9 @@
"ember-addon"
],
"dependencies": {
"ember-cli-babel": "^5.1.5",
"ember-cli-babel": "^6.11.0",
"ember-cli-htmlbars": "^1.0.1",
"ember-one-way-controls": "^1.1.2"
"ember-one-way-controls": "3.1.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down