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

fix: -> window size calc with ghost div

Übergeordneter e99960c3
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
...@@ -85,7 +85,7 @@ define('qui/controls/windows/Popup', needle, function (QUI, ...@@ -85,7 +85,7 @@ define('qui/controls/windows/Popup', needle, function (QUI,
// buttons // buttons
buttons : true, // {bool} [optional] show the bottom button line buttons : true, // {bool} [optional] show the bottom button line
closeButton : true, // {bool} show the close button closeButton : true, // {bool} show the close button
closeButtonText : false, closeButtonText : Locale.get('qui/controls/windows/Popup', 'btn.close'),
titleCloseButton: true // {bool} show the title close button titleCloseButton: true // {bool} show the title close button
}, },
...@@ -112,10 +112,6 @@ define('qui/controls/windows/Popup', needle, function (QUI, ...@@ -112,10 +112,6 @@ define('qui/controls/windows/Popup', needle, function (QUI,
closeText = QUI.getAttribute('control-windows-popup-closetext'); closeText = QUI.getAttribute('control-windows-popup-closetext');
} }
if (this.getAttribute('closeButtonText')) {
closeText = this.getAttribute('closeButtonText');
}
this.setAttribute('closeButtonText', closeText); this.setAttribute('closeButtonText', closeText);
...@@ -330,7 +326,6 @@ define('qui/controls/windows/Popup', needle, function (QUI, ...@@ -330,7 +326,6 @@ define('qui/controls/windows/Popup', needle, function (QUI,
var ios = SystemUtils.iOSversion(); var ios = SystemUtils.iOSversion();
if (ios) { if (ios) {
document.body.setStyles({ document.body.setStyles({
overflow : 'hidden', overflow : 'hidden',
position : 'fixed', position : 'fixed',
...@@ -708,7 +703,7 @@ define('qui/controls/windows/Popup', needle, function (QUI, ...@@ -708,7 +703,7 @@ define('qui/controls/windows/Popup', needle, function (QUI,
* @returns {number} * @returns {number}
*/ */
getOpeningWidth: function () { getOpeningWidth: function () {
var width = Math.max(document.documentElement.clientWidth, window.innerWidth || 0); var width = QUI.getWindowSize().x;
if (width > this.getAttribute('maxWidth')) { if (width > this.getAttribute('maxWidth')) {
width = this.getAttribute('maxWidth'); width = this.getAttribute('maxWidth');
...@@ -723,7 +718,7 @@ define('qui/controls/windows/Popup', needle, function (QUI, ...@@ -723,7 +718,7 @@ define('qui/controls/windows/Popup', needle, function (QUI,
* @returns {number} * @returns {number}
*/ */
getOpeningHeight: function () { getOpeningHeight: function () {
var height = Math.max(document.documentElement.clientHeight, window.innerHeight || 0); var height = QUI.getWindowSize().y;
if (height > this.getAttribute('maxHeight')) { if (height > this.getAttribute('maxHeight')) {
height = this.getAttribute('maxHeight'); height = this.getAttribute('maxHeight');
......
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