Skip to content

Commit

Permalink
Merge 3b1c566 into 1dd7e41
Browse files Browse the repository at this point in the history
  • Loading branch information
notmessenger committed Jan 8, 2018
2 parents 1dd7e41 + 3b1c566 commit 160e3e8
Show file tree
Hide file tree
Showing 17 changed files with 139 additions and 13,144 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
/coverage.json
/libpeerconnection.log
npm-debug.log*
package-lock.json
testem.log
.idea
/visual-acceptance
/typings
/coverage
.DS_Store
Expand Down
11 changes: 11 additions & 0 deletions addon/pods/components/frost-notification/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ export default Component.extend({

// == Computed properties ===================================================

@readOnly
@computed('notification.type')
/**
* Whether notification is of type 'success'
* @param {String} type - notification type
* @returns {Boolean} whether notification is of type 'success'
*/
isSuccessNotification: function (type) {
return type === 'success'
},

@readOnly
@computed('notification.type')
/**
Expand Down
2 changes: 1 addition & 1 deletion addon/pods/components/frost-notification/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
data-test={{hook (concat hook '-notification-wrapper')}}
>
<div class="content" data-test={{hook (concat hook '-notification-wrapper-content')}}>
{{#unless (eq notification.type "success")}}
{{#unless isSuccessNotification}}
{{frost-icon
class="icon"
hook=(concat hook '-notificationIcon')
Expand Down
2 changes: 1 addition & 1 deletion app/initializers/notifier-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default {
name: 'notifier-service',

initialize: function (application) {
// application.register('service:notifier', NotifierService)
// application.register('service:notifier', NotifierService)
application.inject('route', 'notifier', 'service:notifier')
}
}
5 changes: 1 addition & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"name": "ember-frost-notifier",
"dependencies": {
"Faker": "^3.0.1",
"pretender": "^0.10.1"
}
"dependencies": {}
}
5 changes: 1 addition & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')

module.exports = function (defaults) {
var app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
babel: {
optional: ['es7.decorators']
},
'ember-cli-mocha': {
useLintTree: false
},
sassOptions: {
includePaths: [
]
Expand Down
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
module.exports = {
name: 'ember-frost-notifier',

/* eslint-disable complexity */
init: function (app) {
this.options = this.options || {}
this.options.babel = this.options.babel || {}
Expand All @@ -17,4 +18,5 @@ module.exports = {
this._super.init && this._super.init.apply(this, arguments)
/* eslint-enable no-unused-expressions */
}
/* eslint-enable complexity */
}

0 comments on commit 160e3e8

Please sign in to comment.