Replace tabs with two spaces in jstoolbar scripts (#20241).

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14414 e93f8b46-1217-0410-a6f0-8f06a7374b81

public/javascripts/jstoolbar/jstoolbar.js

@@ -23,352 +23,352 @@
 /* Modified by JP LANG for textile formatting */
 
 function jsToolBar(textarea) {
-	if (!document.createElement) { return; }
-	
-	if (!textarea) { return; }
-	
-	if ((typeof(document["selection"]) == "undefined")
-	&& (typeof(textarea["setSelectionRange"]) == "undefined")) {
-		return;
-	}
-	
-	this.textarea = textarea;
-	
-	this.editor = document.createElement('div');
-	this.editor.className = 'jstEditor';
-	
-	this.textarea.parentNode.insertBefore(this.editor,this.textarea);
-	this.editor.appendChild(this.textarea);
-	
-	this.toolbar = document.createElement("div");
-	this.toolbar.className = 'jstElements';
-	this.editor.parentNode.insertBefore(this.toolbar,this.editor);
-	
-	// Dragable resizing
-	if (this.editor.addEventListener && navigator.appVersion.match(/\bMSIE\b/))
-	{
-		this.handle = document.createElement('div');
-		this.handle.className = 'jstHandle';
-		var dragStart = this.resizeDragStart;
-		var This = this;
-		this.handle.addEventListener('mousedown',function(event) { dragStart.call(This,event); },false);
-		// fix memory leak in Firefox (bug #241518)
-		window.addEventListener('unload',function() { 
-				var del = This.handle.parentNode.removeChild(This.handle);
-				delete(This.handle);
-		},false);
-		
-		this.editor.parentNode.insertBefore(this.handle,this.editor.nextSibling);
-	}
-	
-	this.context = null;
-	this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni 
-					// de raccourcis vers les éléments DOM correspondants aux outils.
+  if (!document.createElement) { return; }
+
+  if (!textarea) { return; }
+
+  if ((typeof(document["selection"]) == "undefined")
+  && (typeof(textarea["setSelectionRange"]) == "undefined")) {
+    return;
+    }
+
+  this.textarea = textarea;
+
+  this.editor = document.createElement('div');
+  this.editor.className = 'jstEditor';
+
+  this.textarea.parentNode.insertBefore(this.editor,this.textarea);
+  this.editor.appendChild(this.textarea);
+
+  this.toolbar = document.createElement("div");
+  this.toolbar.className = 'jstElements';
+  this.editor.parentNode.insertBefore(this.toolbar,this.editor);
+
+  // Dragable resizing
+  if (this.editor.addEventListener && navigator.appVersion.match(/\bMSIE\b/))
+  {
+    this.handle = document.createElement('div');
+    this.handle.className = 'jstHandle';
+    var dragStart = this.resizeDragStart;
+    var This = this;
+    this.handle.addEventListener('mousedown',function(event) { dragStart.call(This,event); },false);
+    // fix memory leak in Firefox (bug #241518)
+    window.addEventListener('unload',function() { 
+      var del = This.handle.parentNode.removeChild(This.handle);
+      delete(This.handle);
+    },false);
+    
+    this.editor.parentNode.insertBefore(this.handle,this.editor.nextSibling);
+  }
+  
+  this.context = null;
+  this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni 
+                       // de raccourcis vers les éléments DOM correspondants aux outils.
 }
 
 function jsButton(title, fn, scope, className) {
-    if(typeof jsToolBar.strings == 'undefined') {
-      this.title = title || null;
-    } else {
+  if(typeof jsToolBar.strings == 'undefined') {
+    this.title = title || null;
+  } else {
       this.title = jsToolBar.strings[title] || title || null;
-    }
-	this.fn = fn || function(){};
-	this.scope = scope || null;
-	this.className = className || null;
+  }
+  this.fn = fn || function(){};
+  this.scope = scope || null;
+  this.className = className || null;
 }
 jsButton.prototype.draw = function() {
-	if (!this.scope) return null;
-	
-	var button = document.createElement('button');
-	button.setAttribute('type','button');
-	button.tabIndex = 200;
-	if (this.className) button.className = this.className;
-	button.title = this.title;
-	var span = document.createElement('span');
-	span.appendChild(document.createTextNode(this.title));
-	button.appendChild(span);
-	
-	if (this.icon != undefined) {
-		button.style.backgroundImage = 'url('+this.icon+')';
-	}
-	if (typeof(this.fn) == 'function') {
-		var This = this;
-		button.onclick = function() { try { This.fn.apply(This.scope, arguments) } catch (e) {} return false; };
-	}
-	return button;
+  if (!this.scope) return null;
+
+  var button = document.createElement('button');
+  button.setAttribute('type','button');
+  button.tabIndex = 200;
+  if (this.className) button.className = this.className;
+  button.title = this.title;
+  var span = document.createElement('span');
+  span.appendChild(document.createTextNode(this.title));
+  button.appendChild(span);
+
+  if (this.icon != undefined) {
+    button.style.backgroundImage = 'url('+this.icon+')';
+  }
+  if (typeof(this.fn) == 'function') {
+    var This = this;
+    button.onclick = function() { try { This.fn.apply(This.scope, arguments) } catch (e) {} return false; };
+  }
+  return button;
 }
 
 function jsSpace(id) {
-	this.id = id || null;
-	this.width = null;
+  this.id = id || null;
+  this.width = null;
 }
 jsSpace.prototype.draw = function() {
-	var span = document.createElement('span');
-	if (this.id) span.id = this.id;
-	span.appendChild(document.createTextNode(String.fromCharCode(160)));
-	span.className = 'jstSpacer';
-	if (this.width) span.style.marginRight = this.width+'px';
-	
-	return span;
+  var span = document.createElement('span');
+  if (this.id) span.id = this.id;
+  span.appendChild(document.createTextNode(String.fromCharCode(160)));
+  span.className = 'jstSpacer';
+  if (this.width) span.style.marginRight = this.width+'px';
+
+  return span;
 } 
 
 function jsCombo(title, options, scope, fn, className) {
-	this.title = title || null;
-	this.options = options || null;
-	this.scope = scope || null;
-	this.fn = fn || function(){};
-	this.className = className || null;
+  this.title = title || null;
+  this.options = options || null;
+  this.scope = scope || null;
+  this.fn = fn || function(){};
+  this.className = className || null;
 }
 jsCombo.prototype.draw = function() {
-	if (!this.scope || !this.options) return null;
-
-	var select = document.createElement('select');
-	if (this.className) select.className = className;
-	select.title = this.title;
-	
-	for (var o in this.options) {
-		//var opt = this.options[o];
-		var option = document.createElement('option');
-		option.value = o;
-		option.appendChild(document.createTextNode(this.options[o]));
-		select.appendChild(option);
-	}
-
-	var This = this;
-	select.onchange = function() {
-		try { 
-			This.fn.call(This.scope, this.value);
-		} catch (e) { alert(e); }
-
-		return false;
-	}
-
-	return select;
+  if (!this.scope || !this.options) return null;
+
+  var select = document.createElement('select');
+  if (this.className) select.className = className;
+  select.title = this.title;
+
+  for (var o in this.options) {
+    //var opt = this.options[o];
+    var option = document.createElement('option');
+    option.value = o;
+    option.appendChild(document.createTextNode(this.options[o]));
+    select.appendChild(option);
+  }
+
+  var This = this;
+  select.onchange = function() {
+    try { 
+      This.fn.call(This.scope, this.value);
+    } catch (e) { alert(e); }
+
+    return false;
+  }
+
+  return select;
 }
 
 
 jsToolBar.prototype = {
-	base_url: '',
-	mode: 'wiki',
-	elements: {},
-	help_link: '',
-	
-	getMode: function() {
-		return this.mode;
-	},
-	
-	setMode: function(mode) {
-		this.mode = mode || 'wiki';
-	},
-	
-	switchMode: function(mode) {
-		mode = mode || 'wiki';
-		this.draw(mode);
-	},
-	
-	setHelpLink: function(link) {
-		this.help_link = link;
-	},
-	
-	button: function(toolName) {
-		var tool = this.elements[toolName];
-		if (typeof tool.fn[this.mode] != 'function') return null;
-		var b = new jsButton(tool.title, tool.fn[this.mode], this, 'jstb_'+toolName);
-		if (tool.icon != undefined) b.icon = tool.icon;
-		return b;
-	},
-	space: function(toolName) {
-		var tool = new jsSpace(toolName)
-		if (this.elements[toolName].width !== undefined)
-			tool.width = this.elements[toolName].width;
-		return tool;
-	},
-	combo: function(toolName) {
-		var tool = this.elements[toolName];
-		var length = tool[this.mode].list.length;
-
-		if (typeof tool[this.mode].fn != 'function' || length == 0) {
-			return null;
-		} else {
-			var options = {};
-			for (var i=0; i < length; i++) {
-				var opt = tool[this.mode].list[i];
-				options[opt] = tool.options[opt];
-			}
-			return new jsCombo(tool.title, options, this, tool[this.mode].fn);
-		}
-	},
-	draw: function(mode) {
-		this.setMode(mode);
-		
-		// Empty toolbar
-		while (this.toolbar.hasChildNodes()) {
-			this.toolbar.removeChild(this.toolbar.firstChild)
-		}
-		this.toolNodes = {}; // vide les raccourcis DOM/**/
-
-		// Draw toolbar elements
-		var b, tool, newTool;
-		
-		for (var i in this.elements) {
-			b = this.elements[i];
-
-			var disabled =
-			b.type == undefined || b.type == ''
-			|| (b.disabled != undefined && b.disabled)
-			|| (b.context != undefined && b.context != null && b.context != this.context);
-			
-			if (!disabled && typeof this[b.type] == 'function') {
-				tool = this[b.type](i);
-				if (tool) newTool = tool.draw();
-				if (newTool) {
-					this.toolNodes[i] = newTool; //mémorise l'accès DOM pour usage éventuel ultérieur
-					this.toolbar.appendChild(newTool);
-				}
-			}
-		}
-	},
-	
-	singleTag: function(stag,etag) {
-		stag = stag || null;
-		etag = etag || stag;
-		
-		if (!stag || !etag) { return; }
-		
-		this.encloseSelection(stag,etag);
-	},
-	
-	encloseLineSelection: function(prefix, suffix, fn) {
-		this.textarea.focus();
-		
-		prefix = prefix || '';
-		suffix = suffix || '';
-		
-		var start, end, sel, scrollPos, subst, res;
-		
-		if (typeof(document["selection"]) != "undefined") {
-			sel = document.selection.createRange().text;
-		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-			start = this.textarea.selectionStart;
-			end = this.textarea.selectionEnd;
-			scrollPos = this.textarea.scrollTop;
-			// go to the start of the line
-			start = this.textarea.value.substring(0, start).replace(/[^\r\n]*$/g,'').length;
-			// go to the end of the line
-            end = this.textarea.value.length - this.textarea.value.substring(end, this.textarea.value.length).replace(/^[^\r\n]*/, '').length;
-			sel = this.textarea.value.substring(start, end);
-		}
-		
-		if (sel.match(/ $/)) { // exclude ending space char, if any
-			sel = sel.substring(0, sel.length - 1);
-			suffix = suffix + " ";
-		}
-		
-		if (typeof(fn) == 'function') {
-			res = (sel) ? fn.call(this,sel) : fn('');
-		} else {
-			res = (sel) ? sel : '';
-		}
-		
-		subst = prefix + res + suffix;
-		
-		if (typeof(document["selection"]) != "undefined") {
-			document.selection.createRange().text = subst;
-			var range = this.textarea.createTextRange();
-			range.collapse(false);
-			range.move('character', -suffix.length);
-			range.select();
-		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-			this.textarea.value = this.textarea.value.substring(0, start) + subst +
-			this.textarea.value.substring(end);
-			if (sel) {
-				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
-			} else {
-				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
-			}
-			this.textarea.scrollTop = scrollPos;
-		}
-	},
-	
-	encloseSelection: function(prefix, suffix, fn) {
-		this.textarea.focus();
-		
-		prefix = prefix || '';
-		suffix = suffix || '';
-		
-		var start, end, sel, scrollPos, subst, res;
-		
-		if (typeof(document["selection"]) != "undefined") {
-			sel = document.selection.createRange().text;
-		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-			start = this.textarea.selectionStart;
-			end = this.textarea.selectionEnd;
-			scrollPos = this.textarea.scrollTop;
-			sel = this.textarea.value.substring(start, end);
-		}
-		
-		if (sel.match(/ $/)) { // exclude ending space char, if any
-			sel = sel.substring(0, sel.length - 1);
-			suffix = suffix + " ";
-		}
-		
-		if (typeof(fn) == 'function') {
-			res = (sel) ? fn.call(this,sel) : fn('');
-		} else {
-			res = (sel) ? sel : '';
-		}
-		
-		subst = prefix + res + suffix;
-		
-		if (typeof(document["selection"]) != "undefined") {
-			document.selection.createRange().text = subst;
-			var range = this.textarea.createTextRange();
-			range.collapse(false);
-			range.move('character', -suffix.length);
-			range.select();
-//			this.textarea.caretPos -= suffix.length;
-		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-			this.textarea.value = this.textarea.value.substring(0, start) + subst +
-			this.textarea.value.substring(end);
-			if (sel) {
-				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
-			} else {
-				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
-			}
-			this.textarea.scrollTop = scrollPos;
-		}
-	},
-	
-	stripBaseURL: function(url) {
-		if (this.base_url != '') {
-			var pos = url.indexOf(this.base_url);
-			if (pos == 0) {
-				url = url.substr(this.base_url.length);
-			}
-		}
-		
-		return url;
-	}
+  base_url: '',
+  mode: 'wiki',
+  elements: {},
+  help_link: '',
+  
+  getMode: function() {
+    return this.mode;
+  },
+
+  setMode: function(mode) {
+    this.mode = mode || 'wiki';
+  },
+
+  switchMode: function(mode) {
+    mode = mode || 'wiki';
+    this.draw(mode);
+  },
+
+  setHelpLink: function(link) {
+    this.help_link = link;
+  },
+
+  button: function(toolName) {
+    var tool = this.elements[toolName];
+    if (typeof tool.fn[this.mode] != 'function') return null;
+    var b = new jsButton(tool.title, tool.fn[this.mode], this, 'jstb_'+toolName);
+    if (tool.icon != undefined) b.icon = tool.icon;
+    return b;
+  },
+  space: function(toolName) {
+    var tool = new jsSpace(toolName)
+    if (this.elements[toolName].width !== undefined)
+      tool.width = this.elements[toolName].width;
+    return tool;
+  },
+  combo: function(toolName) {
+    var tool = this.elements[toolName];
+    var length = tool[this.mode].list.length;
+
+    if (typeof tool[this.mode].fn != 'function' || length == 0) {
+      return null;
+    } else {
+      var options = {};
+      for (var i=0; i < length; i++) {
+        var opt = tool[this.mode].list[i];
+        options[opt] = tool.options[opt];
+      }
+      return new jsCombo(tool.title, options, this, tool[this.mode].fn);
+    }
+  },
+  draw: function(mode) {
+    this.setMode(mode);
+
+    // Empty toolbar
+    while (this.toolbar.hasChildNodes()) {
+      this.toolbar.removeChild(this.toolbar.firstChild)
+    }
+    this.toolNodes = {}; // vide les raccourcis DOM/**/
+
+    // Draw toolbar elements
+    var b, tool, newTool;
+
+    for (var i in this.elements) {
+      b = this.elements[i];
+
+      var disabled =
+      b.type == undefined || b.type == ''
+      || (b.disabled != undefined && b.disabled)
+      || (b.context != undefined && b.context != null && b.context != this.context);
+
+      if (!disabled && typeof this[b.type] == 'function') {
+        tool = this[b.type](i);
+        if (tool) newTool = tool.draw();
+        if (newTool) {
+          this.toolNodes[i] = newTool; //mémorise l'accès DOM pour usage éventuel ultérieur
+          this.toolbar.appendChild(newTool);
+        }
+      }
+    }
+  },
+
+  singleTag: function(stag,etag) {
+    stag = stag || null;
+    etag = etag || stag;
+
+    if (!stag || !etag) { return; }
+
+    this.encloseSelection(stag,etag);
+  },
+
+  encloseLineSelection: function(prefix, suffix, fn) {
+    this.textarea.focus();
+
+    prefix = prefix || '';
+    suffix = suffix || '';
+
+    var start, end, sel, scrollPos, subst, res;
+
+    if (typeof(document["selection"]) != "undefined") {
+      sel = document.selection.createRange().text;
+    } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+      start = this.textarea.selectionStart;
+      end = this.textarea.selectionEnd;
+      scrollPos = this.textarea.scrollTop;
+      // go to the start of the line
+      start = this.textarea.value.substring(0, start).replace(/[^\r\n]*$/g,'').length;
+      // go to the end of the line
+      end = this.textarea.value.length - this.textarea.value.substring(end, this.textarea.value.length).replace(/^[^\r\n]*/, '').length;
+      sel = this.textarea.value.substring(start, end);
+    }
+
+    if (sel.match(/ $/)) { // exclude ending space char, if any
+      sel = sel.substring(0, sel.length - 1);
+      suffix = suffix + " ";
+    }
+
+    if (typeof(fn) == 'function') {
+      res = (sel) ? fn.call(this,sel) : fn('');
+    } else {
+      res = (sel) ? sel : '';
+    }
+
+    subst = prefix + res + suffix;
+
+    if (typeof(document["selection"]) != "undefined") {
+      document.selection.createRange().text = subst;
+      var range = this.textarea.createTextRange();
+      range.collapse(false);
+      range.move('character', -suffix.length);
+      range.select();
+    } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+      this.textarea.value = this.textarea.value.substring(0, start) + subst +
+      this.textarea.value.substring(end);
+      if (sel) {
+        this.textarea.setSelectionRange(start + subst.length, start + subst.length);
+      } else {
+        this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
+      }
+      this.textarea.scrollTop = scrollPos;
+    }
+  },
+
+  encloseSelection: function(prefix, suffix, fn) {
+    this.textarea.focus();
+
+    prefix = prefix || '';
+    suffix = suffix || '';
+
+    var start, end, sel, scrollPos, subst, res;
+
+    if (typeof(document["selection"]) != "undefined") {
+      sel = document.selection.createRange().text;
+    } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+      start = this.textarea.selectionStart;
+      end = this.textarea.selectionEnd;
+      scrollPos = this.textarea.scrollTop;
+      sel = this.textarea.value.substring(start, end);
+    }
+
+    if (sel.match(/ $/)) { // exclude ending space char, if any
+      sel = sel.substring(0, sel.length - 1);
+      suffix = suffix + " ";
+    }
+
+    if (typeof(fn) == 'function') {
+      res = (sel) ? fn.call(this,sel) : fn('');
+    } else {
+      res = (sel) ? sel : '';
+    }
+
+    subst = prefix + res + suffix;
+
+    if (typeof(document["selection"]) != "undefined") {
+      document.selection.createRange().text = subst;
+      var range = this.textarea.createTextRange();
+      range.collapse(false);
+      range.move('character', -suffix.length);
+      range.select();
+//      this.textarea.caretPos -= suffix.length;
+    } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+      this.textarea.value = this.textarea.value.substring(0, start) + subst +
+      this.textarea.value.substring(end);
+      if (sel) {
+        this.textarea.setSelectionRange(start + subst.length, start + subst.length);
+      } else {
+        this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
+      }
+      this.textarea.scrollTop = scrollPos;
+    }
+  },
+
+  stripBaseURL: function(url) {
+    if (this.base_url != '') {
+      var pos = url.indexOf(this.base_url);
+      if (pos == 0) {
+        url = url.substr(this.base_url.length);
+      }
+    }
+
+    return url;
+  }
 };
 
 /** Resizer
 -------------------------------------------------------- */
 jsToolBar.prototype.resizeSetStartH = function() {
-	this.dragStartH = this.textarea.offsetHeight + 0;
+  this.dragStartH = this.textarea.offsetHeight + 0;
 };
 jsToolBar.prototype.resizeDragStart = function(event) {
-	var This = this;
-	this.dragStartY = event.clientY;
-	this.resizeSetStartH();
-	document.addEventListener('mousemove', this.dragMoveHdlr=function(event){This.resizeDragMove(event);}, false);
-	document.addEventListener('mouseup', this.dragStopHdlr=function(event){This.resizeDragStop(event);}, false);
+  var This = this;
+  this.dragStartY = event.clientY;
+  this.resizeSetStartH();
+  document.addEventListener('mousemove', this.dragMoveHdlr=function(event){This.resizeDragMove(event);}, false);
+  document.addEventListener('mouseup', this.dragStopHdlr=function(event){This.resizeDragStop(event);}, false);
 };
 
 jsToolBar.prototype.resizeDragMove = function(event) {
-	this.textarea.style.height = (this.dragStartH+event.clientY-this.dragStartY)+'px';
+  this.textarea.style.height = (this.dragStartH+event.clientY-this.dragStartY)+'px';
 };
 
 jsToolBar.prototype.resizeDragStop = function(event) {
-	document.removeEventListener('mousemove', this.dragMoveHdlr, false);
-	document.removeEventListener('mouseup', this.dragStopHdlr, false);
+  document.removeEventListener('mousemove', this.dragMoveHdlr, false);
+  document.removeEventListener('mouseup', this.dragStopHdlr, false);
 };

public/javascripts/jstoolbar/markdown.js

@@ -24,38 +24,38 @@
 
 // strong
 jsToolBar.prototype.elements.strong = {
-	type: 'button',
-	title: 'Strong',
-	fn: {
-		wiki: function() { this.singleTag('**') }
-	}
+  type: 'button',
+  title: 'Strong',
+  fn: {
+    wiki: function() { this.singleTag('**') }
+  }
 }
 
 // em
 jsToolBar.prototype.elements.em = {
-	type: 'button',
-	title: 'Italic',
-	fn: {
-		wiki: function() { this.singleTag("*") }
-	}
+  type: 'button',
+  title: 'Italic',
+  fn: {
+    wiki: function() { this.singleTag("*") }
+  }
 }
 
 // del
 jsToolBar.prototype.elements.del = {
-	type: 'button',
-	title: 'Deleted',
-	fn: {
-		wiki: function() { this.singleTag('~~') }
-	}
+  type: 'button',
+  title: 'Deleted',
+  fn: {
+    wiki: function() { this.singleTag('~~') }
+  }
 }
 
 // code
 jsToolBar.prototype.elements.code = {
-	type: 'button',
-	title: 'Code',
-	fn: {
-		wiki: function() { this.singleTag('`') }
-	}
+  type: 'button',
+  title: 'Code',
+  fn: {
+    wiki: function() { this.singleTag('`') }
+  }
 }
 
 // spacer
@@ -63,40 +63,40 @@ jsToolBar.prototype.elements.space1 = {type: 'space'}
 
 // headings
 jsToolBar.prototype.elements.h1 = {
-	type: 'button',
-	title: 'Heading 1',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('# ', '',function(str) {
-		    str = str.replace(/^#+\s+/, '')
-		    return str;
-		  });
-		}
-	}
+  type: 'button',
+  title: 'Heading 1',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('# ', '',function(str) {
+        str = str.replace(/^#+\s+/, '')
+        return str;
+      });
+    }
+  }
 }
 jsToolBar.prototype.elements.h2 = {
-	type: 'button',
-	title: 'Heading 2',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('## ', '',function(str) {
-		    str = str.replace(/^#+\s+/, '')
-		    return str;
-		  });
-		}
-	}
+  type: 'button',
+  title: 'Heading 2',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('## ', '',function(str) {
+        str = str.replace(/^#+\s+/, '')
+        return str;
+      });
+    }
+  }
 }
 jsToolBar.prototype.elements.h3 = {
-	type: 'button',
-	title: 'Heading 3',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('### ', '',function(str) {
-		    str = str.replace(/^#+\s+/, '')
-		    return str;
-		  });
-		}
-	}
+  type: 'button',
+  title: 'Heading 3',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('### ', '',function(str) {
+        str = str.replace(/^#+\s+/, '')
+        return str;
+      });
+    }
+  }
 }
 
 // spacer
@@ -104,30 +104,30 @@ jsToolBar.prototype.elements.space2 = {type: 'space'}
 
 // ul
 jsToolBar.prototype.elements.ul = {
-	type: 'button',
-	title: 'Unordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Unordered list',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
+      });
+    }
+  }
 }
 
 // ol
 jsToolBar.prototype.elements.ol = {
-	type: 'button',
-	title: 'Ordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[*-]?\s*/g,"$11. ");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Ordered list',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^)[*-]?\s*/g,"$11. ");
+      });
+    }
+  }
 }
 
 // spacer
@@ -135,39 +135,39 @@ jsToolBar.prototype.elements.space3 = {type: 'space'}
 
 // bq
 jsToolBar.prototype.elements.bq = {
-	type: 'button',
-	title: 'Quote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Quote',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+      });
+    }
+  }
 }
 
 // unbq
 jsToolBar.prototype.elements.unbq = {
-	type: 'button',
-	title: 'Unquote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Unquote',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+      });
+    }
+  }
 }
 
 // pre
 jsToolBar.prototype.elements.pre = {
-	type: 'button',
-	title: 'Preformatted text',
-	fn: {
-		wiki: function() { this.encloseLineSelection('~~~\n', '\n~~~') }
-	}
+  type: 'button',
+  title: 'Preformatted text',
+  fn: {
+    wiki: function() { this.encloseLineSelection('~~~\n', '\n~~~') }
+  }
 }
 
 // spacer
@@ -175,28 +175,28 @@ jsToolBar.prototype.elements.space4 = {type: 'space'}
 
 // wiki page
 jsToolBar.prototype.elements.link = {
-	type: 'button',
-	title: 'Wiki link',
-	fn: {
-		wiki: function() { this.encloseSelection("[[", "]]") }
-	}
+  type: 'button',
+  title: 'Wiki link',
+  fn: {
+    wiki: function() { this.encloseSelection("[[", "]]") }
+  }
 }
 // image
 jsToolBar.prototype.elements.img = {
-	type: 'button',
-	title: 'Image',
-	fn: {
-		wiki: function() { this.encloseSelection("![](", ")") }
-	}
+  type: 'button',
+  title: 'Image',
+  fn: {
+    wiki: function() { this.encloseSelection("![](", ")") }
+  }
 }
 
 // spacer
 jsToolBar.prototype.elements.space5 = {type: 'space'}
 // help
 jsToolBar.prototype.elements.help = {
-	type: 'button',
-	title: 'Help',
-	fn: {
-		wiki: function() { window.open(this.help_link, '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes') }
-	}
+  type: 'button',
+  title: 'Help',
+  fn: {
+    wiki: function() { window.open(this.help_link, '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes') }
+  }
 }

public/javascripts/jstoolbar/textile.js

@@ -24,47 +24,47 @@
 
 // strong
 jsToolBar.prototype.elements.strong = {
-	type: 'button',
-	title: 'Strong',
-	fn: {
-		wiki: function() { this.singleTag('*') }
-	}
+  type: 'button',
+  title: 'Strong',
+  fn: {
+    wiki: function() { this.singleTag('*') }
+  }
 }
 
 // em
 jsToolBar.prototype.elements.em = {
-	type: 'button',
-	title: 'Italic',
-	fn: {
-		wiki: function() { this.singleTag("_") }
-	}
+  type: 'button',
+  title: 'Italic',
+  fn: {
+    wiki: function() { this.singleTag("_") }
+  }
 }
 
 // ins
 jsToolBar.prototype.elements.ins = {
-	type: 'button',
-	title: 'Underline',
-	fn: {
-		wiki: function() { this.singleTag('+') }
-	}
+  type: 'button',
+  title: 'Underline',
+  fn: {
+    wiki: function() { this.singleTag('+') }
+  }
 }
 
 // del
 jsToolBar.prototype.elements.del = {
-	type: 'button',
-	title: 'Deleted',
-	fn: {
-		wiki: function() { this.singleTag('-') }
-	}
+  type: 'button',
+  title: 'Deleted',
+  fn: {
+    wiki: function() { this.singleTag('-') }
+  }
 }
 
 // code
 jsToolBar.prototype.elements.code = {
-	type: 'button',
-	title: 'Code',
-	fn: {
-		wiki: function() { this.singleTag('@') }
-	}
+  type: 'button',
+  title: 'Code',
+  fn: {
+    wiki: function() { this.singleTag('@') }
+  }
 }
 
 // spacer
@@ -72,40 +72,40 @@ jsToolBar.prototype.elements.space1 = {type: 'space'}
 
 // headings
 jsToolBar.prototype.elements.h1 = {
-	type: 'button',
-	title: 'Heading 1',
-	fn: {
-		wiki: function() { 
-		  this.encloseLineSelection('h1. ', '',function(str) {
-		    str = str.replace(/^h\d+\.\s+/, '')
-		    return str;
-		  });
-		}
-	}
+  type: 'button',
+  title: 'Heading 1',
+  fn: {
+    wiki: function() { 
+      this.encloseLineSelection('h1. ', '',function(str) {
+        str = str.replace(/^h\d+\.\s+/, '')
+        return str;
+      });
+    }
+  }
 }
 jsToolBar.prototype.elements.h2 = {
-	type: 'button',
-	title: 'Heading 2',
-	fn: {
-		wiki: function() { 
-		  this.encloseLineSelection('h2. ', '',function(str) {
-		    str = str.replace(/^h\d+\.\s+/, '')
-		    return str;
-		  });
-		}
-	}
+  type: 'button',
+  title: 'Heading 2',
+  fn: {
+    wiki: function() { 
+      this.encloseLineSelection('h2. ', '',function(str) {
+        str = str.replace(/^h\d+\.\s+/, '')
+        return str;
+      });
+    }
+  }
 }
 jsToolBar.prototype.elements.h3 = {
-	type: 'button',
-	title: 'Heading 3',
-	fn: {
-		wiki: function() { 
-		  this.encloseLineSelection('h3. ', '',function(str) {
-		    str = str.replace(/^h\d+\.\s+/, '')
-		    return str;
-		  });
-		}
-	}
+  type: 'button',
+  title: 'Heading 3',
+  fn: {
+    wiki: function() { 
+      this.encloseLineSelection('h3. ', '',function(str) {
+        str = str.replace(/^h\d+\.\s+/, '')
+        return str;
+      });
+    }
+  }
 }
 
 // spacer
@@ -113,30 +113,30 @@ jsToolBar.prototype.elements.space2 = {type: 'space'}
 
 // ul
 jsToolBar.prototype.elements.ul = {
-	type: 'button',
-	title: 'Unordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Unordered list',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
+      });
+    }
+  }
 }
 
 // ol
 jsToolBar.prototype.elements.ol = {
-	type: 'button',
-	title: 'Ordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[*-]?\s*/g,"$1# ");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Ordered list',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^)[*-]?\s*/g,"$1# ");
+      });
+    }
+  }
 }
 
 // spacer
@@ -144,39 +144,39 @@ jsToolBar.prototype.elements.space3 = {type: 'space'}
 
 // bq
 jsToolBar.prototype.elements.bq = {
-	type: 'button',
-	title: 'Quote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Quote',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+      });
+    }
+  }
 }
 
 // unbq
 jsToolBar.prototype.elements.unbq = {
-	type: 'button',
-	title: 'Unquote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
-			});
-		}
-	}
+  type: 'button',
+  title: 'Unquote',
+  fn: {
+    wiki: function() {
+      this.encloseLineSelection('','',function(str) {
+        str = str.replace(/\r/g,'');
+        return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+      });
+    }
+  }
 }
 
 // pre
 jsToolBar.prototype.elements.pre = {
-	type: 'button',
-	title: 'Preformatted text',
-	fn: {
-		wiki: function() { this.encloseLineSelection('<pre>\n', '\n</pre>') }
-	}
+  type: 'button',
+  title: 'Preformatted text',
+  fn: {
+    wiki: function() { this.encloseLineSelection('<pre>\n', '\n</pre>') }
+  }
 }
 
 // spacer
@@ -184,28 +184,28 @@ jsToolBar.prototype.elements.space4 = {type: 'space'}
 
 // wiki page
 jsToolBar.prototype.elements.link = {
-	type: 'button',
-	title: 'Wiki link',
-	fn: {
-		wiki: function() { this.encloseSelection("[[", "]]") }
-	}
+  type: 'button',
+  title: 'Wiki link',
+  fn: {
+    wiki: function() { this.encloseSelection("[[", "]]") }
+  }
 }
 // image
 jsToolBar.prototype.elements.img = {
-	type: 'button',
-	title: 'Image',
-	fn: {
-		wiki: function() { this.encloseSelection("!", "!") }
-	}
+  type: 'button',
+  title: 'Image',
+  fn: {
+    wiki: function() { this.encloseSelection("!", "!") }
+  }
 }
 
 // spacer
 jsToolBar.prototype.elements.space5 = {type: 'space'}
 // help
 jsToolBar.prototype.elements.help = {
-	type: 'button',
-	title: 'Help',
-	fn: {
-		wiki: function() { window.open(this.help_link, '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes') }
-	}
+  type: 'button',
+  title: 'Help',
+  fn: {
+    wiki: function() { window.open(this.help_link, '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes') }
+  }
 }