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

Merge branch 'dev' of dev.quiqqer.com:quiqqer/qui into dev

Übergeordnete 1f5816d1 35f6dd7d
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
...@@ -68,7 +68,8 @@ define('qui/controls/elements/Select', [ ...@@ -68,7 +68,8 @@ define('qui/controls/elements/Select', [
icon : 'fa fa-angle-right', icon : 'fa fa-angle-right',
placeholder : 'Suche...', placeholder : 'Suche...',
child : 'qui/controls/elements/SelectItem', // child type child : 'qui/controls/elements/SelectItem', // child type
showIds : true // display the ids in the search result list or not showIds : true, // display the ids in the search result list or not
asyncSearch : true // search the results asynchronically (if set to false -> just add items without search)
}, },
initialize: function (options, Input) { initialize: function (options, Input) {
...@@ -221,7 +222,7 @@ define('qui/controls/elements/Select', [ ...@@ -221,7 +222,7 @@ define('qui/controls/elements/Select', [
if (!this.getAttribute('searchbutton')) { if (!this.getAttribute('searchbutton')) {
this.$SearchButton.setStyle('display', 'none'); this.$SearchButton.setStyle('display', 'none');
this.$Search.setStyle('width', '100%'); this.$Search.style.setProperty('width', '100%', 'important');
} }
// load values // load values
...@@ -297,6 +298,10 @@ define('qui/controls/elements/Select', [ ...@@ -297,6 +298,10 @@ define('qui/controls/elements/Select', [
* @method qui/controls/elements/Select#fireSearch * @method qui/controls/elements/Select#fireSearch
*/ */
fireSearch: function () { fireSearch: function () {
if (!this.getAttribute('asyncSearch')) {
return;
}
if (this.$Search.value === '') { if (this.$Search.value === '') {
return this.close(); return this.close();
} }
...@@ -596,7 +601,6 @@ define('qui/controls/elements/Select', [ ...@@ -596,7 +601,6 @@ define('qui/controls/elements/Select', [
this.addItem(Active.get('data-id')); this.addItem(Active.get('data-id'));
} }
this.$Input.value = '';
this.search(); this.search();
}, },
......
...@@ -106,10 +106,10 @@ define('qui/controls/windows/Popup', needle, function (QUI, ...@@ -106,10 +106,10 @@ define('qui/controls/windows/Popup', needle, function (QUI,
// button texts // button texts
var closeText = 'Close'; var closeText = QUI.getAttribute('control-windows-popup-closetext');
if (QUI.getAttribute('control-windows-popup-closetext')) { if (this.getAttribute('closeButtonText')) {
closeText = QUI.getAttribute('control-windows-popup-closetext'); closeText = this.getAttribute('closeButtonText');
} }
this.setAttribute('closeButtonText', closeText); this.setAttribute('closeButtonText', closeText);
......
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