Skip to content

Commit

Permalink
remove matrix build
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanley Stuart committed Mar 10, 2016
1 parent c6f02d1 commit 95e9d47
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 17 deletions.
13 changes: 1 addition & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@ cache:
directories:
- node_modules

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
- "npm config set spin false"
Expand All @@ -31,4 +20,4 @@ install:
- bower install

script:
- ember try $EMBER_TRY_SCENARIO test
- ember try:testall
5 changes: 2 additions & 3 deletions addon/components/x-option.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,13 @@ export default Ember.Component.extend({
Ember.run.scheduleOnce('afterRender', this, 'registerWithXSelect');
},

parentXSelect: Ember.computed(function() {
select: Ember.computed(function() {
return this.nearestOfType(XSelectComponent);
}),

registerWithXSelect() {
const select = this.get('parentXSelect');
const select = this.get('select');
Ember.assert("x-option component declared without enclosing x-select", !!select);
this.set('select', select);
select.registerOption(this);
},

Expand Down
2 changes: 1 addition & 1 deletion addon/templates/current/components/x-select.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{yield
(hash
option=(component "x-option" parentXSelect=this)
option=(component "x-option" select=this)
)
}}
1 change: 0 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
var EmberApp = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var semver = require('semver');
var app = new EmberApp(defaults, {
// Add options here
});
Expand Down

0 comments on commit 95e9d47

Please sign in to comment.