From a54367cd91fc9a232c86a328b3ea5b48a3376112 Mon Sep 17 00:00:00 2001
From: court <court@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 18 Aug 2010 17:09:47 +0000
Subject: [PATCH] updates for the wmd

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@558 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
 forum/skins/default/media/js/wmd/showdown.js |   5 +-
 forum/skins/default/media/js/wmd/wmd.css     |  31 +-
 forum/skins/default/media/js/wmd/wmd.js      | 327 ++++++++-----------
 3 files changed, 150 insertions(+), 213 deletions(-)

diff --git a/forum/skins/default/media/js/wmd/showdown.js b/forum/skins/default/media/js/wmd/showdown.js
index 3f4b994..0efa6c5 100644
--- a/forum/skins/default/media/js/wmd/showdown.js
+++ b/forum/skins/default/media/js/wmd/showdown.js
@@ -6,9 +6,6 @@
 // Original Markdown Copyright (c) 2004-2005 John Gruber
 //   <http://daringfireball.net/projects/markdown/>
 //
-// Redistributable under a BSD-style open source license.
-// See license.txt for more information.
-//
 // The full source distribution is at:
 //
 //				A A L
@@ -184,7 +181,7 @@ var _StripLinkDefinitions = function(text) {
 			  /gm,
 			  function(){...});
 	*/
-	var text = text.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|\Z)/gm,
+	var text = text.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*<?(\S+?)>?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+)/gm,
 		function (wholeMatch,m1,m2,m3,m4) {
 			m1 = m1.toLowerCase();
 			g_urls[m1] = _EncodeAmpsAndAngles(m2);  // Link IDs are case-insensitive
diff --git a/forum/skins/default/media/js/wmd/wmd.css b/forum/skins/default/media/js/wmd/wmd.css
index 80c226c..057eefd 100644
--- a/forum/skins/default/media/js/wmd/wmd.css
+++ b/forum/skins/default/media/js/wmd/wmd.css
@@ -1,23 +1,31 @@
-/*body 
+body 
 { 
 	background-color: White
 }
-*/
+
 .wmd-panel
 {
+	width: 50%;
+	min-width: 500px;
+}
+
+#wmd-editor
+{
+	background-color: Aquamarine;
 }
 
 #wmd-button-bar 
 {
-	background-color: White; 
+	width: 100%;
+	background-color: #ffffff;
 }
 
 #wmd-input 
 { 
 	height: 500px;
+	width: 100%;
 	background-color: Gainsboro;
 	border: 1px solid DarkGray;
-	margin-top: -20px;
 }
 
 #wmd-preview 
@@ -39,6 +47,7 @@
 	margin-top: 10px;
 	padding: 0px;  
 	height: 20px;
+    background-color:#ffffff;
 }
 
 .wmd-spacer
@@ -48,8 +57,10 @@
 	margin-left: 14px;
 	
 	position: absolute;
-	background-color: Silver;
-	display: inline-block; 
+    background-color:#aaaaaa;
+    /*border-color:#aaaaaa;
+    border-style:solid;*/
+	display: inline-block;
 	list-style: none;
 }
 
@@ -59,7 +70,7 @@
 	height: 20px; 
 	margin-left: 5px;
 	margin-right: 5px;
-	
+    background-color:#ffffff;
 	position: absolute;
 	background-image: url(images/wmd-buttons.png);
 	background-repeat: no-repeat;
@@ -74,7 +85,7 @@
 	height: 20px; 
 	margin-left: 5px;
 	margin-right: 5px;
-	
+
 	position: absolute;
 	display: inline-block; 
 }
@@ -111,7 +122,7 @@
 }
 
 .wmd-prompt-dialog > div {
-	font-size: 1em;
+	font-size: 0.8em;
 	font-family: arial, helvetica, sans-serif;
 }
 
@@ -124,6 +135,6 @@
 .wmd-prompt-dialog > form > input[type="button"]{
 	border: 1px solid #888888;
 	font-family: trebuchet MS, helvetica, sans-serif;
-	font-size: 1em;
+	font-size: 0.8em;
 	font-weight: bold;
 }
diff --git a/forum/skins/default/media/js/wmd/wmd.js b/forum/skins/default/media/js/wmd/wmd.js
index 957603e..5b85976 100644
--- a/forum/skins/default/media/js/wmd/wmd.js
+++ b/forum/skins/default/media/js/wmd/wmd.js
@@ -1,49 +1,3 @@
-/*
-Ajax upload
-*/jQuery.extend({createUploadIframe:function(d,b){var a="jUploadFrame"+d;if(window.ActiveXObject){var c=document.createElement('<iframe id="'+a+'" name="'+a+'" />');if(typeof b=="boolean"){c.src="javascript:false"}else{if(typeof b=="string"){c.src=b}}}else{var c=document.createElement("iframe");c.id=a;c.name=a}c.style.position="absolute";c.style.top="-1000px";c.style.left="-1000px";document.body.appendChild(c);return c},createUploadForm:function(g,b){var e="jUploadForm"+g;var a="jUploadFile"+g;var d=$('<form  action="" method="POST" name="'+e+'" id="'+e+'" enctype="multipart/form-data"></form>');var c=$("#"+b);var f=$(c).clone();$(c).attr("id",a);$(c).before(f);$(c).appendTo(d);$(d).css("position","absolute");$(d).css("top","-1200px");$(d).css("left","-1200px");$(d).appendTo("body");return d},ajaxFileUpload:function(k){k=jQuery.extend({},jQuery.ajaxSettings,k);var a=new Date().getTime();var b=jQuery.createUploadForm(a,k.fileElementId);var i=jQuery.createUploadIframe(a,k.secureuri);var h="jUploadFrame"+a;var j="jUploadForm"+a;if(k.global&&!jQuery.active++){jQuery.event.trigger("ajaxStart")}var c=false;var f={};if(k.global){jQuery.event.trigger("ajaxSend",[f,k])}var d=function(l){var p=document.getElementById(h);try{if(p.contentWindow){f.responseText=p.contentWindow.document.body?p.contentWindow.document.body.innerText:null;f.responseXML=p.contentWindow.document.XMLDocument?p.contentWindow.document.XMLDocument:p.contentWindow.document}else{if(p.contentDocument){f.responseText=p.contentDocument.document.body?p.contentDocument.document.body.textContent||document.body.innerText:null;f.responseXML=p.contentDocument.document.XMLDocument?p.contentDocument.document.XMLDocument:p.contentDocument.document}}}catch(o){jQuery.handleError(k,f,null,o)}if(f||l=="timeout"){c=true;var m;try{m=l!="timeout"?"success":"error";if(m!="error"){var n=jQuery.uploadHttpData(f,k.dataType);if(k.success){k.success(n,m)}if(k.global){jQuery.event.trigger("ajaxSuccess",[f,k])}}else{jQuery.handleError(k,f,m)}}catch(o){m="error";jQuery.handleError(k,f,m,o)}if(k.global){jQuery.event.trigger("ajaxComplete",[f,k])}if(k.global&&!--jQuery.active){jQuery.event.trigger("ajaxStop")}if(k.complete){k.complete(f,m)}jQuery(p).unbind();setTimeout(function(){try{$(p).remove();$(b).remove()}catch(q){jQuery.handleError(k,f,null,q)}},100);f=null}};if(k.timeout>0){setTimeout(function(){if(!c){d("timeout")}},k.timeout)}try{var b=$("#"+j);$(b).attr("action",k.url);$(b).attr("method","POST");$(b).attr("target",h);if(b.encoding){b.encoding="multipart/form-data"}else{b.enctype="multipart/form-data"}$(b).submit()}catch(g){jQuery.handleError(k,f,null,g)}if(window.attachEvent){document.getElementById(h).attachEvent("onload",d)}else{document.getElementById(h).addEventListener("load",d,false)}return{abort:function(){}}},uploadHttpData:function(r,type){var data=!type;data=type=="xml"||data?r.responseXML:r.responseText;if(type=="script"){jQuery.globalEval(data)}if(type=="json"){eval("data = "+data)}if(type=="html"){jQuery("<div>").html(data).evalScripts()}return data}});
-/*Upload call*/
-function ajaxFileUpload(imageUrl)
-{
-  $("#loading").ajaxStart(function(){
-      $(this).show();
-  }).ajaxComplete(function(){
-      $(this).hide();
-  });
-
-  $("#upload").ajaxStart(function(){
-          $(this).hide();
-      }).ajaxComplete(function(){
-          $(this).show();
-      });
-
-      $.ajaxFileUpload
-      (
-        {
-            url:'/upload/',
-              secureuri:false,
-              fileElementId:'file-upload',
-              dataType: 'xml',
-              success: function (data, status)
-              {
-                  var fileURL = $(data).find('file_url').text();
-                  var error = $(data).find('error').text();
-                  if(error != ''){
-                    alert(error);
-                  }else{
-                    imageUrl.attr('value', fileURL);
-                  }
-
-              },
-              error: function (data, status, e)
-              {
-                  alert(e);
-              }
-          }
-      )
-
-    return false;
-}
-
 var Attacklab = Attacklab || {};
 
 Attacklab.wmdBase = function(){
@@ -67,25 +21,13 @@ Attacklab.wmdBase = function(){
 	
 	
 	// Used to work around some browser bugs where we can't use feature testing.
-	global.isIE = /msie/.test(nav.userAgent.toLowerCase());
-	global.isIE_5or6 = /msie 6/.test(nav.userAgent.toLowerCase()) || /msie 5/.test(nav.userAgent.toLowerCase());
-	global.isIE_7plus = global.isIE && !global.isIE_5or6;
-	global.isOpera = /opera/.test(nav.userAgent.toLowerCase());
-	global.isKonqueror = /konqueror/.test(nav.userAgent.toLowerCase());
-	
-	var toolbar_strong_label = $.i18n._('bold') + " <strong> Ctrl-B";
-    var toolbar_emphasis_label = $.i18n._('italic') + " <em> Ctrl-I";
-    var toolbar_hyperlink_label = $.i18n._('link') + " <a> Ctrl-L";
-    var toolbar_blockquote_label = $.i18n._('quote') + " <blockquote> Ctrl-.";
-    var toolbar_code_label = $.i18n._('preformatted text') + " <pre><code> Ctrl-K";
-    var toolbar_image_label = $.i18n._('image') + " <img> Ctrl-G";
-    var toolbar_numbered_label = $.i18n._('numbered list') + " <ol> Ctrl-O";
-    var toolbar_bulleted_label = $.i18n._('bulleted list') + " <ul> Ctrl-U";
-    var toolbar_heading_label = $.i18n._('heading') + " <h1>/<h2> Ctrl-H";
-    var toolbar_horizontal_label = $.i18n._('horizontal bar') + " <hr> Ctrl-R";
-    var toolbar_undo_label = $.i18n._('undo') + " Ctrl-Z";
-    var toolbar_redo_label = $.i18n._('redo') + " Ctrl-Y";
-    
+	global.isIE 		= /msie/.test(nav.userAgent.toLowerCase());
+	global.isIE_5or6 	= /msie 6/.test(nav.userAgent.toLowerCase()) || /msie 5/.test(nav.userAgent.toLowerCase());
+	global.isIE_7plus 	= global.isIE && !global.isIE_5or6;
+	global.isOpera 		= /opera/.test(nav.userAgent.toLowerCase());
+	global.isKonqueror 	= /konqueror/.test(nav.userAgent.toLowerCase());
+	
+	
 	// -------------------------------------------------------------------
 	//  YOUR CHANGES GO HERE
 	//
@@ -95,13 +37,9 @@ Attacklab.wmdBase = function(){
 	
 	// The text that appears on the upper part of the dialog box when
 	// entering links.
-	var imageDialogText = "<p style='margin-top: 0px'>" + $.i18n._('enter image url') + '</p>';
-	var linkDialogText = "<p style='margin-top: 0px'>" + $.i18n._('enter url') + '</p>';
-	var uploadImageHTML ="<div>" + $.i18n._('upload image') + "</div>" + 
-        "<input type=\"file\" name=\"file-upload\" id=\"file-upload\" size=\"26\" "+
-        "onchange=\"return ajaxFileUpload($('#image-url'));\"/><br>" +
-        "<img id=\"loading\" src=\"" + mediaUrl("media/images/indicator.gif") + "\" style=\"display:none;\"/>";
-    
+	var imageDialogText = "<p style='margin-top: 0px'><b>Enter the image URL.</b></p><p>You can also add a title, which will be displayed as a tool tip.</p><p>Example:<br />http://wmd-editor.com/images/cloud1.jpg   \"Optional title\"</p>";
+	var linkDialogText = "<p style='margin-top: 0px'><b>Enter the web address.</b></p><p>You can also add a title, which will be displayed as a tool tip.</p><p>Example:<br />http://wmd-editor.com/   \"Optional title\"</p>";
+	
 	// The default text that appears in the dialog input box when entering
 	// links.
 	var imageDefaultText = "http://";
@@ -161,7 +99,7 @@ Attacklab.wmdBase = function(){
 		}
 		else if (elem.currentStyle) {
 		    // IE
-			return elem.currentStyle.display !== "none";
+			return elem.currentStyle["display"] !== "none";
 		}
 	};
 	
@@ -220,18 +158,24 @@ Attacklab.wmdBase = function(){
 		}
 		
 		var pattern = regex.toString();
-		var flags;
+		var flags = "";
 		
 		// Replace the flags with empty space and store them.
-		pattern = pattern.replace(/\/([gim]*)$/, "");
-		flags = re.$1;
+		// Technically, this can match incorrect flags like "gmm".
+		var result = pattern.match(/\/([gim]*)$/);
+		if (result === null) {
+			flags = result[0];
+		}
+		else {
+			flags = "";
+		}
 		
-		// Remove the slash delimiters on the regular expression.
-		pattern = pattern.replace(/(^\/|\/$)/g, "");
+		// Remove the flags and slash delimiters from the regular expression.
+		pattern = pattern.replace(/(^\/|\/[gim]*$)/g, "");
 		pattern = pre + pattern + post;
 		
-		return new re(pattern, flags);
-	};
+		return new RegExp(pattern, flags);
+	}
 
 	
 	// Sets the image for a button passed to the WMD editor.
@@ -262,11 +206,7 @@ Attacklab.wmdBase = function(){
 		var dialog;			// The dialog box.
 		var background;		// The background beind the dialog box.
 		var input;			// The text box where you enter the hyperlink.
-        var type = 0;
-        // The dialog box type(0: Link, 1: Image)
-        if(arguments.length == 4){
-            type = arguments[3];
-        }
+		
 
 		if (defaultInputText === undefined) {
 			defaultInputText = "";
@@ -297,7 +237,7 @@ Attacklab.wmdBase = function(){
 				text = text.replace('http://https://', 'https://');
 				text = text.replace('http://ftp://', 'ftp://');
 				
-				if (text.indexOf('http://') === -1 && text.indexOf('ftp://') === -1 && text.indexOf('/') != 0) {
+				if (text.indexOf('http://') === -1 && text.indexOf('ftp://') === -1 && text.indexOf('https://') === -1) {
 					text = 'http://' + text;
 				}
 			}
@@ -381,9 +321,6 @@ Attacklab.wmdBase = function(){
 			
 			// The input text box
 			input = doc.createElement("input");
-            if(type == 1){
-                input.id = "image-url";
-            }
 			input.type = "text";
 			input.value = defaultInputText;
 			style = input.style;
@@ -392,14 +329,6 @@ Attacklab.wmdBase = function(){
 			style.marginLeft = style.marginRight = "auto";
 			form.appendChild(input);
 			
-            // The upload file input
-            if(type == 1){
-                var upload = doc.createElement("div");
-                upload.innerHTML = uploadImageHTML;
-                upload.style.padding = "5px";
-                form.appendChild(upload);   
-            }
-            
 			// The ok button
 			var okButton = doc.createElement("input");
 			okButton.type = "button";
@@ -481,10 +410,9 @@ Attacklab.wmdBase = function(){
 	position.getTop = function(elem, isInner){
 		var result = elem.offsetTop;
 		if (!isInner) {
-        while (elem.offsetParent) {
-            elem = elem.offsetParent;
-            result += elem.offsetTop;
-        }
+			while (elem = elem.offsetParent) {
+				result += elem.offsetTop;
+			}
 		}
 		return result;
 	};
@@ -811,7 +739,7 @@ Attacklab.wmdBase = function(){
 			
 			var handlePaste = function(){
 				if (global.isIE || (inputStateObj && inputStateObj.text != wmd.panels.input.value)) {
-					if (timer === undefined) {
+					if (timer == undefined) {
 						mode = "paste";
 						saveState();
 						refreshState();
@@ -918,7 +846,8 @@ Attacklab.wmdBase = function(){
 					previewRefreshCallback();
 				};
 				
-				var noCleanup = button.textOp(chunks, fixupInputArea);
+				var useDefaultText = true;
+				var noCleanup = button.textOp(chunks, fixupInputArea, useDefaultText);
 				
 				if(!noCleanup) {
 					fixupInputArea();
@@ -972,17 +901,19 @@ Attacklab.wmdBase = function(){
 						}
 						doClick(this);
 						return false;
-					};
+					}
 				}
 			}
 			else {
 				button.style.backgroundPosition = button.XShift + " " + disabledYShift;
 				button.onmouseover = button.onmouseout = button.onclick = function(){};
 			}
-		};
-
+		}
+	
 		var makeSpritedButtonRow = function(){
+		 	
 			var buttonBar = document.getElementById("wmd-button-bar");
+ 	
 			var normalYShift = "0px";
 			var disabledYShift = "-20px";
 			var highlightYShift = "-40px";
@@ -995,7 +926,7 @@ Attacklab.wmdBase = function(){
 			var boldButton = document.createElement("li");
 			boldButton.className = "wmd-button";
 			boldButton.id = "wmd-bold-button";
-			boldButton.title = toolbar_strong_label;
+			boldButton.title = "Strong <strong> Ctrl+B";
 			boldButton.XShift = "0px";
 			boldButton.textOp = command.doBold;
 			setupButton(boldButton, true);
@@ -1004,7 +935,7 @@ Attacklab.wmdBase = function(){
 			var italicButton = document.createElement("li");
 			italicButton.className = "wmd-button";
 			italicButton.id = "wmd-italic-button";
-			italicButton.title = toolbar_emphasis_label;
+			italicButton.title = "Emphasis <em> Ctrl+I";
 			italicButton.XShift = "-20px";
 			italicButton.textOp = command.doItalic;
 			setupButton(italicButton, true);
@@ -1018,9 +949,9 @@ Attacklab.wmdBase = function(){
 			var linkButton = document.createElement("li");
 			linkButton.className = "wmd-button";
 			linkButton.id = "wmd-link-button";
-			linkButton.title = toolbar_hyperlink_label;
+			linkButton.title = "Hyperlink <a> Ctrl+L";
 			linkButton.XShift = "-40px";
-			linkButton.textOp = function(chunk, postProcessing){
+			linkButton.textOp = function(chunk, postProcessing, useDefaultText){
 				return command.doLinkOrImage(chunk, postProcessing, false);
 			};
 			setupButton(linkButton, true);
@@ -1029,7 +960,7 @@ Attacklab.wmdBase = function(){
 			var quoteButton = document.createElement("li");
 			quoteButton.className = "wmd-button";
 			quoteButton.id = "wmd-quote-button";
-			quoteButton.title = toolbar_blockquote_label;
+			quoteButton.title = "Blockquote <blockquote> Ctrl+Q";
 			quoteButton.XShift = "-60px";
 			quoteButton.textOp = command.doBlockquote;
 			setupButton(quoteButton, true);
@@ -1038,7 +969,7 @@ Attacklab.wmdBase = function(){
 			var codeButton = document.createElement("li");
 			codeButton.className = "wmd-button";
 			codeButton.id = "wmd-code-button";
-			codeButton.title = toolbar_code_label;
+			codeButton.title = "Code Sample <pre><code> Ctrl+K";
 			codeButton.XShift = "-80px";
 			codeButton.textOp = command.doCode;
 			setupButton(codeButton, true);
@@ -1047,9 +978,9 @@ Attacklab.wmdBase = function(){
 			var imageButton = document.createElement("li");
 			imageButton.className = "wmd-button";
 			imageButton.id = "wmd-image-button";
-			imageButton.title = toolbar_image_label;
+			imageButton.title = "Image <img> Ctrl+G";
 			imageButton.XShift = "-100px";
-			imageButton.textOp = function(chunk, postProcessing){
+			imageButton.textOp = function(chunk, postProcessing, useDefaultText){
 				return command.doLinkOrImage(chunk, postProcessing, true);
 			};
 			setupButton(imageButton, true);
@@ -1063,10 +994,10 @@ Attacklab.wmdBase = function(){
 			var olistButton = document.createElement("li");
 			olistButton.className = "wmd-button";
 			olistButton.id = "wmd-olist-button";
-			olistButton.title = toolbar_numbered_label;
+			olistButton.title = "Numbered List <ol> Ctrl+O";
 			olistButton.XShift = "-120px";
-			olistButton.textOp = function(chunk, postProcessing){
-				command.doList(chunk, postProcessing, true);
+			olistButton.textOp = function(chunk, postProcessing, useDefaultText){
+				command.doList(chunk, postProcessing, true, useDefaultText);
 			};
 			setupButton(olistButton, true);
 			buttonRow.appendChild(olistButton);
@@ -1074,10 +1005,10 @@ Attacklab.wmdBase = function(){
 			var ulistButton = document.createElement("li");
 			ulistButton.className = "wmd-button";
 			ulistButton.id = "wmd-ulist-button";
-			ulistButton.title = toolbar_bulleted_label;
+			ulistButton.title = "Bulleted List <ul> Ctrl+U";
 			ulistButton.XShift = "-140px";
-			ulistButton.textOp = function(chunk, postProcessing){
-				command.doList(chunk, postProcessing, false);
+			ulistButton.textOp = function(chunk, postProcessing, useDefaultText){
+				command.doList(chunk, postProcessing, false, useDefaultText);
 			};
 			setupButton(ulistButton, true);
 			buttonRow.appendChild(ulistButton);
@@ -1085,7 +1016,7 @@ Attacklab.wmdBase = function(){
 			var headingButton = document.createElement("li");
 			headingButton.className = "wmd-button";
 			headingButton.id = "wmd-heading-button";
-			headingButton.title = toolbar_heading_label;
+			headingButton.title = "Heading <h1>/<h2> Ctrl+H";
 			headingButton.XShift = "-160px";
 			headingButton.textOp = command.doHeading;
 			setupButton(headingButton, true);
@@ -1094,7 +1025,7 @@ Attacklab.wmdBase = function(){
 			var hrButton = document.createElement("li");
 			hrButton.className = "wmd-button";
 			hrButton.id = "wmd-hr-button";
-			hrButton.title = toolbar_horizontal_label;
+			hrButton.title = "Horizontal Rule <hr> Ctrl+R";
 			hrButton.XShift = "-180px";
 			hrButton.textOp = command.doHorizontalRule;
 			setupButton(hrButton, true);
@@ -1108,7 +1039,7 @@ Attacklab.wmdBase = function(){
 			var undoButton = document.createElement("li");
 			undoButton.className = "wmd-button";
 			undoButton.id = "wmd-undo-button";
-			undoButton.title = toolbar_undo_label;
+			undoButton.title = "Undo - Ctrl+Z";
 			undoButton.XShift = "-200px";
 			undoButton.execute = function(manager){
 				manager.undo();
@@ -1119,13 +1050,13 @@ Attacklab.wmdBase = function(){
 			var redoButton = document.createElement("li");
 			redoButton.className = "wmd-button";
 			redoButton.id = "wmd-redo-button";
-			redoButton.title = toolbar_redo_label;
+			redoButton.title = "Redo - Ctrl+Y";
 			if (/win/.test(nav.platform.toLowerCase())) {
-				redoButton.title = toolbar_redo_label;
+				redoButton.title = "Redo - Ctrl+Y";
 			}
 			else {
 				// mac and other non-Windows platforms
-				redoButton.title = $.i18n._('redo') + " - Ctrl+Shift+Z";
+				redoButton.title = "Redo - Ctrl+Shift+Z";
 			}
 			redoButton.XShift = "-220px";
 			redoButton.execute = function(manager){
@@ -1133,24 +1064,9 @@ Attacklab.wmdBase = function(){
 			};
 			setupButton(redoButton, true);
 			buttonRow.appendChild(redoButton); 
-			/*
-			var helpButton = document.createElement("li");
-			helpButton.className = "wmd-button";
-			helpButton.id = "wmd-help-button";
-			helpButton.XShift = "-240px";
-			helpButton.isHelp = true;
-			
-			var helpAnchor = document.createElement("a");
-			helpAnchor.href = helpLink;
-			helpAnchor.target = helpTarget
-			helpAnchor.title = helpHoverTitle;
-			helpButton.appendChild(helpAnchor);
-			
-			setupButton(helpButton, true);
-			buttonRow.appendChild(helpButton);
-			*/
+			
 			setUndoRedoButtonStates();
-		};
+		}
 		
 		var setupEditor = function(){
 		
@@ -1177,18 +1093,10 @@ Attacklab.wmdBase = function(){
 				
 				// Check to see if we have a button key and, if so execute the callback.
 				if (key.ctrlKey || key.metaKey) {
-				
+			
 					var keyCode = key.charCode || key.keyCode;
 					var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
 					
-					// Bugfix for messed up DEL and .
-					if (keyCode === 46) {
-						keyCodeStr = "";
-					}
-					if (keyCode === 190) {
-						keyCodeStr = ".";
-					}
-					
 					switch(keyCodeStr) {
 						case "b":
 							doClick(document.getElementById("wmd-bold-button"));
@@ -1199,7 +1107,7 @@ Attacklab.wmdBase = function(){
 						case "l":
 							doClick(document.getElementById("wmd-link-button"));
 							break;
-						case ".":
+						case "q":
 							doClick(document.getElementById("wmd-quote-button"));
 							break;
 						case "k":
@@ -1246,11 +1154,12 @@ Attacklab.wmdBase = function(){
 				}
 			});
 			
-			// Auto-indent on shift-enter
+			// Auto-continue lists, code blocks and block quotes when
+			// the enter key is pressed.
 			util.addEvent(inputBox, "keyup", function(key){
-				if (key.shiftKey && !key.ctrlKey && !key.metaKey) {
+				if (!key.shiftKey && !key.ctrlKey && !key.metaKey) {
 					var keyCode = key.charCode || key.keyCode;
-					// Character 13 is Enter
+					// Key code 13 is Enter
 					if (keyCode === 13) {
 						fakeButton = {};
 						fakeButton.textOp = command.doAutoindent;
@@ -1259,6 +1168,17 @@ Attacklab.wmdBase = function(){
 				}
 			});
 			
+			// Disable ESC clearing the input textarea on IE
+			if (global.isIE) {
+				util.addEvent(inputBox, "keydown", function(key){
+					var code = key.keyCode;
+					// Key code 27 is ESC
+					if (code === 27) {
+						return false;
+					}
+				});
+			}
+			
 			if (inputBox.form) {
 				var submitCallback = inputBox.form.onsubmit;
 				inputBox.form.onsubmit = function(){
@@ -1346,7 +1266,7 @@ Attacklab.wmdBase = function(){
 				this.text = inputArea.value;
 			}
 			
-		};
+		}
 		
 		// Sets the selected text in the input box after we've performed an
 		// operation.
@@ -1432,7 +1352,7 @@ Attacklab.wmdBase = function(){
 		// Restore this state into the input area.
 		this.restore = function(){
 		
-			if (stateObj.text !== undefined && stateObj.text != inputArea.value) {
+			if (stateObj.text != undefined && stateObj.text != inputArea.value) {
 				inputArea.value = stateObj.text;
 			}
 			this.setInputAreaSelection();
@@ -1546,7 +1466,7 @@ Attacklab.wmdBase = function(){
 	};
 	
 	
-	wmd.Chunks.prototype.skipLines = function(nLinesBefore, nLinesAfter, findExtraNewlines){
+	wmd.Chunks.prototype.addBlankLines = function(nLinesBefore, nLinesAfter, findExtraNewlines){
 	
 		if (nLinesBefore === undefined) {
 			nLinesBefore = 1;
@@ -1625,18 +1545,18 @@ Attacklab.wmdBase = function(){
 		chunk.selection = chunk.selection.replace(/\s+$/, "");
 	};
 	
-	command.doBold = function(chunk, postProcessing){
-		return command.doBorI(chunk, postProcessing, 2, "strong text");
+	command.doBold = function(chunk, postProcessing, useDefaultText){
+		return command.doBorI(chunk, 2, "strong text");
 	};
 	
-	command.doItalic = function(chunk, postProcessing){
-		return command.doBorI(chunk, postProcessing, 1, "emphasized text");
+	command.doItalic = function(chunk, postProcessing, useDefaultText){
+		return command.doBorI(chunk, 1, "emphasized text");
 	};
 	
 	// chunk: The selected region that will be enclosed with */**
 	// nStars: 1 for italics, 2 for bold
 	// insertText: If you just click the button without highlighting text, this gets inserted
-	command.doBorI = function(chunk, postProcessing, nStars, insertText){
+	command.doBorI = function(chunk, nStars, insertText){
 	
 		// Get rid of whitespace and fixup newlines.
 		chunk.trimWhitespace();
@@ -1795,8 +1715,7 @@ Attacklab.wmdBase = function(){
 			};
 			
 			if (isImage) {
-                // add forth param to identify image window
-				util.prompt(imageDialogText, imageDefaultText, makeLinkMarkdown, 1);
+				util.prompt(imageDialogText, imageDefaultText, makeLinkMarkdown);
 			}
 			else {
 				util.prompt(linkDialogText, linkDefaultText, makeLinkMarkdown);
@@ -1951,10 +1870,12 @@ Attacklab.wmdBase = function(){
 		
 			if (wmd.panels.preview) {
 				wmd.panels.preview.scrollTop = (wmd.panels.preview.scrollHeight - wmd.panels.preview.clientHeight) * getScaleFactor(wmd.panels.preview);
+				;
 			}
 			
 			if (wmd.panels.output) {
 				wmd.panels.output.scrollTop = (wmd.panels.output.scrollHeight - wmd.panels.output.clientHeight) * getScaleFactor(wmd.panels.output);
+				;
 			}
 		};
 		
@@ -2051,32 +1972,38 @@ Attacklab.wmdBase = function(){
 		init();
 	};
 
-	// When making a list, hitting shift-enter will put your cursor on the next line
-	// at the current indent level.
-	command.doAutoindent = function(chunk, postProcessing){
+	// Moves the cursor to the next line and continues lists, quotes and code.
+	command.doAutoindent = function(chunk, postProcessing, useDefaultText){
 		
 		chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/, "\n\n");
 		chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/, "\n\n");
 		chunk.before = chunk.before.replace(/(\n|^)[ \t]+\n$/, "\n\n");
 		
-		if(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]+.*\n$/.test(chunk.before)){
+		useDefaultText = false;
+		
+		if(/(\n|^)[ ]{0,3}([*+-])[ \t]+.*\n$/.test(chunk.before)){
 			if(command.doList){
-				command.doList(chunk);
+				command.doList(chunk, postProcessing, false, true);
+			}
+		}
+		if(/(\n|^)[ ]{0,3}(\d+[.])[ \t]+.*\n$/.test(chunk.before)){
+			if(command.doList){
+				command.doList(chunk, postProcessing, true, true);
 			}
 		}
 		if(/(\n|^)[ ]{0,3}>[ \t]+.*\n$/.test(chunk.before)){
 			if(command.doBlockquote){
-				command.doBlockquote(chunk);
+				command.doBlockquote(chunk, postProcessing, useDefaultText);
 			}
 		}
 		if(/(\n|^)(\t|[ ]{4,}).*\n$/.test(chunk.before)){
 			if(command.doCode){
-				command.doCode(chunk);
+				command.doCode(chunk, postProcessing, useDefaultText);
 			}
 		}
 	};
 	
-	command.doBlockquote = function(chunk, postProcessing){
+	command.doBlockquote = function(chunk, postProcessing, useDefaultText){
 		
 		chunk.selection = chunk.selection.replace(/^(\n*)([^\r]+?)(\n*)$/,
 			function(totalMatch, newlinesBefore, text, newlinesAfter){
@@ -2090,9 +2017,10 @@ Attacklab.wmdBase = function(){
 				chunk.selection = blankLine + chunk.selection;
 				return "";
 			});
-			
+		
+		var defaultText = useDefaultText ? "Blockquote" : "";
 		chunk.selection = chunk.selection.replace(/^(\s|>)+$/ ,"");
-		chunk.selection = chunk.selection || "Blockquote";
+		chunk.selection = chunk.selection || defaultText;
 		
 		if(chunk.before){
 			chunk.before = chunk.before.replace(/\n?$/,"\n");
@@ -2135,7 +2063,7 @@ Attacklab.wmdBase = function(){
 			command.wrap(chunk, wmd.wmd_env.lineLength - 2);
 			chunk.selection = chunk.selection.replace(/^/gm, "> ");
 			replaceBlanksInTags(true);
-			chunk.skipLines();
+			chunk.addBlankLines();
 		}
 		else{
 			chunk.selection = chunk.selection.replace(/^[ ]{0,3}> ?/gm, "");
@@ -2160,7 +2088,7 @@ Attacklab.wmdBase = function(){
 		}
 	};
 
-	command.doCode = function(chunk, postProcessing){
+	command.doCode = function(chunk, postProcessing, useDefaultText){
 		
 		var hasTextBefore = /\S[ ]*$/.test(chunk.before);
 		var hasTextAfter = /^[ ]*\S/.test(chunk.after);
@@ -2175,21 +2103,22 @@ Attacklab.wmdBase = function(){
 					return "";
 				});
 				
-			var nLinesBack = 1;
-			var nLinesForward = 1;
+			var nLinesBefore = 1;
+			var nLinesAfter = 1;
+			
 			
-			if(/\n(\t|[ ]{4,}).*\n$/.test(chunk.before)){
-				nLinesBack = 0;
+			if(/\n(\t|[ ]{4,}).*\n$/.test(chunk.before) || chunk.after === ""){
+				nLinesBefore = 0; 
 			}
 			if(/^\n(\t|[ ]{4,})/.test(chunk.after)){
-				nLinesForward = 0;
+				nLinesAfter = 0; // This needs to happen on line 1
 			}
 			
-			chunk.skipLines(nLinesBack, nLinesForward);
+			chunk.addBlankLines(nLinesBefore, nLinesAfter);
 			
 			if(!chunk.selection){
 				chunk.startTag = "    ";
-				chunk.selection = "enter code here";
+				chunk.selection = useDefaultText ? "enter code here" : "";
 			}
 			else {
 				if(/^[ ]{0,3}\S/m.test(chunk.selection)){
@@ -2209,7 +2138,7 @@ Attacklab.wmdBase = function(){
 			if(!chunk.startTag && !chunk.endTag){
 				chunk.startTag = chunk.endTag="`";
 				if(!chunk.selection){
-					chunk.selection = "enter code here";
+					chunk.selection = useDefaultText ? "enter code here" : "";
 				}
 			}
 			else if(chunk.endTag && !chunk.startTag){
@@ -2222,7 +2151,7 @@ Attacklab.wmdBase = function(){
 		}
 	};
 	
-	command.doList = function(chunk, postProcessing, isNumberedList){
+	command.doList = function(chunk, postProcessing, isNumberedList, useDefaultText){
 				
 		// These are identical except at the very beginning and end.
 		// Should probably use the regex extension function to make this clearer.
@@ -2280,7 +2209,7 @@ Attacklab.wmdBase = function(){
 			chunk.startTag = "";
 			chunk.selection = chunk.selection.replace(/\n[ ]{4}/g, "\n");
 			command.unwrap(chunk);
-			chunk.skipLines();
+			chunk.addBlankLines();
 			
 			if(hasDigits){
 				// Have to renumber the bullet points if this is a numbered list.
@@ -2291,33 +2220,33 @@ Attacklab.wmdBase = function(){
 			}
 		}
 		
-		var nLinesUp = 1;
+		var nLinesBefore = 1;
 		
 		chunk.before = chunk.before.replace(previousItemsRegex,
 			function(itemText){
 				if(/^\s*([*+-])/.test(itemText)){
 					bullet = re.$1;
 				}
-				nLinesUp = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
+				nLinesBefore = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
 				return getPrefixedItem(itemText);
 			});
 			
 		if(!chunk.selection){
-			chunk.selection = "List item";
+			chunk.selection = useDefaultText ? "List item" : " ";
 		}
 		
 		var prefix = getItemPrefix();
 		
-		var nLinesDown = 1;
+		var nLinesAfter = 1;
 		
 		chunk.after = chunk.after.replace(nextItemsRegex,
 			function(itemText){
-				nLinesDown = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
+				nLinesAfter = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
 				return getPrefixedItem(itemText);
 			});
 			
 		chunk.trimWhitespace(true);
-		chunk.skipLines(nLinesUp, nLinesDown, true);
+		chunk.addBlankLines(nLinesBefore, nLinesAfter, true);
 		chunk.startTag = prefix;
 		var spaces = prefix.replace(/./g, " ");
 		command.wrap(chunk, wmd.wmd_env.lineLength - spaces.length);
@@ -2325,7 +2254,7 @@ Attacklab.wmdBase = function(){
 		
 	};
 	
-	command.doHeading = function(chunk, postProcessing){
+	command.doHeading = function(chunk, postProcessing, useDefaultText){
 		
 		// Remove leading/trailing whitespace and reduce internal spaces to single spaces.
 		chunk.selection = chunk.selection.replace(/\s+/g, " ");
@@ -2361,7 +2290,7 @@ Attacklab.wmdBase = function(){
 		
 		// Skip to the next line so we can create the header markdown.
 		chunk.startTag = chunk.endTag = "";
-		chunk.skipLines(1, 1);
+		chunk.addBlankLines(1, 1);
 
 		// We make a level 2 header if there is no current header.
 		// If there is a header level, we substract one from the header level.
@@ -2384,17 +2313,17 @@ Attacklab.wmdBase = function(){
 		}
 	};	
 	
-	command.doHorizontalRule = function(chunk, postProcessing){
+	command.doHorizontalRule = function(chunk, postProcessing, useDefaultText){
 		chunk.startTag = "----------\n";
 		chunk.selection = "";
-		chunk.skipLines(2, 1, true);
+		chunk.addBlankLines(2, 1, true);
 	}
 };
 
 
 Attacklab.wmd_env = {};
 Attacklab.account_options = {};
-Attacklab.wmd_defaults = {version:1, output:"Markdown", lineLength:40, delayLoad:false};
+Attacklab.wmd_defaults = {version:1, output:"HTML", lineLength:40, delayLoad:false};
 
 if(!Attacklab.wmd)
 {
-- 
2.39.5