summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorBartek Przybylski <bart.p.pl@gmail.com>2012-03-30 22:50:57 +0200
committerBartek Przybylski <bart.p.pl@gmail.com>2012-03-30 22:50:57 +0200
commit6b704a780dbe3daa4c13ad49ad4265c1db4a67aa (patch)
tree07f6053555b696aae2dc67ad208b08b71e5b44e0 /core/js
parent6abb2cb92edc1edaefea7e37cd46a6c866239c27 (diff)
downloadnextcloud-server-6b704a780dbe3daa4c13ad49ad4265c1db4a67aa.tar.gz
nextcloud-server-6b704a780dbe3daa4c13ad49ad4265c1db4a67aa.zip
select field added to oc.dialogs.form, gallery ported to use it
Diffstat (limited to 'core/js')
-rw-r--r--core/js/oc-dialogs.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index c11ac13332b..35d0a0c5c42 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -84,10 +84,18 @@ OCdialogs = {
} else content += '>';
} else if (type == 'text' || type == 'password' && fields[a].value)
content += ' value="'+fields[a].value+'">';
+ } else if (type == 'select') {
+ content += '<select name="'+fields[a].name+'"';
+ if (fields[a].value != undefined)
+ content += ' value="'+fields[a].value+'"';
+ content += '>';
+ for (var o in fields[a].options)
+ content += '<option value="'+fields[a].options[o].value+'">'+fields[a].options[o].text+'</option>';
+ content += '</select>';
}
- content += "</td></tr>"
+ content += '</td></tr>';
}
- content += "</table>";
+ content += '</table>';
OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback);
},
message:function(content, title, dialog_type, buttons, callback) {
@@ -144,7 +152,7 @@ OCdialogs = {
if (callback != undefined) {
var r = [];
var c = 0;
- $(c_id + ' input').each(function(i, elem) {
+ $(c_id + ' input, '+c_id+' select').each(function(i, elem) {
r[c] = {name: $(elem).attr('name'), value: OCdialogs.determineValue(elem)};
c++;
});