Skip to content
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = {
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
'tests/dummy/app/**',
],
parserOptions: {
sourceType: 'script',
Expand Down
14 changes: 7 additions & 7 deletions addon/components/power-select-typeahead.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ export default Component.extend({
onkeydown: () => {},

// CPs
concatenatedTriggerClasses: computed('triggerClass', function() {
concatenatedTriggerClasses: computed('triggerClass', function () {
let classes = ['ember-power-select-typeahead-trigger'];
let passedClass = this.get('triggerClass');
let passedClass = this.triggerClass;
if (passedClass) {
classes.push(passedClass);
}
return classes.join(' ');
}),

concatenatedDropdownClasses: computed('dropdownClass', function() {
concatenatedDropdownClasses: computed('dropdownClass', function () {
let classes = ['ember-power-select-typeahead-dropdown'];
let passedClass = this.get('dropdownClass');
let passedClass = this.dropdownClass;
if (passedClass) {
classes.push(passedClass);
}
Expand All @@ -33,7 +33,7 @@ export default Component.extend({

actions: {
onKeyDown(select, e) {
let action = this.get('onkeydown');
let action = this.onkeydown;

// if user passes `onkeydown` action
if (action && action(select, e) === false) {
Expand All @@ -44,6 +44,6 @@ export default Component.extend({
select.actions.choose(null);
}
}
}
}
},
},
});
20 changes: 11 additions & 9 deletions addon/components/power-select-typeahead/trigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default Component.extend({
*/
didReceiveAttrs() {
this._super(...arguments);
let oldSelect = this.get('oldSelect');
let newSelect = this.set('oldSelect', this.get('select'));
let oldSelect = this.oldSelect;
let newSelect = this.set('oldSelect', this.select);
if (!oldSelect) {
return;
}
Expand All @@ -28,7 +28,9 @@ export default Component.extend({
* the select box.
*/
if (oldSelect.isOpen && !newSelect.isOpen && newSelect.searchText) {
let input = document.querySelector(`#ember-power-select-typeahead-input-${newSelect.uniqueId}`);
let input = document.querySelector(
`#ember-power-select-typeahead-input-${newSelect.uniqueId}`
);
let newText = this.getSelectedAsText();
if (input.value !== newText) {
input.value = newText;
Expand Down Expand Up @@ -74,23 +76,23 @@ export default Component.extend({
e.stopPropagation();
return;
}
let isLetter = e.keyCode >= 48 && e.keyCode <= 90 || e.keyCode === 32; // Keys 0-9, a-z or SPACE
let isLetter = (e.keyCode >= 48 && e.keyCode <= 90) || e.keyCode === 32; // Keys 0-9, a-z or SPACE
// if isLetter, escape or enter, prevent parent handlers from being notified
if (isLetter || [13, 27].indexOf(e.keyCode) > -1) {
let select = this.get('select');
let select = this.select;
// open if loading msg configured
if (!select.isOpen && this.get('loadingMessage')) {
if (!select.isOpen && this.loadingMessage) {
schedule('actions', null, select.actions.open);
}
e.stopPropagation();
}

// optional, passed from power-select
let onkeydown = this.get('onKeydown');
let onkeydown = this.onKeydown;
if (onkeydown && onkeydown(e) === false) {
return false;
}
}
},
},

/**
Expand All @@ -113,5 +115,5 @@ export default Component.extend({
value = '';
}
return value;
}
},
});
2 changes: 1 addition & 1 deletion app/components/power-select-typeahead.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-power-select-typeahead/components/power-select-typeahead';
export { default } from 'ember-power-select-typeahead/components/power-select-typeahead';
2 changes: 1 addition & 1 deletion app/components/power-select-typeahead/trigger.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default } from 'ember-power-select-typeahead/components/power-select-typeahead/trigger';
export { default } from 'ember-power-select-typeahead/components/power-select-typeahead/trigger';
6 changes: 3 additions & 3 deletions config/deploy.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = function() {
module.exports = function () {
return {
pagefront: {
app: 'ember-power-select-typeahead',
key: process.env.PAGEFRONT_KEY
}
key: process.env.PAGEFRONT_KEY,
},
};
};
4 changes: 2 additions & 2 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module.exports = async function () {
name: 'ember-3.11',
npm: {
devDependencies: {
'ember-source': '~3.11.1'
}
'ember-source': '~3.11.1',
},
},
name: 'ember-lts-3.20',
npm: {
Expand Down
8 changes: 4 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
module.exports = {
name: 'ember-power-select-typeahead',

contentFor: function(type, config) {
var emberPowerSelect = this.addons.filter(function(addon) {
contentFor: function (type, config) {
var emberPowerSelect = this.addons.filter(function (addon) {
return addon.name === 'ember-power-select';
})[0]
})[0];
return emberPowerSelect.contentFor(type, config);
}
},
};
44 changes: 23 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:*",
"test": "npm-run-all test:*",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
Expand All @@ -29,39 +29,40 @@
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@embroider/test-setup": "^0.43.5",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.11.3",
"ember-cli": "~3.28.3",
"ember-auto-import": "^2.4.2",
"ember-cli": "~4.6.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "~6.1.2",
"ember-cli-sass": "~11.0.1",
"ember-cli-sri": "^2.1.0",
"ember-cli-terser": "^4.0.2",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-page-title": "^6.2.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.4",
"ember-resolver": "^8.0.2",
"ember-source": "~3.28.0",
"ember-source": "~4.6.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^1.4.0",
"ember-template-lint": "^4.11.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.0.5",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.1",
"eslint-plugin-qunit": "^6.2.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"loader.js": "^4.2.3",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"qunit": "^2.16.0",
"qunit-dom": "^1.6.0"
"qunit-dom": "^1.6.0",
"sass": "^1.49.8"
},
"keywords": [
"ember-addon",
Expand All @@ -70,10 +71,11 @@
"typeahead"
],
"dependencies": {
"@ember-decorators/component": "^6.0.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-htmlbars": "^5.7.1",
"ember-power-select": "^4.1.3"
"@ember-decorators/component": "^6.1.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.1.0",
"ember-power-select": "^5.0.4",
"webpack": "^5.74.0"
},
"ember": {
"edition": "octane"
Expand Down
16 changes: 8 additions & 8 deletions tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const numbers = [
'seventeen',
'eighteen',
'nineteen',
'twenty'
'twenty',
];

const users = [
Expand All @@ -35,7 +35,7 @@ const users = [
{ name: 'Kirill' },
{ name: 'Stuart' },
{ name: 'Jamie' },
{ name: 'Matteo' }
{ name: 'Matteo' },
];
const extra = { labelPath: 'name' };

Expand All @@ -57,11 +57,11 @@ export default Controller.extend({
},

searchAsync(term) {
return new RSVP.Promise(function(resolve) {
return new RSVP.Promise(function (resolve) {
if (term.length === 0) {
resolve([]);
} else {
later(function() {
later(function () {
resolve(numbers.filter((num) => num.indexOf(term) > -1));
}, 600);
}
Expand All @@ -70,15 +70,15 @@ export default Controller.extend({

searchUsersAsync(term) {
// return users.filter(u => u.name.indexOf(term) > -1);
return new RSVP.Promise(function(resolve) {
return new RSVP.Promise(function (resolve) {
if (term.length === 0) {
resolve([]);
} else {
later(function() {
later(function () {
resolve(users.filter((u) => u.name.indexOf(term) > -1));
}, 600);
}
});
}
}
},
},
});
Loading