Dialogs: Clean indentation. Add some missing brackets.

1 files changed, 239 insertions, 220 deletions

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 4240b75c6f8..0fa41696a16 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -20,226 +20,245 @@
  */
 
 /**
- * this class ease usage of jquery dialogs
+ * this class to ease the usage of jquery dialogs
  */
 OCdialogs = {
-  /**
-   * displays alert dialog
-   * @param text content of dialog
-   * @param title dialog title
-   * @param callback which will be triggered when user press OK
-   */
-  alert:function(text, title, callback, modal) {
-    var content = '<p><span class="ui-icon ui-icon-alert"></span>'+text+'</p>';
-    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
-   */
-  info:function(text, title, callback, modal) {
-    var content = '<p><span class="ui-icon ui-icon-info"></span>'+text+'</p>';
-    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)
-   */
-  confirm:function(text, title, callback, modal) {
-    var content = '<p><span class="ui-icon ui-icon-notice"></span>'+text+'</p>';
-    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)
-   */
-  prompt:function(text, title, default_value, callback, modal) {
-    var content = '<p><span class="ui-icon ui-icon-pencil"></span>'+text+':<br/><input type="text" id="oc-dialog-prompt-input" value="'+default_value+'" style="width:90%"></p>';
-    OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, 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'},...]
-   * @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'},...])
-   */
-  form:function(fields, title, callback, modal) {
-    var content = '<table>';
-    for (var a in fields) {
-      content += '<tr><td>'+fields[a].text+'</td><td>';
-      var type=fields[a].type;
-      if (type == 'text' || type == 'checkbox' || type == 'password') {
-          content += '<input type="'+type+'" name="'+fields[a].name+'"';
-          if (type == 'checkbox') {
-            if (fields[a].value != undefined && fields[a].value == true) {
-              content += ' checked="checked">';
-            } 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 += '</table>';
-    OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, 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 = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>';
-    if (!modal) modal = false;
-    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)});
-    }).data('multiselect', multiselect).data('mimetype',mimetype_filter);
-    // build buttons
-    var b = [
-      {text: t('dialogs', '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');
-          }
-        }
-      },
-      {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }}
-      ];
-      $(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b});
-    OCdialogs.dialogs_counter++;
-  },
-  // guts, dont use, dont touch
-  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 = '<div id="'+c_name+'" title="'+title+'">'+content+'</div>';
-    if (modal == undefined) modal = false;
-    $('body').append(d);
-    var b = [];
-    switch (buttons) {
-      case OCdialogs.YES_NO_BUTTONS:
-        b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
-        b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
-      break;
-      case OCdialogs.OK_CANCEL_BUTTONS:
-        b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
-      case OCdialogs.OK_BUTTON: // fallthrough
-        var f;
-        switch(dialog_type) {
-          case OCdialogs.ALERT_DIALOG:
-            f = function(){$(c_id).dialog('close'); if(callback) 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)};
-          break;
-        }
-        b[0] = {text: t('dialogs', 'Ok'), click: f};
-      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});
-    OCdialogs.dialogs_counter++;
-  },
-  // dialogs buttons types
-  YES_NO_BUTTONS: 70,
-  OK_BUTTONS: 71,
-  OK_CANCEL_BUTTONS: 72,
-  // dialogs types
-  ALERT_DIALOG: 80,
-  INFO_DIALOG: 81,
-  PROMPT_DIALOG: 82,
-  FORM_DIALOG: 83,
-  dialogs_counter: 0,
-  determineValue: function(element) {
-    switch ($(element).attr('type')) {
-      case 'checkbox': return element.checked;
-    }
-    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++;
-      });
-      $(c_id).dialog('close');
-      callback(r);
-    } else {
-      $(c_id).dialog('close');
-    }
-  },
-  fillFilePicker:function(r, dialog_content_id) {
-    var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
-    var names = '';
-    for (var a in r.data) {
-      names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', r.data[a].mimetype_icon).replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type);
-    }
-    $(dialog_content_id + ' #filelist').html(names);
-    $(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; }path += '/'+$(element).text(); });
-    $(event.data.dcid).data('path', path);
-    $(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)});
-  },
-  // 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');
-      $(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('<option selected="selected" value="'+newval+'">'+name+'</option>');
-    $(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)});
-  }
+	/**
+	* displays alert dialog
+	* @param text content of dialog
+	* @param title dialog title
+	* @param callback which will be triggered when user press OK
+	*/
+	alert:function(text, title, callback, modal) {
+		var content = '<p><span class="ui-icon ui-icon-alert"></span>'+text+'</p>';
+		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
+	*/
+	info:function(text, title, callback, modal) {
+		var content = '<p><span class="ui-icon ui-icon-info"></span>'+text+'</p>';
+		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)
+	*/
+	confirm:function(text, title, callback, modal) {
+		var content = '<p><span class="ui-icon ui-icon-notice"></span>'+text+'</p>';
+		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)
+	*/
+	prompt:function(text, title, default_value, callback, modal) {
+		var content = '<p><span class="ui-icon ui-icon-pencil"></span>'+text+':<br/><input type="text" id="oc-dialog-prompt-input" value="'+default_value+'" style="width:90%"></p>';
+		OCdialogs.message(content, title, OCdialogs.PROMPT_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, 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'},...]
+	* @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'},...])
+	*/
+	form:function(fields, title, callback, modal) {
+		var content = '<table>';
+		for (var a in fields) {
+			content += '<tr><td>'+fields[a].text+'</td><td>';
+			var type=fields[a].type;
+			if (type == 'text' || type == 'checkbox' || type == 'password') {
+				content += '<input type="'+type+'" name="'+fields[a].name+'"';
+				if (type == 'checkbox') {
+					if (fields[a].value != undefined && fields[a].value == true) {
+						content += ' checked="checked">';
+					} 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 += '</table>';
+		OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, 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 = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>';
+		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)
+			});
+		}).data('multiselect', multiselect).data('mimetype',mimetype_filter);
+		// build buttons
+		var b = [{
+			text: t('dialogs', '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');
+				}
+			}
+		},
+		{
+			text: t('dialogs', 'Cancel'), 
+			click: function(){$(c_id).dialog('close'); }}
+		];
+		$(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b});
+		OCdialogs.dialogs_counter++;
+	},
+	// guts, dont use, dont touch
+	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 = '<div id="'+c_name+'" title="'+title+'">'+content+'</div>';
+		if (modal == undefined) modal = false;
+		$('body').append(d);
+		var b = [];
+		switch (buttons) {
+			case OCdialogs.YES_NO_BUTTONS:
+				b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }};
+				b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}};
+			break;
+			case OCdialogs.OK_CANCEL_BUTTONS:
+				b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }};
+			case OCdialogs.OK_BUTTON: // fallthrough
+				var f;
+				switch(dialog_type) {
+					case OCdialogs.ALERT_DIALOG:
+						f = function(){$(c_id).dialog('close'); if(callback) 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)};
+					break;
+				}
+				b[0] = {text: t('dialogs', 'Ok'), click: f};
+			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});
+		OCdialogs.dialogs_counter++;
+	},
+	// dialogs buttons types
+	YES_NO_BUTTONS: 70,
+	OK_BUTTONS: 71,
+	OK_CANCEL_BUTTONS: 72,
+	// dialogs types
+	ALERT_DIALOG: 80,
+	INFO_DIALOG: 81,
+	PROMPT_DIALOG: 82,
+	FORM_DIALOG: 83,
+	dialogs_counter: 0,
+	determineValue: function(element) {
+		switch ($(element).attr('type')) {
+			case 'checkbox': return element.checked;
+		}
+		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++;
+			});
+			$(c_id).dialog('close');
+			callback(r);
+		} else {
+			$(c_id).dialog('close');
+		}
+	},
+	fillFilePicker:function(r, dialog_content_id) {
+		var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
+		var names = '';
+		for (var a in r.data) {
+			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', r.data[a].mimetype_icon).replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type);
+		}
+		$(dialog_content_id + ' #filelist').html(names);
+		$(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; 
+			}
+			path += '/'+$(element).text();
+		});
+		$(event.data.dcid).data('path', path);
+		$(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)});
+	},
+	// 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');
+			}
+			$(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('<option selected="selected" value="'+newval+'">'+name+'</option>');
+		$(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)});
+	}
 };