Skip to content

Commit

Permalink
Merge pull request #18 from rox163/master
Browse files Browse the repository at this point in the history
update core
  • Loading branch information
rox163 committed Apr 26, 2016
2 parents 6cdd6ae + a924d75 commit 1546a98
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 41 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-frost-bunsen": "^3.1.0",
"ember-frost-core": ">=0.0.14 <2.0.0",
"ember-frost-core": ">=0.6.0 <2.0.0",
"ember-load-initializers": "^0.5.0",
"ember-lodash": "~0.0.6",
"ember-resolver": "^2.0.3",
"ember-truth-helpers": "^1.2.0",
"ember-try": "^0.2.0",
"eslint": "2.2.0",
"eslint-config-frost-standard": "^1.0.0",
"eslint": "2.8.0",
"eslint-config-frost-standard": "^2.0.0",
"frost-guide-custom-routing": "0.0.4",
"loader.js": "^4.0.0"
},
Expand All @@ -63,4 +63,4 @@
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}
13 changes: 1 addition & 12 deletions tests/dummy/app/pods/custom-login/controller.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
import Ember from 'ember'
import {default as loginFormModel} from './model'

const {Controller} = Ember

export default Controller.extend({
loginFormModel,
valid: false,

actions: {
loginFormValueChanged (value) {
this.set('loginFormValue', value)
},

onValidationHandler (e) {
this.set('valid', e.valid)
},

submitLogin () {
let data = this.get('loginFormValue')
submitLogin (data) {
this.notifications.addNotification({
message: 'username: ' + data.username +
', password: ' + data.password + ', rememberme: ' + data.rememberMe +
Expand All @@ -26,7 +16,6 @@ export default Controller.extend({
autoClear: true,
clearDuration: 2000
})
this.set('loginFormValue', {})
}
}
})
21 changes: 0 additions & 21 deletions tests/dummy/app/pods/custom-login/model.js

This file was deleted.

8 changes: 4 additions & 4 deletions tests/dummy/app/pods/custom-login/template.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#frost-login logo='' brandingStrip='' onEnter='submitLogin' as |section|}}
{{#if section.form}}
{{frost-login onSubmit='submitLogin' }}
{{!-- {{#if section.form}}
{{frost-bunsen-form
model=loginFormModel
onChange=(action 'loginFormValueChanged')
Expand All @@ -15,5 +15,5 @@
size='medium'
text='Login'
}}
{{/if}}
{{/frost-login}}
{{/if}} --}}
{{!-- {{/frost-login}} --}}

0 comments on commit 1546a98

Please sign in to comment.