TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-05 18:34:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1345 from halfdan/944-crazy-notifications

Browse Source 
Fix notification stacking.
This commit is contained in:
Hannah Wolfe 2013-11-01 09:00:56 -07:00
commit dfa75f0c74
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghost/admin/views/base.js
View File

@ -193,7 +193,7 @@
this.renderItem(item);
},
clearEverything: function () {
this.$el.find('.js-notification.notification-passive').remove();
this.$el.find('.js-notification.notification-passive').parent().remove();
},
removeItem: function (e) {
e.preventDefault();
@ -218,6 +218,7 @@
$(this)
.show()
.css({height: "auto"})
.parent()
.remove();
});
}

3
ghost/admin/views/login.js
View File

@ -45,6 +45,7 @@
window.location.href = msg.redirect;
},
error: function (xhr) {
Ghost.notifications.clearEverything();
Ghost.notifications.addItem({
type: 'error',
message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
@ -102,6 +103,7 @@
window.location.href = msg.redirect;
},
error: function (xhr) {
Ghost.notifications.clearEverything();
Ghost.notifications.addItem({
type: 'error',
message: Ghost.Views.Utils.getRequestErrorMessage(xhr),
@ -153,6 +155,7 @@
window.location.href = msg.redirect;
},
error: function (xhr) {
Ghost.notifications.clearEverything();
Ghost.notifications.addItem({
type: 'error',
message: Ghost.Views.Utils.getRequestErrorMessage(xhr),