antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

Merged with helma/master

Browse source
This commit is contained in:
Tobi Schäfer 2013-04-07 17:27:18 +02:00
parent ff7bba76cf
commit 59d127e089
11 changed files with 75 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/helma/Html.js
View file

@ -477,7 +477,13 @@ helma.Html.prototype.dropDown = function(param, options, selectedValue, firstOpt
this.closeTag("option");
res.write("\n ");
}
var hasOpenGroup = false;
for (var i in options) {
if (options[i].group) {
hasOpenGroup && html.closeTag("optgroup");
html.openTag("optgroup", {label: options[i].group});
hasOpenGroup = true;
}
var attr = new Object();
var display = "";
if ((options[i] instanceof Array) && options[i].length > 0) {
@ -503,6 +509,7 @@ helma.Html.prototype.dropDown = function(param, options, selectedValue, firstOpt
this.closeTag("option");
res.write("\n ");
}
hasOpenGroup && html.closeTag("optgroup");
this.closeTag("select");
res.write("\n ");
return;

4
modules/helma/Http.js
View file

@ -61,7 +61,9 @@ helma.Http = function() {
var responseHandler = function(connection, result) {
var input;
try {
input = new java.io.BufferedInputStream(connection.getInputStream());
if (method !== 'DELETE') {
input = new java.io.BufferedInputStream(connection.getInputStream());
}
} catch (error) {
input = new java.io.BufferedInputStream(connection.getErrorStream());
}