Skip to content
Code-Schnipsel Gruppen Projekte
Commit 2f174364 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'dev'

Übergeordnete 98f65a65 6f1f56bd
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
1 Merge Request!63Update 'next-2.x' with latest changes from 'main'
......@@ -443,7 +443,7 @@ define('qui/classes/QUI', [
self.$execGetMessageHandler = true;
(function () {
self.getMessageHandler(callback);
self.getMessageHandler(callback).then(resolve);
}).delay(20, self);
return;
......
......@@ -273,7 +273,7 @@ define('qui/controls/messages/Handler', [
this.$Elm = new Element('div', {
'class': 'message-handler-control',
html : '<span class="icon-info"></span>' +
'<span class="message-handler-count"></span>',
'<span class="message-handler-count"></span>',
title : Locale.get('qui/controls/messages', 'handler.open'),
events : {
click: this.open.bind(this)
......@@ -308,17 +308,17 @@ define('qui/controls/messages/Handler', [
var Container = new Element('div', {
'class': 'message-handler-container',
html : '<div class="message-handler-container-title">' +
'Nachrichten' +
'</div>' +
'<div class="message-handler-container-buttons">' +
'<div class="success message-handler-container-button grid-20 mobile-grid-20 icon-ok"></div>' +
'<div class="information message-handler-container-button grid-20 mobile-grid-20 icon-info-sign"></div>' +
'<div class="attention message-handler-container-button grid-20 mobile-grid-20 icon-warning-sign"></div>' +
'<div class="error message-handler-container-button grid-20 mobile-grid-20 icon-bolt"></div>' +
'<div class="trash message-handler-container-button grid-20 mobile-grid-20 icon-trash"></div>' +
'</div>' +
'<div class="message-handler-container-messages"></div>' +
'<div class="message-handler-container-close"></div>'
'Nachrichten' +
'</div>' +
'<div class="message-handler-container-buttons">' +
'<div class="success message-handler-container-button grid-20 mobile-grid-20 icon-ok"></div>' +
'<div class="information message-handler-container-button grid-20 mobile-grid-20 icon-info-sign"></div>' +
'<div class="attention message-handler-container-button grid-20 mobile-grid-20 icon-warning-sign"></div>' +
'<div class="error message-handler-container-button grid-20 mobile-grid-20 icon-bolt"></div>' +
'<div class="trash message-handler-container-button grid-20 mobile-grid-20 icon-trash"></div>' +
'</div>' +
'<div class="message-handler-container-messages"></div>' +
'<div class="message-handler-container-close"></div>'
}).inject(Parent);
// trash
......@@ -725,6 +725,11 @@ define('qui/controls/messages/Handler', [
this.$messages.push(Message);
if (this.getAttribute('customMessageHandling')) {
this.getAttribute('customMessageHandling')(Message, Parent);
return this;
}
Message.addEvents({
onDestroy: this.$onMessageDestroy.bind(this),
onFinish : function () {
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren