github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-31 23:16:16 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix alerts not dismissing

Browse Source
This commit is contained in:
Toby Zerner 2015-02-26 13:28:44 +10:30
parent 57f4dc6091
commit 195e0f1321
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ember/app/adapters/application.js
View File

@ -31,7 +31,7 @@ export default JsonApiAdapter.extend({
} else {
message = errors.message;
}
var alert = AlertMessage.create({
var alert = AlertMessage.extend({
type: 'warning',
message: message
});

2
ember/app/controllers/alerts.js
View File

@ -8,7 +8,7 @@ export default Ember.Controller.extend({
this.get('alerts').pushObject(message);
},
dismissAlert: function(message) {
this.get('alerts').removeObject(message);
this.get('alerts').removeObject(message.constructor);
},
clearAlerts: function() {
this.get('alerts').clear();

2
ember/app/routes/application.js
View File

@ -6,7 +6,7 @@ import AlertMessage from 'flarum/components/ui/alert-message';
export default Ember.Route.extend(ApplicationRouteMixin, {
activate: function() {
if (!Ember.isEmpty(FLARUM_ALERT)) {
this.controllerFor('alerts').send('alert', AlertMessage.create(FLARUM_ALERT));
this.controllerFor('alerts').send('alert', AlertMessage.extend(FLARUM_ALERT));
FLARUM_ALERT = null;
}