Skip to content

Commit

Permalink
Update to ember 26
Browse files Browse the repository at this point in the history
  • Loading branch information
crodriguez1a committed Jul 1, 2016
1 parent 85e779f commit ac5327a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
3 changes: 2 additions & 1 deletion addon/components/bulma-column.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export default Ember.Component.extend({
let gridBindings = get(this, 'gridBindings.all');
set(this, 'classNameBindings', ['content'].concat(gridBindings, _responsiveHelpers));
},
didInitAttrs() {
init() {
this._super(...arguments);
this.concatBindings();
}
});
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ember-bulma",
"dependencies": {
"ember": "2.4.1",
"ember": "2.6.1",
"ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.2.1",
"ember-qunit": "0.4.16",
Expand Down
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module.exports = {
name: 'ember-bulma',

init: function(app) {
this._super.init && this._super.init.apply(this, arguments);

this.options = this.options || {};
this.options.babel = this.options.babel || {};
this.options.babel.optional = this.options.babel.optional || [];
Expand Down
19 changes: 9 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
"ember-cli": "^2.4.1",
"ember-cli": "^2.6.1",
"ember-cli-app-version": "^1.0.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "^1.1.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-font-awesome": "2.1.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-ic-ajax": "0.2.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.0.4",
"ember-cli-release": "0.2.8",
"ember-cli-qunit": "^2.1.0",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-sass": "^5.3.1",
"ember-cli-sri": "^1.1.0",
"ember-cli-template-lint": "0.4.7",
Expand All @@ -36,13 +36,12 @@
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-font-awesome": "2.1.1",
"ember-load-initializers": "0.5.1",
"ember-lodash": "0.0.5",
"ember-suave": "2.0.1",
"ember-themed-syntax": "0.0.4",
"ember-themed-syntax": "0.0.6",
"ember-try": "~0.0.8",
"loader.js": "^4.0.3",
"loader.js": "^4.0.10",
"lodash-es": "^4.11.1"
},
"keywords": [
Expand All @@ -57,11 +56,11 @@
"dependencies": {
"broccoli-funnel": "^1.0.1",
"ember-cli-babel": "^5.1.5",
"ember-cli-htmlbars": "^1.0.2",
"ember-cli-htmlbars": "^1.0.8",
"ember-computed-decorators": "^0.2.2"
},
"optionalDependencies": {
"ember-font-awesome": "~2.1.0"
"ember-font-awesome": "2.1.1"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down

0 comments on commit ac5327a

Please sign in to comment.