Skip to content

Commit

Permalink
Merge pull request #11 from vesper2000/master
Browse files Browse the repository at this point in the history
fixing addon dependency for other addons
  • Loading branch information
sandersky committed Mar 11, 2016
2 parents e2dbeb0 + d566150 commit 6e67fb7
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 16 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ ember install ember-frost-login
{{#if section.form}}
{{frost-bunsen-form
model=loginFormModel
onChange=(action "loginFormValueChanged")
onValidation=(action 'onValidation')
on-change=(action "loginFormValueChanged")
on-validation=(action 'onValidation')
value=loginFormValue
}}
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions addon/templates/components/frost-login.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
{{else}}
{{frost-bunsen-form
model=loginFormModel
onChange=(action "loginFormValueChanged")
onValidation=(action 'onValidation')
on-change=(action "loginFormValueChanged")
on-validation=(action 'onValidation')
view=loginFormView
}}
<div class="submission-error">{{error}}</div>
Expand Down
20 changes: 20 additions & 0 deletions blueprints/ember-frost-login/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
description: '',
normalizeEntityName: function () {},

/**
Installs specified packages at the root level of the application.
Triggered by 'ember install <addon name>'.
@returns {Promise} package names and versions
*/
afterInstall: function () {
return this.addAddonsToProject({
packages: [
{name: 'ember-frost-theme', target: '^1.3.1'},
{name: 'ember-frost-icons', target: '^1.4.0'},
{name: 'ember-frost-bunsen', target: '^2.1.5'}
]
})
}
}
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = function (defaults) {
},
sassOptions: {
includePaths: [
'node_modules/ember-frost-css-core/scss',
'node_modules/ember-frost-css-core/scss/frost-core',
'node_modules/ember-frost-theme/scss'
]
}
Expand Down
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build": "ember build",
"start": "ember server",
"test": "npm run lint && ember test",
"lint": "eslint *.js addon app config tests"
"lint": "eslint *.js addon app blueprints config tests"
},
"repository": "git@github.com:ciena-frost/ember-frost-login.git",
"engines": {
Expand All @@ -37,8 +37,15 @@
"ember-data": "~2.3.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-frost-css-core": "^1.0.0",
"ember-frost-link": "^0.0.2",
"ember-frost-bunsen": "^2.1.5",
"ember-frost-button": "^1.4.1",
"ember-frost-checkbox": "^1.1.1",
"ember-frost-css-core": "^1.1.3",
"ember-frost-icons": "^1.4.0",
"ember-frost-link": "^1.0.0",
"ember-frost-select": "^1.3.1",
"ember-frost-text": "^1.3.0",
"ember-frost-theme": "^1.3.1",
"ember-load-initializers": "^0.5.0",
"ember-lodash": "~0.0.6",
"ember-resolver": "^2.0.3",
Expand All @@ -57,13 +64,9 @@
"ember-computed-decorators": "^0.2.2",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-sass": "^5.2.0",
"ember-frost-bunsen": "^1.0.2",
"ember-frost-button": "^1.2.0",
"ember-frost-icons": "^1.0.0",
"ember-frost-theme": "^1.0.1",
"liquid-fire": "^0.22.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
4 changes: 2 additions & 2 deletions tests/dummy/app/pods/custom-login/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{{#if section.form}}
{{frost-bunsen-form
model=loginFormModel
onChange=(action "loginFormValueChanged")
onValidation=(action 'onValidation')
on-change=(action "loginFormValueChanged")
on-validation=(action 'onValidation')
value=loginFormValue
}}
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/styles/app.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'frost-core';
@import 'node_modules/ember-frost-css-core/scss/frost-core';
@import 'frost-theme';

.dummy-notification-container {
Expand Down

0 comments on commit 6e67fb7

Please sign in to comment.