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

Merge branch 'dev'

Übergeordnete d9689e2f 2ad21c3f
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
1 Merge Request!63Update 'next-2.x' with latest changes from 'main'
Leerzeichenänderungen ausblenden
Inline Nebeneinander
qui/classes/request/Ajax.js
+ 25
− 23
Zeige Datei @ 673857a1
......@@ -40,19 +40,19 @@ define('qui/classes/request/Ajax', [
return new Class({
Extends: DOM,
Type: 'qui/classes/request/Ajax',
Type : 'qui/classes/request/Ajax',
Binds: [
'$parseResult'
],
$Request: null,
$result: null,
$result : null,
options: {
method: 'post',
url: '',
async: true,
method : 'post',
url : '',
async : true,
timeout: 10000
},
......@@ -76,9 +76,9 @@ define('qui/classes/request/Ajax', [
self.setAttribute('params', params);
self.$Request = new Request({
url: self.getAttribute('url'),
method: self.getAttribute('method'),
async: self.getAttribute('async'),
url : self.getAttribute('url'),
method : self.getAttribute('method'),
async : self.getAttribute('async'),
timeout: self.getAttribute('timeout'),
onProgress: function () {
......@@ -96,7 +96,7 @@ define('qui/classes/request/Ajax', [
}
});
var query = Object.toQueryString(params),
var query = Object.toQueryString(params),
strlenCheck = parseInt(query.length) +
parseInt(self.getAttribute('url').length);
......@@ -211,16 +211,16 @@ define('qui/classes/request/Ajax', [
$parseResult: function (responseText) {
var i;
var str = responseText || '',
len = str.length,
var str = responseText || '',
len = str.length,
start = 9,
end = len - 10;
end = len - 10;
if (!str.match('<quiqqer>') || !str.match('</quiqqer>')) {
return this.fireEvent('error', [
new MessageError({
message: 'No QUIQQER XML',
code: 500
code : 500
}),
this
]);
......@@ -231,7 +231,7 @@ define('qui/classes/request/Ajax', [
return this.fireEvent('error', [
new MessageError({
message: 'No QUIQQER XML',
code: 500
code : 500
}),
this
]);
......@@ -247,8 +247,8 @@ define('qui/classes/request/Ajax', [
result = eval('(' + str.substring(start, end) + ')');
}
var params = this.getAttribute('params'),
rfs = JSON.decode(params._rf || []),
var params = this.getAttribute('params'),
rfs = JSON.decode(params._rf || []),
event_params = [];
this.$result = result;
......@@ -280,9 +280,10 @@ define('qui/classes/request/Ajax', [
if (result.Exception) {
return this.fireEvent('error', [
new MessageError({
message: result.Exception.message || '',
code: result.Exception.code || 0,
type: result.Exception.type || 'Exception'
message : result.Exception.message || '',
code : result.Exception.code || 0,
type : result.Exception.type || 'Exception',
attributes: result.Exception.attributes || false
}),
this
]);
......@@ -291,7 +292,7 @@ define('qui/classes/request/Ajax', [
// check the single function
for (i = 0, len = rfs.length; i < len; i++) {
func = rfs[i];
res = result[func];
res = result[func];
if (!res) {
event_params.push(null);
......@@ -301,9 +302,10 @@ define('qui/classes/request/Ajax', [
if (res.Exception) {
this.fireEvent('error', [
new MessageError({
message: res.Exception.message || '',
code: res.Exception.code || 0,
type: res.Exception.type || 'Exception'
message : res.Exception.message || '',
code : res.Exception.code || 0,
type : res.Exception.type || 'Exception',
attributes: res.Exception.attributes || false
}),
this
]);
......
qui/controls/Control.js
+ 1
− 1
Zeige Datei @ 673857a1
......@@ -254,7 +254,7 @@ define('qui/controls/Control', [
attrValue = attribute.value;
numb = Number.from(attrValue);
if (typeOf(numb) === 'number') {
if (typeOf(numb) === 'number' && numb == attrValue) {
attrValue = numb;
}
......
qui/controls/elements/FormList.js
+ 16
− 18
Zeige Datei @ 673857a1
......@@ -5,11 +5,6 @@
*
* @module qui/controls/elements/FormList
* @author www.pcsg.de (Henning Leutz)
*
* @require qui/QUI
* @require qui/controls/Control
* @require qui/controls/buttons/Button
* @require css!qui/controls/elements/FormList.css
*/
define('qui/controls/elements/FormList', [
......@@ -34,7 +29,8 @@ define('qui/controls/elements/FormList', [
],
options: {
entry: ''
entry : '',
buttonText: 'Add entry'
},
initialize: function (options) {
......@@ -58,14 +54,14 @@ define('qui/controls/elements/FormList', [
this.$Elm = new Element('div', {
'class': 'qui-controls-formlist',
html : '<div class="qui-controls-formlist-buttons"></div>' +
'<div class="qui-controls-formlist-container"></div>'
'<div class="qui-controls-formlist-container"></div>'
});
this.$Container = this.$Elm.getElement('.qui-controls-formlist-container');
this.$Buttons = this.$Elm.getElement('.qui-controls-formlist-buttons');
new QUIButton({
text : 'Eintrag hinzufügen', // #locale
text : this.getAttribute('buttonText'),
textimage: 'icon-plus fa fa-add',
events : {
onClick: this.$createEntry
......@@ -84,9 +80,9 @@ define('qui/controls/elements/FormList', [
var nodeName = this.$Input.nodeName;
if (nodeName == 'INPUT' ||
nodeName == 'TEXTAREA' ||
nodeName == 'SELECT') {
if (nodeName === 'INPUT' ||
nodeName === 'TEXTAREA' ||
nodeName === 'SELECT') {
this.$Input.type = 'hidden';
}
......@@ -110,8 +106,7 @@ define('qui/controls/elements/FormList', [
for (key in value[i]) {
if (value[i].hasOwnProperty(key)) {
Node.getElements('[name="' + key + '"]')
.set('value', value[i][key]);
Node.getElements('[name="' + key + '"]').set('value', value[i][key]);
}
}
}
......@@ -162,13 +157,13 @@ define('qui/controls/elements/FormList', [
var Child = new Element('div', {
'class': 'qui-controls-formlist-entry',
html : '<div class="qui-controls-formlist-entry-delete"></div>' +
'<div class="qui-controls-formlist-entry-data">' +
this.getAttribute('entry') +
'</div>'
'<div class="qui-controls-formlist-entry-data">' +
this.getAttribute('entry') +
'</div>'
}).inject(this.$Container);
new QUIButton({
icon : 'icon-trash',
icon : 'icon-trash fa fa-trash',
events: {
onClick: function () {
Child.destroy();
......@@ -184,7 +179,10 @@ define('qui/controls/elements/FormList', [
change: this.$refreshData
});
this.$refreshData();
QUI.parse(Child).then(function () {
this.$refreshData();
this.fireEvent('parsed', [this, Child]);
}.bind(this));
return Child;
}
......
qui/controls/messages/Message.js
+ 11
− 6
Zeige Datei @ 673857a1
......@@ -32,12 +32,13 @@ define('qui/controls/messages/Message', [
Type : 'qui/controls/messages/Message',
options: {
message : '',
code : 0,
time : false,
cssclass: false,
styles : false,
hideTime: false
message : '',
code : 0,
time : false,
cssclass : false,
styles : false,
hideTime : false,
attributes: false
},
initialize: function (options) {
......@@ -45,6 +46,10 @@ define('qui/controls/messages/Message', [
this.$elements = [];
if (this.getAttribute('attributes')) {
this.setAttributes(this.getAttribute('attributes'));
}
if (!this.getAttribute('time')) {
this.setAttribute('time', new Date());
} else {
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab