Skip to content
Code-Schnipsel Gruppen Projekte
Commit ba5a1c4f erstellt von Patrick Müller's avatar Patrick Müller
Dateien durchsuchen

Merge branch 'dev'

Übergeordnete 593e581d 0d2304b4
Keine zugehörigen Branchen gefunden
Tags 1.9.4
1 Merge Request!63Update 'next-2.x' with latest changes from 'main'
......@@ -464,6 +464,7 @@ define('qui/controls/windows/Popup', needle, function (QUI,
});
return new Promise(function (resolve) {
var execute = false;
this.$FX.animate({
height : height,
......@@ -474,6 +475,8 @@ define('qui/controls/windows/Popup', needle, function (QUI,
}, {
duration: 200,
callback: function () {
execute = true;
// content height
var content_height = self.$Elm.getSize().y -
self.$Buttons.getSize().y -
......@@ -497,6 +500,20 @@ define('qui/controls/windows/Popup', needle, function (QUI,
}
});
/**
* Fallback for a bug with moofx that does not execute the callback
* if the style of the element already matches the target values.
*/
setTimeout(function () {
if (!execute) {
if (typeof callback === 'function') {
callback();
}
resolve();
}
}, 300);
}.bind(this));
},
......
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