mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 22:47:33 +02:00
Code Issues 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 a007f4c402
commit 866200c2a2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
framework/core/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, { export default Ember.Route.extend(ApplicationRouteMixin, {
activate: function() { activate: function() {
if (!Ember.isEmpty(FLARUM_ALERT)) { 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; FLARUM_ALERT = null;
} }