From 0be80abe70d761331fa1c1caf3b45b804689d8a8 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 10:07:12 +0200 Subject: [PATCH 1/9] Refactor OCdialogs. Fix #2557 and make the whole code more usable. --- core/css/styles.css | 8 +- core/js/oc-dialogs.js | 432 +++++++++++++++++++++++++++--------------- 2 files changed, 288 insertions(+), 152 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 839f25cef4c..9111cc7b644 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -327,11 +327,13 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin .ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#ffffff; } /* ---- DIALOGS ---- */ -#dirtree {width:100%;} +#dirup {width:4%;} +#dirtree {width:93%;} #filelist {height:270px; overflow:scroll; background-color:white; width:100%;} .filepicker_element_selected { background-color:lightblue;} -.filepicker_loader {height:120px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;} - +.filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;} +.ui-dialog {position:fixed !important;} +span.ui-icon {float: left; margin: 3px 7px 30px 0;} /* ---- CATEGORIES ---- */ #categoryform .scrollarea { position:absolute; left:10px; top:10px; right:10px; bottom:50px; overflow:auto; border:1px solid #ddd; background:#f8f8f8; } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index cfbca2833c7..423602d7775 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -27,75 +27,78 @@ var OCdialogs = { * displays alert dialog * @param text content of dialog * @param title dialog title - * @param callback which will be triggered when user press OK + * @param callback which will be triggered when user presses OK + * @param modal make the dialog modal */ alert:function(text, title, callback, modal) { - var content = '

'+text+'

'; + var content = '

' + text + '

'; OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** * displays info dialog * @param text content of dialog * @param title dialog title - * @param callback which will be triggered when user press OK + * @param callback which will be triggered when user presses OK + * @param modal make the dialog modal */ info:function(text, title, callback, modal) { - var content = '

'+text+'

'; + var content = '

' + text + '

'; OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** * displays confirmation dialog * @param text content of dialog * @param title dialog title - * @param callback which will be triggered when user press YES or NO (true or false would be passed to callback respectively) + * @param callback which will be triggered when user presses YES or NO (true or false would be passed to callback respectively) + * @param modal make the dialog modal */ confirm:function(text, title, callback, modal) { - var content = '

'+text+'

'; + var content = '

' + text + '

'; OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal); }, /** * prompt for user input * @param text content of dialog * @param title dialog title - * @param callback which will be triggered when user press OK (input text will be passed to callback) + * @param callback which will be triggered when user presses OK (input text will be passed to callback) + * @param modal make the dialog modal */ prompt:function(text, title, default_value, callback, modal) { - var content = '

'+text+':

'; - OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, modal); + var content = '

' + text + ':

'; + OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** * prompt user for input with custom form - * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'dafault value'},...] - * select example var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hallo',value:1},{text:'hallo1',value:2}] }]; + * fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'default value'},...] + * example: + * var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hello1',value:1},{text:'hello2',value:2}] }]; * @param fields to display * @param title dialog title - * @param callback which will be triggered when user press OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...]) + * @param callback which will be triggered when user presses OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...]) + * @param modal make the dialog modal */ form:function(fields, title, callback, modal) { var content = ''; - $.each(fields, function(index, val){ - content += '
'+val.text+''; - var type=val.type; + $.each(fields, function(index, field){ + content += '
' + field.text + ''; + var type = field.type; - if (type == 'text' || type == 'checkbox' || type == 'password') { - content += ''; + if (type === 'text' || type === 'checkbox' || type === 'password') { + content += ''+valo.text+''; + $.each(field.options, function(index, field_option){ + content += ''; }); content += ''; } @@ -103,168 +106,299 @@ var OCdialogs = { }); content += '
'; - OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, modal); + + var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; + var dialog_id = '#' + dialog_name; + var dialog_div = '
' + content + '
'; + if (modal === undefined) modal = false; + $('body').append(dialog_div); + var buttonlist = [{ + text: t('core', 'Ok'), + click: function(){ OCdialogs.form_ok_handler(callback, dialog_id); } + }, + { + text: t('core', 'Cancel'), + click: function(){ $(dialog_id).dialog('close'); } + }]; + var dialog_height = ( $('tr', dialog_div).length + 1 ) * 30 + 120; + $(dialog_id).dialog({ + width: (4/9) * $(document).width(), + height: dialog_height, + modal: modal, + buttons: buttonlist + }); + OCdialogs.dialogs_counter++; }, + /** + * show a file picker to pick a file from + * @param title dialog title + * @param callback which will be triggered when user presses Choose + * @param multiselect whether it should be possible to select multiple files + * @param mimetype_filter mimetype to filter by + * @param modal make the dialog modal + */ filepicker:function(title, callback, multiselect, mimetype_filter, modal) { - var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content'; - var c_id = '#'+c_name; - var d = '
'; - if (!modal) modal = false; // Huh.. - if (!multiselect) multiselect = false; - $('body').append(d); - $(c_id + ' #dirtree').focus(function() { - var t = $(this); - t.data('oldval', t.val()) - }).change({dcid: c_id}, OC.dialogs.handleTreeListSelect); - $(c_id).ready(function(){ - $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {mimetype: mimetype_filter} ,function(r) { - OC.dialogs.fillFilePicker(r, c_id, callback) + var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; + var dialog_id = '#' + dialog_name; + var dialog_div = '
'; + if (modal === undefined) modal = false; + if (multiselect === undefined) multiselect = false; + if (mimetype_filter === undefined) mimetype_filter = ''; + + $('body').append(dialog_div); + + $(dialog_id).data('path', '/'); + + $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect ); + $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp ); + + $(dialog_id).ready(function(){ + $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) { + OCdialogs.fillFilePicker(request, dialog_id) + }); + $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: "httpd/unix-directory" }, function(request) { + OCdialogs.fillTreeList(request, dialog_id) }); }).data('multiselect', multiselect).data('mimetype',mimetype_filter); + // build buttons - var b = [{ - text: t('core', 'Choose'), - click: function(){ - if (callback != undefined) { - var p; - if ($(c_id).data('multiselect') == true) { - p = []; - $(c_id+' .filepicker_element_selected .filename').each(function(i, elem) { - p.push(($(c_id).data('path')?$(c_id).data('path'):'')+'/'+$(elem).text()); - }); - } else { - var p = $(c_id).data('path'); - if (p == undefined) p = ''; - p = p+'/'+$(c_id+' .filepicker_element_selected .filename').text() - } - callback(p); - $(c_id).dialog('close'); + var function_to_call = function() { + if (callback !== undefined) { + var datapath; + if (multiselect === true) { + datapath = []; + $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) { + datapath.push( $(dialog_id).data('path') + $(elem).text() ); + }); + } else { + var datapath = $(dialog_id).data('path'); + datapath += $(dialog_id+' .filepicker_element_selected .filename').text() } + callback(datapath); + $(dialog_id).dialog('close'); } - }, - { + }; + var buttonlist = [{ + text: t('core', 'Choose'), + click: function_to_call + }, + { text: t('core', 'Cancel'), - click: function(){$(c_id).dialog('close'); }} - ]; - $(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b}); + click: function(){$(dialog_id).dialog('close'); } + }]; + + $(dialog_id).dialog({ + width: (4/9)*$(document).width(), + height: 420, + modal: modal, + buttons: buttonlist + }); OCdialogs.dialogs_counter++; }, - // guts, dont use, dont touch + /** + * Displays raw dialog + * You better use a wrapper instead ... + */ message:function(content, title, dialog_type, buttons, callback, modal) { - var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content'; - var c_id = '#'+c_name; - var d = '
'+content+'
'; - if (modal == undefined) modal = false; - $('body').append(d); - var b = []; + var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; + var dialog_id = '#' + dialog_name; + var dialog_div = '
' + content + '
'; + if (modal === undefined) modal = false; + $('body').append(dialog_div); + var buttonlist = []; switch (buttons) { case OCdialogs.YES_NO_BUTTONS: - b[1] = {text: t('core', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }}; - b[0] = {text: t('core', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}}; + buttonlist = [{ + text: t('core', 'Yes'), + click: function(){ + if (callback !== undefined) callback(true); + $(dialog_id).dialog('close'); + } + }, + { + text: t('core', 'No'), + click: function(){ + if (callback !== undefined) callback(false); + $(dialog_id).dialog('close'); + } + }]; break; - case OCdialogs.OK_CANCEL_BUTTONS: - b[1] = {text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }}; - case OCdialogs.OK_BUTTON: // fallthrough - var f; + case OCdialogs.OK_BUTTON: + var function_to_call; switch(dialog_type) { case OCdialogs.ALERT_DIALOG: - f = function(){$(c_id).dialog('close'); if(callback) callback();}; + function_to_call = function() { + $(dialog_id).dialog('close'); + if(callback !== undefined) callback(); + }; break; case OCdialogs.PROMPT_DIALOG: - f = function(){OCdialogs.prompt_ok_handler(callback, c_id)}; - break; - case OCdialogs.FORM_DIALOG: - f = function(){OCdialogs.form_ok_handler(callback, c_id)}; + buttonlist[1] = { + text: t('core', 'Cancel'), + click: function() { $(dialog_id).dialog('close'); } + }; + function_to_call = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); }; break; } - b[0] = {text: t('core', 'Ok'), click: f}; + buttonlist[0] = { + text: t('core', 'Ok'), + click: function_to_call + }; break; - } - var possible_height = ($('tr', d).size()+1)*30; - $(c_id).dialog({width: 4*$(document).width()/9, height: possible_height + 120, modal: modal, buttons: b}); + }; + + $(dialog_id).dialog({ + width: (4/9) * $(document).width(), + height: 180, + modal: modal, + buttons: buttonlist + }); OCdialogs.dialogs_counter++; }, - // dialogs buttons types - YES_NO_BUTTONS: 70, - OK_BUTTONS: 71, - OK_CANCEL_BUTTONS: 72, + // dialog button types + YES_NO_BUTTONS: 70, + OK_BUTTONS: 71, // dialogs types - ALERT_DIALOG: 80, - INFO_DIALOG: 81, - PROMPT_DIALOG: 82, - FORM_DIALOG: 83, + ALERT_DIALOG: 80, + INFO_DIALOG: 81, + FORM_DIALOG: 82, + // used to name each dialog dialogs_counter: 0, + determineValue: function(element) { - switch ($(element).attr('type')) { - case 'checkbox': return element.checked; + if ( $(element).attr('type') === 'checkbox' ) { + return element.checked; + } else { + return $(element).val(); } - return $(element).val(); }, - prompt_ok_handler: function(callback, c_id) { $(c_id).dialog('close'); if (callback != undefined) callback($(c_id + " input#oc-dialog-prompt-input").val()); }, - form_ok_handler: function(callback, c_id) { - if (callback != undefined) { - var r = []; - var c = 0; - $(c_id + ' input, '+c_id+' select').each(function(i, elem) { - r[c] = {name: $(elem).attr('name'), value: OCdialogs.determineValue(elem)}; - c++; + + prompt_ok_handler: function(callback, dialog_id) { + $(dialog_id).dialog('close'); + if (callback !== undefined) callback($(dialog_id + " input#oc-dialog-prompt-input").val()); + }, + + form_ok_handler: function(callback, dialog_id) { + if (callback !== undefined) { + var valuelist = []; + $(dialog_id + ' input, ' + dialog_id + ' select').each(function(index, element) { + valuelist[index] = { name: $(elem).attr('name'), value: OCdialogs.determineValue(elem) }; }); - $(c_id).dialog('close'); - callback(r); + $(dialog_id).dialog('close'); + callback(valuelist); } else { - $(c_id).dialog('close'); + $(dialog_id).dialog('close'); } }, - fillFilePicker:function(r, dialog_content_id) { - var entry_template = '
*NAME*
*LASTMODDATE*
'; - var names = ''; - $.each(r.data, function(index, a) { - names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type); + /** + * fills the filepicker with files + */ + fillFilePicker:function(request, dialog_content_id) { + var template = '
*NAME*
*LASTMODDATE*
'; + var files = ''; + $.each(request.data, function(index, file) { + files += template.replace('*LASTMODDATE*', OC.mtime2date(file.mtime)).replace('*NAME*', file.name).replace('*MIMETYPEICON*', file.mimetype_icon).replace('*ENTRYNAME*', file.name).replace('*ENTRYTYPE*', file.type); }); - $(dialog_content_id + ' #filelist').html(names).on('click', '[data="file"]', function() { - OC.dialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); + $(dialog_content_id + ' #filelist').html(files).on('click', '[data="file"]', function() { + OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); }); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden'); }, - handleTreeListSelect:function(event) { - var newval = parseInt($(this).val()); - var oldval = parseInt($(this).data('oldval')); - while (newval != oldval && oldval > 0) { - $('option:last', this).remove(); - $('option:last', this).attr('selected','selected'); - oldval--; - } - var skip_first = true; - var path = ''; - $(this).children().each(function(i, element) { - if (skip_first) { - skip_first = false; - return; + /** + * fills the tree list with directories + */ + fillTreeList: function(request, dialog_id) { + var template = ''; + var paths = ''; + var count = 1; + $.each(request.data, function(index, file) { + if (file.mimetype === "httpd/unix-directory") { + paths += template.replace('*COUNT*', count).replace('*NAME*', file.name); + count++; } - path += '/'+$(element).text(); }); - $(event.data.dcid).data('path', path); + + $(dialog_id + ' #dirtree').html(paths); + }, + + handleTreeListSelect:function(event) { + // fails at paths with & + if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it + $(event.data.dcid).data('path', $("option:selected", this).html()); + } else { + $(event.data.dcid).data('path', $(event.data.dcid).data('path') + $("option:selected", this).html() + '/'); + } $(event.data.dcid + ' .filepicker_loader').css('visibility', 'visible'); - $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {dir: path, mimetype: $(event.data.dcid).data('mimetype')}, function(r){OC.dialogs.fillFilePicker(r, event.data.dcid)}); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: $(event.data.dcid).data('path'), + mimetype: $(event.data.dcid).data('mimetype') + }, + function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) } + ); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: $(event.data.dcid).data('path'), + mimetype: "httpd/unix-directory" + }, + function(request) { OCdialogs.fillTreeList(request, event.data.dcid) } + ); + }, + // go one directory up + filepickerDirUp:function(event) { + var old_path = $(event.data.dcid).data('path'); + if ( old_path !== "/") { + var splitted_path = old_path.split("/"); + var new_path = "" + for (var i = 0; i < splitted_path.length - 2; i++) { + new_path += splitted_path[i] + "/" + } + $(event.data.dcid).data('path', new_path); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: $(event.data.dcid).data('path'), + mimetype: $(event.data.dcid).data('mimetype') + }, + function(request) { OCdialogs.fillFilePicker(request, event.data.dcid) } + ); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: $(event.data.dcid).data('path'), + mimetype: "httpd/unix-directory" + }, + function(request) { OCdialogs.fillTreeList(request, event.data.dcid) } + ); + } }, - // this function is in early development state, please dont use it unlsess you know what you are doing - handlePickerClick:function(element, name, dcid) { - var p = $(dcid).data('path'); - if (p == undefined) p = ''; - p = p+'/'+name; - if ($(element).attr('data') == 'file'){ - if ($(dcid).data('multiselect') != true) { - $(dcid+' .filepicker_element_selected').removeClass('filepicker_element_selected'); + // this function is in early development state, please dont use it unless you know what you are doing + handlePickerClick:function(element, name, dialog_content_id) { + var datapath = $(dialog_content_id).data('path'); + if (datapath === undefined) datapath = ''; + datapath += name; + if ( $(element).attr('data') === 'file' ){ + if ( $(dialog_content_id).data('multiselect') !== true) { + $(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected'); } $(element).toggleClass('filepicker_element_selected'); return; } - $(dcid).data('path', p); - $(dcid + ' #dirtree option:last').removeAttr('selected'); - var newval = parseInt($(dcid + ' #dirtree option:last').val())+1; - $(dcid + ' #dirtree').append(''); - $(dcid + ' .filepicker_loader').css('visibility', 'visible'); - $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), {dir: p, mimetype: $(dcid).data('mimetype')}, function(r){OC.dialogs.fillFilePicker(r, dcid)}); + $(dialog_content_id).data('path', datapath); + $(dialog_content_id + ' #dirtree option:last').removeAttr('selected'); + var newval = parseInt($(dialog_content_id + ' #dirtree option:last').val())+1; + $(dialog_content_id + ' #dirtree').append(''); + $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible'); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: datapath, + mimetype: $(dialog_content_id).data('mimetype') + }, + function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) } + ); } }; From 1919acd68f2ff426217aa836bd17c8308267592d Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 12:16:55 +0200 Subject: [PATCH 2/9] Small fixes * escapeHTML(everything) * curly braces for if * camelcase function_to_call * add missing semicolae (?) --- core/css/styles.css | 2 +- core/js/oc-dialogs.js | 72 +++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 9111cc7b644..2c570fd78e6 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -329,7 +329,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin /* ---- DIALOGS ---- */ #dirup {width:4%;} #dirtree {width:93%;} -#filelist {height:270px; overflow:scroll; background-color:white; width:100%;} +#filelist {height:270px; overflow-y:auto; background-color:white; width:100%;} .filepicker_element_selected { background-color:lightblue;} .filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;} .ui-dialog {position:fixed !important;} diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 423602d7775..0aebc4d0479 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -31,7 +31,7 @@ var OCdialogs = { * @param modal make the dialog modal */ alert:function(text, title, callback, modal) { - var content = '

' + text + '

'; + var content = '

' + escapeHTML(text) + '

'; OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** @@ -42,7 +42,7 @@ var OCdialogs = { * @param modal make the dialog modal */ info:function(text, title, callback, modal) { - var content = '

' + text + '

'; + var content = '

' + escapeHTML(text) + '

'; OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** @@ -53,7 +53,7 @@ var OCdialogs = { * @param modal make the dialog modal */ confirm:function(text, title, callback, modal) { - var content = '

' + text + '

'; + var content = '

' + escapeHTML(text) + '

'; OCdialogs.message(content, title, OCdialogs.ALERT_DIALOG, OCdialogs.YES_NO_BUTTONS, callback, modal); }, /** @@ -64,7 +64,7 @@ var OCdialogs = { * @param modal make the dialog modal */ prompt:function(text, title, default_value, callback, modal) { - var content = '

' + text + ':

'; + var content = '

' + escapeHTML(text) + ':

'; OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** @@ -80,7 +80,7 @@ var OCdialogs = { form:function(fields, title, callback, modal) { var content = ''; $.each(fields, function(index, field){ - content += '
' + field.text + ''; + content += '
' + escapeHTML(field.text) + ''; var type = field.type; if (type === 'text' || type === 'checkbox' || type === 'password') { @@ -88,17 +88,17 @@ var OCdialogs = { if (type === 'checkbox' && field.value === true) { content += ' checked="checked"'; } else if (type === 'text' || type === 'password' && val.value) { - content += ' value="' + field.value + '"'; + content += ' value="' + escapeHTML(field.value) + '"'; } content += '>'; } else if (type === 'select') { - content += ''; } @@ -109,8 +109,8 @@ var OCdialogs = { var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; var dialog_id = '#' + dialog_name; - var dialog_div = '
' + content + '
'; - if (modal === undefined) modal = false; + var dialog_div = '
' + escapeHTML(content) + '
'; + if (modal === undefined) { modal = false }; $('body').append(dialog_div); var buttonlist = [{ text: t('core', 'Ok'), @@ -140,10 +140,10 @@ var OCdialogs = { filepicker:function(title, callback, multiselect, mimetype_filter, modal) { var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; var dialog_id = '#' + dialog_name; - var dialog_div = '
'; - if (modal === undefined) modal = false; - if (multiselect === undefined) multiselect = false; - if (mimetype_filter === undefined) mimetype_filter = ''; + var dialog_div = '
'; + if (modal === undefined) { modal = false }; + if (multiselect === undefined) { multiselect = false }; + if (mimetype_filter === undefined) { mimetype_filter = '' }; $('body').append(dialog_div); @@ -154,15 +154,15 @@ var OCdialogs = { $(dialog_id).ready(function(){ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) { - OCdialogs.fillFilePicker(request, dialog_id) + OCdialogs.fillFilePicker(request, dialog_id); }); $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: "httpd/unix-directory" }, function(request) { - OCdialogs.fillTreeList(request, dialog_id) + OCdialogs.fillTreeList(request, dialog_id); }); }).data('multiselect', multiselect).data('mimetype',mimetype_filter); // build buttons - var function_to_call = function() { + var functionToCall = function() { if (callback !== undefined) { var datapath; if (multiselect === true) { @@ -172,7 +172,7 @@ var OCdialogs = { }); } else { var datapath = $(dialog_id).data('path'); - datapath += $(dialog_id+' .filepicker_element_selected .filename').text() + datapath += $(dialog_id+' .filepicker_element_selected .filename').text(); } callback(datapath); $(dialog_id).dialog('close'); @@ -180,7 +180,7 @@ var OCdialogs = { }; var buttonlist = [{ text: t('core', 'Choose'), - click: function_to_call + click: functionToCall }, { text: t('core', 'Cancel'), @@ -202,8 +202,8 @@ var OCdialogs = { message:function(content, title, dialog_type, buttons, callback, modal) { var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; var dialog_id = '#' + dialog_name; - var dialog_div = '
' + content + '
'; - if (modal === undefined) modal = false; + var dialog_div = '
' + escapeHTML(content) + '
'; + if (modal === undefined) { modal = false }; $('body').append(dialog_div); var buttonlist = []; switch (buttons) { @@ -211,25 +211,25 @@ var OCdialogs = { buttonlist = [{ text: t('core', 'Yes'), click: function(){ - if (callback !== undefined) callback(true); + if (callback !== undefined) { callback(true) }; $(dialog_id).dialog('close'); } }, { text: t('core', 'No'), click: function(){ - if (callback !== undefined) callback(false); + if (callback !== undefined) { callback(false) }; $(dialog_id).dialog('close'); } }]; break; case OCdialogs.OK_BUTTON: - var function_to_call; + var functionToCall; switch(dialog_type) { case OCdialogs.ALERT_DIALOG: - function_to_call = function() { + functionToCall = function() { $(dialog_id).dialog('close'); - if(callback !== undefined) callback(); + if(callback !== undefined) { callback() }; }; break; case OCdialogs.PROMPT_DIALOG: @@ -237,12 +237,12 @@ var OCdialogs = { text: t('core', 'Cancel'), click: function() { $(dialog_id).dialog('close'); } }; - function_to_call = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); }; + functionToCall = function() { OCdialogs.prompt_ok_handler(callback, dialog_id); }; break; } buttonlist[0] = { text: t('core', 'Ok'), - click: function_to_call + click: functionToCall }; break; }; @@ -275,7 +275,7 @@ var OCdialogs = { prompt_ok_handler: function(callback, dialog_id) { $(dialog_id).dialog('close'); - if (callback !== undefined) callback($(dialog_id + " input#oc-dialog-prompt-input").val()); + if (callback !== undefined) { callback($(dialog_id + " input#oc-dialog-prompt-input").val()) }; }, form_ok_handler: function(callback, dialog_id) { @@ -294,10 +294,10 @@ var OCdialogs = { * fills the filepicker with files */ fillFilePicker:function(request, dialog_content_id) { - var template = '
*NAME*
*LASTMODDATE*
'; + var template = '
*NAME*
*LASTMODDATE*
'; var files = ''; $.each(request.data, function(index, file) { - files += template.replace('*LASTMODDATE*', OC.mtime2date(file.mtime)).replace('*NAME*', file.name).replace('*MIMETYPEICON*', file.mimetype_icon).replace('*ENTRYNAME*', file.name).replace('*ENTRYTYPE*', file.type); + files += template.replace('*LASTMODDATE*', OC.mtime2date(file.mtime)).replace('*NAME*', escapeHTML(file.name)).replace('*MIMETYPEICON*', file.mimetype_icon).replace('*ENTRYNAME*', escapeHTML(file.name)).replace('*ENTRYTYPE*', escapeHTML(file.type)); }); $(dialog_content_id + ' #filelist').html(files).on('click', '[data="file"]', function() { @@ -310,11 +310,11 @@ var OCdialogs = { */ fillTreeList: function(request, dialog_id) { var template = ''; - var paths = ''; + var paths = ''; var count = 1; $.each(request.data, function(index, file) { if (file.mimetype === "httpd/unix-directory") { - paths += template.replace('*COUNT*', count).replace('*NAME*', file.name); + paths += template.replace('*COUNT*', count).replace('*NAME*', escapeHTML(file.name)); count++; } }); @@ -378,7 +378,7 @@ var OCdialogs = { // this function is in early development state, please dont use it unless you know what you are doing handlePickerClick:function(element, name, dialog_content_id) { var datapath = $(dialog_content_id).data('path'); - if (datapath === undefined) datapath = ''; + if (datapath === undefined) { datapath = '' }; datapath += name; if ( $(element).attr('data') === 'file' ){ if ( $(dialog_content_id).data('multiselect') !== true) { @@ -390,7 +390,7 @@ var OCdialogs = { $(dialog_content_id).data('path', datapath); $(dialog_content_id + ' #dirtree option:last').removeAttr('selected'); var newval = parseInt($(dialog_content_id + ' #dirtree option:last').val())+1; - $(dialog_content_id + ' #dirtree').append(''); + $(dialog_content_id + ' #dirtree').append(''); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible'); $.getJSON( OC.filePath('files', 'ajax', 'rawlist.php'), From 6231e5be39b1939b8ec0d7ee96aaa7d48e71f0d1 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 14:17:47 +0200 Subject: [PATCH 3/9] Make directories clickable. A bit bugged though ... --- core/js/oc-dialogs.js | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 0aebc4d0479..2a6f1ff1638 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -303,6 +303,9 @@ var OCdialogs = { $(dialog_content_id + ' #filelist').html(files).on('click', '[data="file"]', function() { OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); }); + $(dialog_content_id + ' #filelist').html(files).on('click', '[data="dir"]', function() { + OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); + }); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden'); }, /** @@ -386,19 +389,26 @@ var OCdialogs = { } $(element).toggleClass('filepicker_element_selected'); return; + } else if ( $(element).attr('data') === 'dir' ) { + datapath += '/'; + $(dialog_content_id).data('path', datapath); + $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible'); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: datapath, + mimetype: $(dialog_content_id).data('mimetype') + }, + function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) } + ); + $.getJSON( + OC.filePath('files', 'ajax', 'rawlist.php'), + { + dir: datapath, + mimetype: "httpd/unix-directory" + }, + function(request) { OCdialogs.fillTreeList(request, dialog_content_id) } + ); } - $(dialog_content_id).data('path', datapath); - $(dialog_content_id + ' #dirtree option:last').removeAttr('selected'); - var newval = parseInt($(dialog_content_id + ' #dirtree option:last').val())+1; - $(dialog_content_id + ' #dirtree').append(''); - $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible'); - $.getJSON( - OC.filePath('files', 'ajax', 'rawlist.php'), - { - dir: datapath, - mimetype: $(dialog_content_id).data('mimetype') - }, - function(request){ OCdialogs.fillFilePicker(request, dialog_content_id) } - ); } }; From fba6681f7197650934b1bf76c8ea71f832ccd226 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 14:42:56 +0200 Subject: [PATCH 4/9] Make directories show at top. --- core/js/oc-dialogs.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 2a6f1ff1638..cd5412fdeda 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -296,10 +296,20 @@ var OCdialogs = { fillFilePicker:function(request, dialog_content_id) { var template = '
*NAME*
*LASTMODDATE*
'; var files = ''; + var dirs = []; + var others = []; $.each(request.data, function(index, file) { - files += template.replace('*LASTMODDATE*', OC.mtime2date(file.mtime)).replace('*NAME*', escapeHTML(file.name)).replace('*MIMETYPEICON*', file.mimetype_icon).replace('*ENTRYNAME*', escapeHTML(file.name)).replace('*ENTRYTYPE*', escapeHTML(file.type)); + if (file.type === 'dir') { + dirs.push(file); + } else { + others.push(file); + } }); - + var sorted = dirs.concat(others); + for (var i = 0; i < sorted.length; i++) { + files += template.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon).replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)); + } + $(dialog_content_id + ' #filelist').html(files).on('click', '[data="file"]', function() { OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); }); From 3e185911f1d6f397d95f96419e5b65c1c10390ea Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 16:44:13 +0200 Subject: [PATCH 5/9] Fix repeating directory names. Also fix some CSS for Firefox. --- core/css/styles.css | 2 +- core/js/oc-dialogs.js | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 2c570fd78e6..3324cd9be89 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -328,7 +328,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin /* ---- DIALOGS ---- */ #dirup {width:4%;} -#dirtree {width:93%;} +#dirtree {width:92%;} #filelist {height:270px; overflow-y:auto; background-color:white; width:100%;} .filepicker_element_selected { background-color:lightblue;} .filepicker_loader {height:170px; width:100%; background-color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; visibility:visible; position:absolute; top:0; left:0; text-align:center; padding-top:150px;} diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index cd5412fdeda..f929eb87dc5 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -151,6 +151,12 @@ var OCdialogs = { $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect ); $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp ); + $(dialog_id + ' #filelist').click('[data="file"]', function() { + OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); + }); + $(dialog_id + ' #filelist').on('click', '[data="dir"]', function() { + OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); + }); $(dialog_id).ready(function(){ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) { @@ -310,12 +316,7 @@ var OCdialogs = { files += template.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon).replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)); } - $(dialog_content_id + ' #filelist').html(files).on('click', '[data="file"]', function() { - OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); - }); - $(dialog_content_id + ' #filelist').html(files).on('click', '[data="dir"]', function() { - OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); - }); + $(dialog_content_id + ' #filelist').html(files); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden'); }, /** @@ -334,9 +335,10 @@ var OCdialogs = { $(dialog_id + ' #dirtree').html(paths); }, - + /** + * handle selection made in the tree list + */ handleTreeListSelect:function(event) { - // fails at paths with & if ($("option:selected", this).html().indexOf('/') !== -1) { // if there's a slash in the selected path, don't append it $(event.data.dcid).data('path', $("option:selected", this).html()); } else { @@ -360,7 +362,9 @@ var OCdialogs = { function(request) { OCdialogs.fillTreeList(request, event.data.dcid) } ); }, - // go one directory up + /** + * go one directory up + */ filepickerDirUp:function(event) { var old_path = $(event.data.dcid).data('path'); if ( old_path !== "/") { @@ -388,11 +392,10 @@ var OCdialogs = { ); } }, - // this function is in early development state, please dont use it unless you know what you are doing + /** + * handle clicks made in the filepicker + */ handlePickerClick:function(element, name, dialog_content_id) { - var datapath = $(dialog_content_id).data('path'); - if (datapath === undefined) { datapath = '' }; - datapath += name; if ( $(element).attr('data') === 'file' ){ if ( $(dialog_content_id).data('multiselect') !== true) { $(dialog_content_id + ' .filepicker_element_selected').removeClass('filepicker_element_selected'); @@ -400,7 +403,7 @@ var OCdialogs = { $(element).toggleClass('filepicker_element_selected'); return; } else if ( $(element).attr('data') === 'dir' ) { - datapath += '/'; + var datapath = escapeHTML( $(dialog_content_id).data('path') + name + '/' ); $(dialog_content_id).data('path', datapath); $(dialog_content_id + ' .filepicker_loader').css('visibility', 'visible'); $.getJSON( From d556e7fbc0f32a57ce3efc4fbb32b003b7e67b2d Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 17:22:55 +0200 Subject: [PATCH 6/9] Make files selectable again. --- core/js/oc-dialogs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f929eb87dc5..1acc96ac164 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -151,10 +151,10 @@ var OCdialogs = { $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect ); $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp ); - $(dialog_id + ' #filelist').click('[data="file"]', function() { + $(dialog_id + ' #filelist').click('[data="dir"]', function() { OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); }); - $(dialog_id + ' #filelist').on('click', '[data="dir"]', function() { + $(dialog_id + ' #filelist').on('click', '[data="file"]', function() { OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); }); @@ -174,7 +174,7 @@ var OCdialogs = { if (multiselect === true) { datapath = []; $(dialog_id + ' .filepicker_element_selected .filename').each(function(index, element) { - datapath.push( $(dialog_id).data('path') + $(elem).text() ); + datapath.push( $(dialog_id).data('path') + $(element).text() ); }); } else { var datapath = $(dialog_id).data('path'); From 275badaf766c6c1a1b8d8749361f5156a2f0e742 Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 6 Apr 2013 19:21:15 +0200 Subject: [PATCH 7/9] Make files _and_ directorys selectable/browsable. Also make long variables more readable by splitting them up into shorter ones. --- core/js/oc-dialogs.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 1acc96ac164..fcf48584c5d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -64,7 +64,8 @@ var OCdialogs = { * @param modal make the dialog modal */ prompt:function(text, title, default_value, callback, modal) { - var content = '

' + escapeHTML(text) + ':

'; + var input = ''; + var content = '

' + escapeHTML(text) + ':
' + input + '

'; OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_BUTTON, callback, modal); }, /** @@ -140,7 +141,9 @@ var OCdialogs = { filepicker:function(title, callback, multiselect, mimetype_filter, modal) { var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; var dialog_id = '#' + dialog_name; - var dialog_div = '
'; + var dialog_content = '
'; + var dialog_loader = '
'; + var dialog_div = '
' + dialog_content + dialog_loader + '
'; if (modal === undefined) { modal = false }; if (multiselect === undefined) { multiselect = false }; if (mimetype_filter === undefined) { mimetype_filter = '' }; @@ -151,12 +154,6 @@ var OCdialogs = { $(dialog_id + ' #dirtree').focus().change( {dcid: dialog_id}, OCdialogs.handleTreeListSelect ); $(dialog_id + ' #dirup').click( {dcid: dialog_id}, OCdialogs.filepickerDirUp ); - $(dialog_id + ' #filelist').click('[data="dir"]', function() { - OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); - }); - $(dialog_id + ' #filelist').on('click', '[data="file"]', function() { - OCdialogs.handlePickerClick(this, $(this).data('entryname'), $(this).data('dcid')); - }); $(dialog_id).ready(function(){ $.getJSON(OC.filePath('files', 'ajax', 'rawlist.php'), { mimetype: mimetype_filter } ,function(request) { @@ -300,7 +297,8 @@ var OCdialogs = { * fills the filepicker with files */ fillFilePicker:function(request, dialog_content_id) { - var template = '
*NAME*
*LASTMODDATE*
'; + var template_content = '*NAME*
*LASTMODDATE*
'; + var template = '
*CONTENT*
'; var files = ''; var dirs = []; var others = []; @@ -313,10 +311,15 @@ var OCdialogs = { }); var sorted = dirs.concat(others); for (var i = 0; i < sorted.length; i++) { - files += template.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon).replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)); + files_content = template_content.replace('*LASTMODDATE*', OC.mtime2date(sorted[i].mtime)).replace('*NAME*', escapeHTML(sorted[i].name)).replace('*MIMETYPEICON*', sorted[i].mimetype_icon); + files += template.replace('*ENTRYNAME*', escapeHTML(sorted[i].name)).replace('*ENTRYTYPE*', escapeHTML(sorted[i].type)).replace('*CONTENT*', files_content); } $(dialog_content_id + ' #filelist').html(files); + $('#filelist div').click(function() { + OCdialogs.handlePickerClick($(this), $(this).data('entryname'), dialog_content_id); + }); + $(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden'); }, /** From 9c53f35d9a85d7fd322c3e897821db00dc29675f Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 8 Apr 2013 22:57:46 +0200 Subject: [PATCH 8/9] Remove manual mimetype checking. --- core/js/oc-dialogs.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index fcf48584c5d..a690938f383 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -328,12 +328,8 @@ var OCdialogs = { fillTreeList: function(request, dialog_id) { var template = ''; var paths = ''; - var count = 1; $.each(request.data, function(index, file) { - if (file.mimetype === "httpd/unix-directory") { - paths += template.replace('*COUNT*', count).replace('*NAME*', escapeHTML(file.name)); - count++; - } + paths += template.replace('*COUNT*', index).replace('*NAME*', escapeHTML(file.name)); }); $(dialog_id + ' #dirtree').html(paths); From e44cc8ea578aea01bae337e17ef3f9458af41b2d Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 9 Apr 2013 13:03:37 +0200 Subject: [PATCH 9/9] Fix OC.dialogs.form() Don't do _too_ much escapeHTML() --- core/js/oc-dialogs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index a690938f383..990c3f8bf38 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -110,7 +110,7 @@ var OCdialogs = { var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; var dialog_id = '#' + dialog_name; - var dialog_div = '
' + escapeHTML(content) + '
'; + var dialog_div = '
' + content + '
'; if (modal === undefined) { modal = false }; $('body').append(dialog_div); var buttonlist = [{ @@ -205,7 +205,7 @@ var OCdialogs = { message:function(content, title, dialog_type, buttons, callback, modal) { var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content'; var dialog_id = '#' + dialog_name; - var dialog_div = '
' + escapeHTML(content) + '
'; + var dialog_div = '
' + content + '
'; if (modal === undefined) { modal = false }; $('body').append(dialog_div); var buttonlist = []; @@ -285,7 +285,7 @@ var OCdialogs = { if (callback !== undefined) { var valuelist = []; $(dialog_id + ' input, ' + dialog_id + ' select').each(function(index, element) { - valuelist[index] = { name: $(elem).attr('name'), value: OCdialogs.determineValue(elem) }; + valuelist[index] = { name: $(element).attr('name'), value: OCdialogs.determineValue(element) }; }); $(dialog_id).dialog('close'); callback(valuelist);