From c99817b1b70778de059823134b3c59f61fe1add9 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Wed, 23 Feb 2011 21:53:31 +0100
Subject: [PATCH 01/60] Added jQuery 1.5 link

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 38fc339..af3834d 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
 <title>markItUp! Universal markup editor</title>
 <link rel="stylesheet" type="text/css" href="images/style.css" />
 <!-- jQuery -->
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.3.min.js"></script>
+<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.min.js"></script>
 <!-- markItUp! -->
 <script type="text/javascript" src="markitup/jquery.markitup.js"></script>
 <!-- markItUp! toolbar settings -->

From 157249d6a73820367cc205046cfd871f00de8b3b Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Wed, 23 Feb 2011 21:53:44 +0100
Subject: [PATCH 02/60] Added quotes to jQuery attribute selectors

---
 markitup/jquery.markitup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 8c69b78..15f21c3 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -506,7 +506,7 @@
 
 				if (e.type === 'keydown') {
 					if (ctrlKey === true) {
-						li = $("a[accesskey="+String.fromCharCode(e.keyCode)+"]", header).parent('li');
+						li = $('a[accesskey="'+String.fromCharCode(e.keyCode)+'"]', header).parent('li');
 						if (li.length !== 0) {
 							ctrlKey = false;
 							setTimeout(function() {

From 93b517cdf6fe39553c69da692ad54d64960dc0e9 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Wed, 23 Feb 2011 21:54:26 +0100
Subject: [PATCH 03/60] Modified Changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbdcf88..041cc1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
-markItUp! 1.1.9
+markItUp! 1.1.11
 
 CHANGE LOG
+markItUp! 1.1.11 xxxx-xx-xx
+- Updated: jQuery 1.5
+- Added quotes to attribute selectors
+
 markItUp! 1.1.10 2011-02-20
 - Improved: Ajax property 'dataType' set to 'text'
 - Improved: Ajax property 'global' set to 'false'

From f60743df4f806294496c38ef79a241b4f6cefbf3 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 24 Mar 2011 10:52:57 +0100
Subject: [PATCH 04/60] Updated to jQuery 1.5.1

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index af3834d..d10a801 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
 <title>markItUp! Universal markup editor</title>
 <link rel="stylesheet" type="text/css" href="images/style.css" />
 <!-- jQuery -->
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.min.js"></script>
+<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.1.min.js"></script>
 <!-- markItUp! -->
 <script type="text/javascript" src="markitup/jquery.markitup.js"></script>
 <!-- markItUp! toolbar settings -->

From ce474f1c77e54ebb25998fa79f5b727176199165 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 24 Mar 2011 10:53:13 +0100
Subject: [PATCH 05/60] Tried to fix the endless IE caret position bug

---
 CHANGELOG.md                |  1 +
 markitup/jquery.markitup.js | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 041cc1d..3f75a82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGE LOG
 markItUp! 1.1.11 xxxx-xx-xx
 - Updated: jQuery 1.5
 - Added quotes to attribute selectors
+- Tried to fix the endless IE caret position bug
 
 markItUp! 1.1.10 2011-02-20
 - Improved: Ajax property 'dataType' set to 'text'
diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 15f21c3..e0c7082 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -358,7 +358,7 @@
 			// Substract linefeed in IE
 			function fixIeBug(string) {
 				if ($.browser.msie) {
-					return string.length - string.replace(/\r/g, '').length;
+					return string.length - string.replace(/\r*/g, '').length;
 				}
 				return 0;
 			}
@@ -398,16 +398,15 @@
 
 				scrollPosition = textarea.scrollTop;
 				if (document.selection) {
-					selection = document.selection;	
-					if ($.browser.msie) { // ie	
-						var range = selection.createRange();
-						var stored_range = range.duplicate();
-						stored_range.moveToElementText(textarea);
-						stored_range.setEndPoint('EndToEnd', range);
-						var s = stored_range.text.length - range.text.length;
-	
-						caretPosition = s - (textarea.value.substr(0, s).length - textarea.value.substr(0, s).replace(/\r/g, '').length);
-						selection = range.text;
+					selection = document.selection.createRange().text;
+					if ($.browser.msie) { // ie
+						var range = document.selection.createRange(), rangeCopy = range.duplicate();
+						rangeCopy.moveToElementText(textarea);
+						caretPosition = -1;
+						while(rangeCopy.inRange(range)) {
+							rangeCopy.moveStart('character');
+							caretPosition ++;
+						}
 					} else { // opera
 						caretPosition = textarea.selectionStart;
 					}

From 8f464f1665a7e31747f2ec67d7aa1d7c871dd772 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 24 Mar 2011 10:57:27 +0100
Subject: [PATCH 06/60] Added metakey support for Mac users (michal-krause)

---
 CHANGELOG.md                | 1 +
 markitup/jquery.markitup.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f75a82..9344953 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ markItUp! 1.1.11 xxxx-xx-xx
 - Updated: jQuery 1.5
 - Added quotes to attribute selectors
 - Tried to fix the endless IE caret position bug
+- Added metakey support for Mac users (michal-krause)
 
 markItUp! 1.1.10 2011-02-20
 - Improved: Ajax property 'dataType' set to 'text'
diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index e0c7082..b1b3365 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -501,7 +501,7 @@
 			function keyPressed(e) { 
 				shiftKey = e.shiftKey;
 				altKey = e.altKey;
-				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey : false;
+				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey || e.metaKey : false;
 
 				if (e.type === 'keydown') {
 					if (ctrlKey === true) {

From 318ee89a60a6ecf6b848c33b1307a7ba97855e30 Mon Sep 17 00:00:00 2001
From: Aleksandr Levchuk <alevchuk@gmail.com>
Date: Sat, 16 Apr 2011 18:04:13 -0700
Subject: [PATCH 07/60] Typo fix

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index d10a801..83d2a34 100644
--- a/index.html
+++ b/index.html
@@ -60,6 +60,6 @@ <h1><a href="http://markitup.jaysalvat.com/">markItUp!</a></h1>
 &lt;p&gt;&lt;strong&gt;markItUp!&lt;/strong&gt; is a JavaScript plugin built on the jQuery library. It allows you to turn any textarea into a markup editor. Html, Textile, Wiki Syntax, Markdown, BBcode or even your own markup system can be easily implemented.&lt;/p&gt;
 </textarea>
 </p>
-<p>Support the projet : <a href="http://markitup.jaysalvat.com/">Donate</a> | <a href="http://markitup.jaysalvat.com/">Contact</a></p>
+<p>Support the project : <a href="http://markitup.jaysalvat.com/">Donate</a> | <a href="http://markitup.jaysalvat.com/">Contact</a></p>
 </body>
 </html>

From 0cd479b6f050112ee5daefa96ecf0ac173b99c4c Mon Sep 17 00:00:00 2001
From: Aleksandr Levchuk <alevchuk@gmail.com>
Date: Sun, 17 Apr 2011 00:18:03 -0700
Subject: [PATCH 08/60] Multiline support for code, quotations, and lists

---
 markitup/jquery.markitup.js                   |  29 +++++++++++++++---
 markitup/sets/default/images/list-bullet.png  | Bin 0 -> 344 bytes
 markitup/sets/default/images/list-numeric.png | Bin 0 -> 357 bytes
 markitup/sets/default/set.js                  |   5 ++-
 markitup/sets/default/style.css               |  13 ++++++--
 5 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 markitup/sets/default/images/list-bullet.png
 create mode 100644 markitup/sets/default/images/list-numeric.png

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index e0c7082..b877305 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -237,18 +237,37 @@
 				var placeHolder = prepare(clicked.placeHolder);
 				var replaceWith = prepare(clicked.replaceWith);
 				var closeWith 	= prepare(clicked.closeWith);
+				var multilineSupport = prepare(clicked.multilineSupport);
+				var openBlockWith = prepare(clicked.openBlockWith);
+				var closeBlockWith = prepare(clicked.closeBlockWith);
+
 				if (replaceWith !== "") {
 					block = openWith + replaceWith + closeWith;
 				} else if (selection === '' && placeHolder !== '') {
 					block = openWith + placeHolder + closeWith;
 				} else {
-					string = string || selection;						
-					if (string.match(/ $/)) {
-						block = openWith + string.replace(/ $/, '') + closeWith + ' ';
-					} else {
-						block = openWith + string + closeWith;
+					string = string || selection;
+
+					var lines = [string]
+					// Apply action to every line or on the whole block?
+					if (multilineSupport == 'true')
+					    lines = string.replace(/\n+$/, '').split("\n")
+					
+					var blocks = [];
+					for (var l=0; l < lines.length; l++) {
+					  line = lines[l];
+					  if (line.match(/ +$/)) {
+					    blocks.push(openWith + line.replace(/ $/, '') + closeWith + ' ');
+					  } else {
+					    blocks.push(openWith + line + closeWith);
+					  }
 					}
+					
+					block = blocks.join("\n");
 				}
+
+				block = openBlockWith + block + closeBlockWith;
+
 				return {	block:block, 
 							openWith:openWith, 
 							replaceWith:replaceWith, 
diff --git a/markitup/sets/default/images/list-bullet.png b/markitup/sets/default/images/list-bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a8672bde48f806d3d4d37db192588a9aa3eac10
GIT binary patch
literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy>PbXFR5;6H
z`2YVu10|S&DhA}te_Swi*Xsu$nk)lAnzx?+_#Z@r_~qs0*+Bfiq@?73K|#U)?Ck9S
zsi~>|6A}{sM@B~e4-O9gPhA%bd?2RGd{of6>E(lvp1b6Ep>6&12TPB<{a?EDDL4@0
z;^ML+A|n0=1_u83^78uc?CkvC#>VEqiHXU7U0vP(YHDhzff&$ntDt1@;|H#l*M@2!
z+U8#>h@W=vfpy*`^1J}j+`sMRe-I7g8yOj8Yin!&S5Z;<FDEDWUtC=LzmSm7e;yv5
q|LpAS|CyPYQ3DZVGes_-1OotI5YRuK@!O&R0000<MNUMnLSTY8q@Gy-

literal 0
HcmV?d00001

diff --git a/markitup/sets/default/images/list-numeric.png b/markitup/sets/default/images/list-numeric.png
new file mode 100644
index 0000000000000000000000000000000000000000..33b0b8df394dd66b20f74b551d5d52eb53cf335d
GIT binary patch
literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy_en%SR5;6H
z`2YVu10@(t<jjApvgq);|705g(oB&7FhgMM^78U*ApT!cQu4o`px}RYcJ}|&)YSh8
z2?_rrBP0I@2M7Ph>VicFNp}SURRVGD{<r^U?Rot_V&Xj&vRx3`drzfz%S-aS5Y%-?
zrE}ABxaPRHxa^3Ci2s3sf&aa{y#6~oJO8(_vH5ReV)9>CSNFe~ni^^#wyl5uzj4je
z|23<g4p1PLFMIsIbm`;&#fu-4?*fo!>%2?k#{x(*%mqe9M%mih+W%ElRQ}7!$^91>
z7ymCLB=nz$hvz>#JNtiTW@gkt1Zf0eyP_){bPq%T_kY#2Z7&xs00000NkvXXu0mjf
DNYA0=

literal 0
HcmV?d00001

diff --git a/markitup/sets/default/set.js b/markitup/sets/default/set.js
index f3e08ff..a11bfb7 100644
--- a/markitup/sets/default/set.js
+++ b/markitup/sets/default/set.js
@@ -18,10 +18,13 @@ mySettings = {
 		{name:'Italic', key:'I', openWith:'(!(<em>|!|<i>)!)', closeWith:'(!(</em>|!|</i>)!)'  },
 		{name:'Stroke through', key:'S', openWith:'<del>', closeWith:'</del>' },
 		{separator:'---------------' },
+		{name:'Bulleted List', openWith:"  <li>", closeWith:'</li>', multilineSupport:true, openBlockWith:"<ul>\n", closeBlockWith:"\n</ul>"},
+		{name:'Numeric List', openWith:"  <li>", closeWith:'</li>', multilineSupport:true, openBlockWith:"<ol>\n", closeBlockWith:"\n</ol>"},
+		{separator:'---------------' },
 		{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
 		{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
 		{separator:'---------------' },
 		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },		
 		{name:'Preview', className:'preview',  call:'preview'}
 	]
-}
\ No newline at end of file
+}
diff --git a/markitup/sets/default/style.css b/markitup/sets/default/style.css
index 0794ab1..b1d20d6 100644
--- a/markitup/sets/default/style.css
+++ b/markitup/sets/default/style.css
@@ -13,15 +13,22 @@
 }
 
 .markItUp .markItUpButton4 a {
-	background-image:url(images/picture.png); 
+	background-image:url(images/list-bullet.png); 
 }
 .markItUp .markItUpButton5 a {
-	background-image:url(images/link.png);
+	background-image:url(images/list-numeric.png);
 }
 
 .markItUp .markItUpButton6 a {
+	background-image:url(images/picture.png); 
+}
+.markItUp .markItUpButton7 a {
+	background-image:url(images/link.png);
+}
+
+.markItUp .markItUpButton8 a {
 	background-image:url(images/clean.png);
 }
 .markItUp .preview a {
 	background-image:url(images/preview.png);
-}
\ No newline at end of file
+}

From 5f0a5a02762966cc1fd1fd7796bf17e13b0ee28c Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 21 Apr 2011 16:12:10 +0200
Subject: [PATCH 09/60] Added the 'multiline:true' propertie support

---
 markitup/jquery.markitup.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index b1b3365..3bd48c6 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -3,7 +3,7 @@
 // v 1.1.x
 // Dual licensed under the MIT and GPL licenses.
 // ----------------------------------------------------------------------------
-// Copyright (C) 2007-2010 Jay Salvat
+// Copyright (C) 2007-2011 Jay Salvat
 // http://markitup.jaysalvat.com/
 // ----------------------------------------------------------------------------
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -276,12 +276,12 @@
 				// callbacks before insertion
 				prepare(options.beforeInsert);
 				prepare(clicked.beforeInsert);
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					prepare(clicked.beforeMultiInsert);
 				}			
 				$.extend(hash, { line:1 });
 				
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					lines = selection.split(/\r?\n/);
 					for (j = 0, n = lines.length, i = 0; i < n; i++) {
 						if ($.trim(lines[i]) !== '') {

From c4a8c6ef375c39fd010389eaf639bfef95848a88 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 24 Mar 2011 10:57:27 +0100
Subject: [PATCH 10/60] Added metakey support for Mac users (michal-krause)

---
 CHANGELOG.md                | 1 +
 markitup/jquery.markitup.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f75a82..9344953 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ markItUp! 1.1.11 xxxx-xx-xx
 - Updated: jQuery 1.5
 - Added quotes to attribute selectors
 - Tried to fix the endless IE caret position bug
+- Added metakey support for Mac users (michal-krause)
 
 markItUp! 1.1.10 2011-02-20
 - Improved: Ajax property 'dataType' set to 'text'
diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index b877305..6fd6059 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -520,7 +520,7 @@
 			function keyPressed(e) { 
 				shiftKey = e.shiftKey;
 				altKey = e.altKey;
-				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey : false;
+				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey || e.metaKey : false;
 
 				if (e.type === 'keydown') {
 					if (ctrlKey === true) {

From d19455e32a99b52c92e1a5780f8d2f5c622e588f Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 21 Apr 2011 16:12:10 +0200
Subject: [PATCH 11/60] Added the 'multiline:true' propertie support

---
 markitup/jquery.markitup.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 6fd6059..b096c11 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -3,7 +3,7 @@
 // v 1.1.x
 // Dual licensed under the MIT and GPL licenses.
 // ----------------------------------------------------------------------------
-// Copyright (C) 2007-2010 Jay Salvat
+// Copyright (C) 2007-2011 Jay Salvat
 // http://markitup.jaysalvat.com/
 // ----------------------------------------------------------------------------
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -295,12 +295,12 @@
 				// callbacks before insertion
 				prepare(options.beforeInsert);
 				prepare(clicked.beforeInsert);
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					prepare(clicked.beforeMultiInsert);
 				}			
 				$.extend(hash, { line:1 });
 				
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					lines = selection.split(/\r?\n/);
 					for (j = 0, n = lines.length, i = 0; i < n; i++) {
 						if ($.trim(lines[i]) !== '') {

From 05163d6b83a5fcecb41c430032a5c10f6300dcd5 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 25 Apr 2011 11:48:59 +0200
Subject: [PATCH 12/60] Switched mouseup to mousedown event to solve Ctrl key
 problem on Webkit

---
 markitup/jquery.markitup.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index b096c11..787bc7e 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -164,7 +164,7 @@
 							return false;
 						}).bind("focusin", function(){
                             $$.focus();
-						}).mousedown(function() {
+						}).mouseup(function() {
 							if (button.call) {
 								eval(button.call)();
 							}
@@ -281,7 +281,6 @@
 				var len, j, n, i;
 				hash = clicked = button;
 				get();
-
 				$.extend(hash, {	line:"", 
 						 			root:options.root,
 									textarea:textarea, 
@@ -431,6 +430,7 @@
 					}
 				} else { // gecko & webkit
 					caretPosition = textarea.selectionStart;
+
 					selection = textarea.value.substring(caretPosition, textarea.selectionEnd);
 				} 
 				return selection;
@@ -520,7 +520,7 @@
 			function keyPressed(e) { 
 				shiftKey = e.shiftKey;
 				altKey = e.altKey;
-				ctrlKey = (!(e.altKey && e.ctrlKey)) ? e.ctrlKey || e.metaKey : false;
+				ctrlKey = (!(e.altKey && e.ctrlKey)) ? (e.ctrlKey || e.metaKey) : false;
 
 				if (e.type === 'keydown') {
 					if (ctrlKey === true) {
@@ -528,7 +528,7 @@
 						if (li.length !== 0) {
 							ctrlKey = false;
 							setTimeout(function() {
-								li.triggerHandler('mousedown');
+								li.triggerHandler('mouseup');
 							},1);
 							return false;
 						}

From 47e4225eb738c1018b61a995e57597e669067ccb Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 25 Apr 2011 14:29:42 +0200
Subject: [PATCH 13/60] Merge and tweak multiline support from alevchuk

---
 markitup/jquery.markitup.js  | 26 ++++++++--------
 markitup/sets/default/set.js | 60 ++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 787bc7e..ee0d894 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -233,14 +233,14 @@
 
 			// build block to insert
 			function build(string) {
-				var openWith 	= prepare(clicked.openWith);
-				var placeHolder = prepare(clicked.placeHolder);
-				var replaceWith = prepare(clicked.replaceWith);
-				var closeWith 	= prepare(clicked.closeWith);
-				var multilineSupport = prepare(clicked.multilineSupport);
-				var openBlockWith = prepare(clicked.openBlockWith);
-				var closeBlockWith = prepare(clicked.closeBlockWith);
-
+				var openWith 			= prepare(clicked.openWith);
+				var placeHolder 		= prepare(clicked.placeHolder);
+				var replaceWith 		= prepare(clicked.replaceWith);
+				var closeWith 			= prepare(clicked.closeWith);
+				var openBlockWith 		= prepare(clicked.openBlockWith);
+				var closeBlockWith 		= prepare(clicked.closeBlockWith);
+				var multiline 			= clicked.multiline;
+				
 				if (replaceWith !== "") {
 					block = openWith + replaceWith + closeWith;
 				} else if (selection === '' && placeHolder !== '') {
@@ -249,9 +249,9 @@
 					string = string || selection;
 
 					var lines = [string]
-					// Apply action to every line or on the whole block?
-					if (multilineSupport == 'true')
-					    lines = string.replace(/\n+$/, '').split("\n")
+					if (multiline == true) {
+						lines = string.replace(/\n+$/, '').split("\n")						
+					}
 					
 					var blocks = [];
 					for (var l=0; l < lines.length; l++) {
@@ -299,7 +299,7 @@
 				}			
 				$.extend(hash, { line:1 });
 				
-				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
+				if ((ctrlKey === true && shiftKey === true)) {
 					lines = selection.split(/\r?\n/);
 					for (j = 0, n = lines.length, i = 0; i < n; i++) {
 						if ($.trim(lines[i]) !== '') {
@@ -351,7 +351,7 @@
 				$.extend(hash, { line:'', selection:selection });
 
 				// callbacks after insertion
-				if (ctrlKey === true && shiftKey === true) {
+				if ((ctrlKey === true && shiftKey === true) || button.multiline === true) {
 					prepare(clicked.afterMultiInsert);
 				}
 				prepare(clicked.afterInsert);
diff --git a/markitup/sets/default/set.js b/markitup/sets/default/set.js
index a11bfb7..b7fdf81 100644
--- a/markitup/sets/default/set.js
+++ b/markitup/sets/default/set.js
@@ -1,30 +1,30 @@
-// ----------------------------------------------------------------------------
-// markItUp!
-// ----------------------------------------------------------------------------
-// Copyright (C) 2008 Jay Salvat
-// http://markitup.jaysalvat.com/
-// ----------------------------------------------------------------------------
-// Html tags
-// http://en.wikipedia.org/wiki/html
-// ----------------------------------------------------------------------------
-// Basic set. Feel free to add more tags
-// ----------------------------------------------------------------------------
-mySettings = {	
-	onShiftEnter:  	{keepDefault:false, replaceWith:'<br />\n'},
-	onCtrlEnter:  	{keepDefault:false, openWith:'\n<p>', closeWith:'</p>'},
-	onTab:    		{keepDefault:false, replaceWith:'    '},
-	markupSet:  [ 	
-		{name:'Bold', key:'B', openWith:'(!(<strong>|!|<b>)!)', closeWith:'(!(</strong>|!|</b>)!)' },
-		{name:'Italic', key:'I', openWith:'(!(<em>|!|<i>)!)', closeWith:'(!(</em>|!|</i>)!)'  },
-		{name:'Stroke through', key:'S', openWith:'<del>', closeWith:'</del>' },
-		{separator:'---------------' },
-		{name:'Bulleted List', openWith:"  <li>", closeWith:'</li>', multilineSupport:true, openBlockWith:"<ul>\n", closeBlockWith:"\n</ul>"},
-		{name:'Numeric List', openWith:"  <li>", closeWith:'</li>', multilineSupport:true, openBlockWith:"<ol>\n", closeBlockWith:"\n</ol>"},
-		{separator:'---------------' },
-		{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
-		{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
-		{separator:'---------------' },
-		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },		
-		{name:'Preview', className:'preview',  call:'preview'}
-	]
-}
+// ----------------------------------------------------------------------------
+// markItUp!
+// ----------------------------------------------------------------------------
+// Copyright (C) 2011 Jay Salvat
+// http://markitup.jaysalvat.com/
+// ----------------------------------------------------------------------------
+// Html tags
+// http://en.wikipedia.org/wiki/html
+// ----------------------------------------------------------------------------
+// Basic set. Feel free to add more tags
+// ----------------------------------------------------------------------------
+var mySettings = {
+	onShiftEnter:  	{keepDefault:false, replaceWith:'<br />\n'},
+	onCtrlEnter:  	{keepDefault:false, openWith:'\n<p>', closeWith:'</p>'},
+	onTab:    		{keepDefault:false, replaceWith:'    '},
+	markupSet:  [ 	
+		{name:'Bold', key:'B', openWith:'(!(<strong>|!|<b>)!)', closeWith:'(!(</strong>|!|</b>)!)' },
+		{name:'Italic', key:'I', openWith:'(!(<em>|!|<i>)!)', closeWith:'(!(</em>|!|</i>)!)'  },
+		{name:'Stroke through', key:'S', openWith:'<del>', closeWith:'</del>' },
+		{separator:'---------------' },
+		{name:'Bulleted List', openWith:'    <li>', closeWith:'</li>', multiline:true, openBlockWith:'<ul>\n', closeBlockWith:'\n</ul>'},
+		{name:'Numeric List', openWith:'    <li>', closeWith:'</li>', multiline:true, openBlockWith:'<ol>\n', closeBlockWith:'\n</ol>'},
+		{separator:'---------------' },
+		{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
+		{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
+		{separator:'---------------' },
+		{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },		
+		{name:'Preview', className:'preview',  call:'preview'}
+	]
+}

From b8f02d4775b2be7bb18b4cda785bcfd9d17ec912 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 25 Apr 2011 14:34:51 +0200
Subject: [PATCH 14/60] Fixed multiline with IE \r

---
 markitup/jquery.markitup.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index ee0d894..a9fe021 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -249,9 +249,10 @@
 					string = string || selection;
 
 					var lines = [string]
-					if (multiline == true) {
-						lines = string.replace(/\n+$/, '').split("\n")						
-					}
+					// if (multiline == true) {
+					// 	lines = string.replace(/\n+$/, '').split("\n")						
+					// }
+					lines = selection.split(/\r?\n/);
 					
 					var blocks = [];
 					for (var l=0; l < lines.length; l++) {

From c3c735084144e7869503d2233064b0cf6809fdd5 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 25 Apr 2011 14:39:52 +0200
Subject: [PATCH 15/60] Excluded empty lines on multiline insertion

---
 markitup/jquery.markitup.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index a9fe021..557647a 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -248,20 +248,17 @@
 				} else {
 					string = string || selection;
 
-					var lines = [string]
-					// if (multiline == true) {
-					// 	lines = string.replace(/\n+$/, '').split("\n")						
-					// }
-					lines = selection.split(/\r?\n/);
-					
-					var blocks = [];
+					var lines = selection.split(/\r?\n/), blocks = [];
 					for (var l=0; l < lines.length; l++) {
-					  line = lines[l];
-					  if (line.match(/ +$/)) {
-					    blocks.push(openWith + line.replace(/ $/, '') + closeWith + ' ');
-					  } else {
-					    blocks.push(openWith + line + closeWith);
-					  }
+						line = lines[l];
+						if ($.trim(line) == '') {
+							continue;
+						}
+						if (line.match(/ +$/)) {
+							blocks.push(openWith + line.replace(/ $/, '') + closeWith + ' ');
+						} else {
+							blocks.push(openWith + line + closeWith);
+						}
 					}
 					
 					block = blocks.join("\n");

From b889a32317f40e27f12dfccf2f958fa842a537fe Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 25 Apr 2011 15:06:08 +0200
Subject: [PATCH 16/60] Updated the demo with jQuery 1.5.2

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 83d2a34..8041de7 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
 <title>markItUp! Universal markup editor</title>
 <link rel="stylesheet" type="text/css" href="images/style.css" />
 <!-- jQuery -->
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.1.min.js"></script>
+<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
 <!-- markItUp! -->
 <script type="text/javascript" src="markitup/jquery.markitup.js"></script>
 <!-- markItUp! toolbar settings -->

From dc6e9695f4856d08ad5d7455dd569930a7d49b2a Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 25 Apr 2011 15:08:16 +0200
Subject: [PATCH 17/60] Updated the Changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9344953..f483566 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@ markItUp! 1.1.11
 
 CHANGE LOG
 markItUp! 1.1.11 xxxx-xx-xx
-- Updated: jQuery 1.5
+- Added multiline support (alevchuk)
+- Updated with jQuery 1.5.2
 - Added quotes to attribute selectors
 - Tried to fix the endless IE caret position bug
 - Added metakey support for Mac users (michal-krause)

From ed52a8910f69dfef49c8719b3a1797401d11a3cc Mon Sep 17 00:00:00 2001
From: Amroth <amroth@free.fr>
Date: Mon, 18 Jul 2011 11:14:48 -0400
Subject: [PATCH 18/60] enable parsing the markup in javascript

---
 markitup/jquery.markitup.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 4e2357c..8628ea7 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -36,6 +36,7 @@
 					previewAutoRefresh:		true,
 					previewPosition:		'after',
 					previewTemplatePath:	'~/templates/preview.html',
+					previewParser:			false,
 					previewParserPath:		'',
 					previewParserVar:		'data',
 					resizeHandle:			true,
@@ -474,7 +475,10 @@
 
 			function renderPreview() {		
 				var phtml;
-				if (options.previewParserPath !== '') {
+				if (options.previewParser && typeof options.previewParser === 'function') {
+					var data = options.previewParser( $$.val() );
+					writeInPreview( localize(data, 1) ); 
+				} else if (options.previewParserPath !== '') {
 					$.ajax({
 						type: 'POST',
 						dataType: 'text',

From f614f3ea67ce584f458a37fb551a4f1ef954e4be Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Tue, 19 Jul 2011 12:07:46 +0200
Subject: [PATCH 19/60] Update to jQuery 1.6.2

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 8041de7..5a3b037 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
 <title>markItUp! Universal markup editor</title>
 <link rel="stylesheet" type="text/css" href="images/style.css" />
 <!-- jQuery -->
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
+<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.2.min.js"></script>
 <!-- markItUp! -->
 <script type="text/javascript" src="markitup/jquery.markitup.js"></script>
 <!-- markItUp! toolbar settings -->

From 636fe32ba1fa4295493f935f7f6faf0289c9b474 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Tue, 19 Jul 2011 12:07:57 +0200
Subject: [PATCH 20/60] Update Changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f483566..fffe4d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 markItUp! 1.1.11
 
 CHANGE LOG
-markItUp! 1.1.11 xxxx-xx-xx
+markItUp! 1.1.11 2011-07-19
+- Enabled parsing the markup in javascript (amroth)
 - Added multiline support (alevchuk)
-- Updated with jQuery 1.5.2
+- Updated with jQuery 1.6.2
 - Added quotes to attribute selectors
 - Tried to fix the endless IE caret position bug
 - Added metakey support for Mac users (michal-krause)

From ca688f909d4f7af3a51cfa7e21fd4d6341c358a0 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 11 Aug 2011 14:23:50 +0200
Subject: [PATCH 21/60] Fix the bug where no tag were inserted on a empty
 selection

---
 markitup/jquery.markitup.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 8628ea7..b25f9d5 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -250,11 +250,9 @@
 					string = string || selection;
 
 					var lines = selection.split(/\r?\n/), blocks = [];
+					
 					for (var l=0; l < lines.length; l++) {
 						line = lines[l];
-						if ($.trim(line) == '') {
-							continue;
-						}
 						if (line.match(/ +$/)) {
 							blocks.push(openWith + line.replace(/ $/, '') + closeWith + ' ');
 						} else {

From f6041b8c78d4d993a12186cc6a819da29f72bd42 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 11 Aug 2011 14:31:24 +0200
Subject: [PATCH 22/60] Better trailing space management on insertion

---
 markitup/jquery.markitup.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index b25f9d5..10add9d 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -253,8 +253,9 @@
 					
 					for (var l=0; l < lines.length; l++) {
 						line = lines[l];
-						if (line.match(/ +$/)) {
-							blocks.push(openWith + line.replace(/ $/, '') + closeWith + ' ');
+						var trailingSpaces;
+						if (trailingSpaces = line.match(/ *$/)) {
+							blocks.push(openWith + line.replace(/ *$/g, '') + closeWith + trailingSpaces);
 						} else {
 							blocks.push(openWith + line + closeWith);
 						}

From 979af07d31335bd58d6a3a50e26920bfa0b2e44c Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Thu, 11 Aug 2011 14:35:44 +0200
Subject: [PATCH 23/60] Updated Changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fffe4d2..556db9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
-markItUp! 1.1.11
+markItUp! 1.1.12
 
 CHANGE LOG
+markItUp! 1.1.12 2011-08-11
+- Fixed the insertion on empty selection
+- Enhanced the trailing space management
+
 markItUp! 1.1.11 2011-07-19
 - Enabled parsing the markup in javascript (amroth)
 - Added multiline support (alevchuk)

From 328291e49a3c7e1fb76b3342f112734864836205 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay.salvat@gmail.com>
Date: Tue, 16 Aug 2011 15:54:49 +0200
Subject: [PATCH 24/60] Multiline is fixed.

---
 markitup/jquery.markitup.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 10add9d..9f48bdd 100644
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -249,9 +249,13 @@
 				} else {
 					string = string || selection;
 
-					var lines = selection.split(/\r?\n/), blocks = [];
+					var lines = [string], blocks = [];
 					
-					for (var l=0; l < lines.length; l++) {
+					if (multiline === true) {
+						lines = string.split(/\r?\n/);
+					}
+					
+					for (var l = 0; l < lines.length; l++) {
 						line = lines[l];
 						var trailingSpaces;
 						if (trailingSpaces = line.match(/ *$/)) {
@@ -307,6 +311,7 @@
 							lines[i] = "";
 						}
 					}
+
 					string = { block:lines.join('\n')};
 					start = caretPosition;
 					len = string.block.length + (($.browser.opera) ? n-1 : 0);

From f9d976895feb61aba3a5751fe4d8032d8d82b224 Mon Sep 17 00:00:00 2001
From: Joyce Babu <joyce@ennexa.com>
Date: Tue, 29 May 2012 17:30:19 +0530
Subject: [PATCH 25/60] Updated events to use namespace

---
 markitup/jquery.markitup.js | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 markitup/jquery.markitup.js

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
old mode 100644
new mode 100755
index 9f48bdd..788a2ed
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -109,26 +109,26 @@
 				if (options.resizeHandle === true && $.browser.safari !== true) {
 					resizeHandle = $('<div class="markItUpResizeHandle"></div>')
 						.insertAfter($$)
-						.bind("mousedown", function(e) {
+						.bind("mousedown.markItUp", function(e) {
 							var h = $$.height(), y = e.clientY, mouseMove, mouseUp;
 							mouseMove = function(e) {
 								$$.css("height", Math.max(20, e.clientY+h-y)+"px");
 								return false;
 							};
 							mouseUp = function(e) {
-								$("html").unbind("mousemove", mouseMove).unbind("mouseup", mouseUp);
+								$("html").unbind("mousemove.markItUp", mouseMove).unbind("mouseup.markItUp", mouseUp);
 								return false;
 							};
-							$("html").bind("mousemove", mouseMove).bind("mouseup", mouseUp);
+							$("html").bind("mousemove.markItUp", mouseMove).bind("mouseup.markItUp", mouseUp);
 					});
 					footer.append(resizeHandle);
 				}
 
 				// listen key events
-				$$.keydown(keyPressed).keyup(keyPressed);
+				$$.bind('keydown.markItUp', keyPressed).bind('keyup', keyPressed);
 				
 				// bind an event to catch external calls
-				$$.bind("insertion", function(e, settings) {
+				$$.bind("insertion.markItUp", function(e, settings) {
 					if (settings.target !== false) {
 						get();
 					}
@@ -138,7 +138,7 @@
 				});
 
 				// remember the last focus
-				$$.focus(function() {
+				$$.bind('focus.markItUp', function() {
 					$.markItUp.focused = this;
 				});
 			}
@@ -159,28 +159,27 @@
 							t += levels[j]+"-";
 						}
 						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
-						.bind("contextmenu", function() { // prevent contextmenu on mac and allow ctrl+click
+						.bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click
 							return false;
-						}).click(function() {
+						}).bind('click.markItUp', function() {
 							return false;
-						}).bind("focusin", function(){
+						}).bind("focusin.markItUp", function(){
                             $$.focus();
-						}).mouseup(function() {
+						}).bind('mouseup', function() {
 							if (button.call) {
 								eval(button.call)();
 							}
 							setTimeout(function() { markup(button) },1);
 							return false;
-						}).hover(function() {
+						}).bind('mouseenter.markItUp', function() {
 								$('> ul', this).show();
 								$(document).one('click', function() { // close dropmenu if click outside
 										$('ul ul', header).hide();
 									}
 								);
-							}, function() {
+						}).bind('mouseleave.markItUp', function() {
 								$('> ul', this).hide();
-							}
-						).appendTo(ul);
+						}).appendTo(ul);
 						if (button.dropMenu) {
 							levels.push(i);
 							$(li).addClass('markItUpDropMenu').append(dropMenus(button.dropMenu));
@@ -577,7 +576,7 @@
 
 	$.fn.markItUpRemove = function() {
 		return this.each(function() {
-				var $$ = $(this).unbind().removeClass('markItUpEditor');
+				var $$ = $(this).unbind(".markItUp").removeClass('markItUpEditor');
 				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
 			}
 		);

From 995efcfcf304760688073bc081879ff727231089 Mon Sep 17 00:00:00 2001
From: "dr. Hannibal Lecter" <lecterror@gmail.com>
Date: Tue, 19 Jun 2012 12:14:27 +0200
Subject: [PATCH 26/60] Added the previewHandler option to allow complete
 control over preview

---
 markitup/jquery.markitup.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 788a2ed..481525a 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -32,6 +32,7 @@
 		options = {	id:						'',
 					nameSpace:				'',
 					root:					'',
+					previewHandler:			false,
 					previewInWindow:		'', // 'width=800, height=600, resizable=yes, scrollbars=yes'
 					previewAutoRefresh:		true,
 					previewPosition:		'after',
@@ -440,7 +441,9 @@
 
 			// open preview window
 			function preview() {
-				if (!previewWindow || previewWindow.closed) {
+				if (typeof options.previewHandler === 'function') {
+					previewWindow = true;
+				} else if (!previewWindow || previewWindow.closed) {
 					if (options.previewInWindow) {
 						previewWindow = window.open('', 'preview', options.previewInWindow);
 						$(window).unload(function() {
@@ -476,9 +479,11 @@
  				renderPreview();
 			}
 
-			function renderPreview() {		
+			function renderPreview() {
 				var phtml;
-				if (options.previewParser && typeof options.previewParser === 'function') {
+				if (options.previewHandler && typeof options.previewHandler === 'function') {
+					options.previewHandler( $$.val() );
+				} else if (options.previewParser && typeof options.previewParser === 'function') {
 					var data = options.previewParser( $$.val() );
 					writeInPreview( localize(data, 1) ); 
 				} else if (options.previewParserPath !== '') {

From cf8a47f37cd7231491b0f6b5bc733fd83eb80fa7 Mon Sep 17 00:00:00 2001
From: UltCombo <ult_combo@hotmail.com>
Date: Fri, 3 Aug 2012 13:54:40 -0300
Subject: [PATCH 27/60] Fixed Ctrl+Enter syntax error

Since the accesskey value was quoted in version 1.1.11, pressing Ctrl+Enter results in a syntax error due to the non-escaped line break in the middle of the string as shown currently in the latest stable release: http://markitup.jaysalvat.com/downloads/demo.php?id=releases/latest

This fix works by manually escaping the line break character, allowing the script to insert a <p> tag when Ctrl+Enter is pressed.
---
 markitup/jquery.markitup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 481525a..0bdca8e 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -534,7 +534,7 @@
 
 				if (e.type === 'keydown') {
 					if (ctrlKey === true) {
-						li = $('a[accesskey="'+String.fromCharCode(e.keyCode)+'"]', header).parent('li');
+						li = $('a[accesskey="'+((e.keyCode == 13) ? '\\n' : String.fromCharCode(e.keyCode))+'"]', header).parent('li');
 						if (li.length !== 0) {
 							ctrlKey = false;
 							setTimeout(function() {

From 6725d74db2404f2debedb4a63d896302107570d7 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 14:03:08 +0200
Subject: [PATCH 28/60] Change mode

---
 CHANGELOG.md                                        |   0
 README.md                                           |   0
 images/body.png                                     | Bin
 images/jaysalvat.png                                | Bin
 images/markitup.png                                 | Bin
 images/style.css                                    |   0
 index.html                                          |   0
 markitup/jquery.markitup.js                         |   0
 markitup/sets/default/images/bold.png               | Bin
 markitup/sets/default/images/clean.png              | Bin
 markitup/sets/default/images/image.png              | Bin
 markitup/sets/default/images/italic.png             | Bin
 markitup/sets/default/images/link.png               | Bin
 markitup/sets/default/images/list-bullet.png        | Bin
 markitup/sets/default/images/list-numeric.png       | Bin
 markitup/sets/default/images/picture.png            | Bin
 markitup/sets/default/images/preview.png            | Bin
 markitup/sets/default/images/stroke.png             | Bin
 markitup/sets/default/set.js                        |   0
 markitup/sets/default/style.css                     |   0
 markitup/skins/markitup/images/bg-container.png     | Bin
 markitup/skins/markitup/images/bg-editor-bbcode.png | Bin
 .../skins/markitup/images/bg-editor-dotclear.png    | Bin
 markitup/skins/markitup/images/bg-editor-html.png   | Bin
 markitup/skins/markitup/images/bg-editor-json.png   | Bin
 .../skins/markitup/images/bg-editor-markdown.png    | Bin
 .../skins/markitup/images/bg-editor-textile.png     | Bin
 markitup/skins/markitup/images/bg-editor-wiki.png   | Bin
 markitup/skins/markitup/images/bg-editor-xml.png    | Bin
 markitup/skins/markitup/images/bg-editor.png        | Bin
 markitup/skins/markitup/images/handle.png           | Bin
 markitup/skins/markitup/images/menu.png             | Bin
 markitup/skins/markitup/images/submenu.png          | Bin
 markitup/skins/markitup/style.css                   |   0
 markitup/skins/simple/images/handle.png             | Bin
 markitup/skins/simple/images/menu.png               | Bin
 markitup/skins/simple/images/submenu.png            | Bin
 markitup/skins/simple/style.css                     |   0
 markitup/templates/preview.css                      |   0
 markitup/templates/preview.html                     |   0
 40 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 CHANGELOG.md
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 images/body.png
 mode change 100644 => 100755 images/jaysalvat.png
 mode change 100644 => 100755 images/markitup.png
 mode change 100644 => 100755 images/style.css
 mode change 100644 => 100755 index.html
 mode change 100644 => 100755 markitup/jquery.markitup.js
 mode change 100644 => 100755 markitup/sets/default/images/bold.png
 mode change 100644 => 100755 markitup/sets/default/images/clean.png
 mode change 100644 => 100755 markitup/sets/default/images/image.png
 mode change 100644 => 100755 markitup/sets/default/images/italic.png
 mode change 100644 => 100755 markitup/sets/default/images/link.png
 mode change 100644 => 100755 markitup/sets/default/images/list-bullet.png
 mode change 100644 => 100755 markitup/sets/default/images/list-numeric.png
 mode change 100644 => 100755 markitup/sets/default/images/picture.png
 mode change 100644 => 100755 markitup/sets/default/images/preview.png
 mode change 100644 => 100755 markitup/sets/default/images/stroke.png
 mode change 100644 => 100755 markitup/sets/default/set.js
 mode change 100644 => 100755 markitup/sets/default/style.css
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-container.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-bbcode.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-dotclear.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-html.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-json.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-markdown.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-textile.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-wiki.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor-xml.png
 mode change 100644 => 100755 markitup/skins/markitup/images/bg-editor.png
 mode change 100644 => 100755 markitup/skins/markitup/images/handle.png
 mode change 100644 => 100755 markitup/skins/markitup/images/menu.png
 mode change 100644 => 100755 markitup/skins/markitup/images/submenu.png
 mode change 100644 => 100755 markitup/skins/markitup/style.css
 mode change 100644 => 100755 markitup/skins/simple/images/handle.png
 mode change 100644 => 100755 markitup/skins/simple/images/menu.png
 mode change 100644 => 100755 markitup/skins/simple/images/submenu.png
 mode change 100644 => 100755 markitup/skins/simple/style.css
 mode change 100644 => 100755 markitup/templates/preview.css
 mode change 100644 => 100755 markitup/templates/preview.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/images/body.png b/images/body.png
old mode 100644
new mode 100755
diff --git a/images/jaysalvat.png b/images/jaysalvat.png
old mode 100644
new mode 100755
diff --git a/images/markitup.png b/images/markitup.png
old mode 100644
new mode 100755
diff --git a/images/style.css b/images/style.css
old mode 100644
new mode 100755
diff --git a/index.html b/index.html
old mode 100644
new mode 100755
diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/bold.png b/markitup/sets/default/images/bold.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/clean.png b/markitup/sets/default/images/clean.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/image.png b/markitup/sets/default/images/image.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/italic.png b/markitup/sets/default/images/italic.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/link.png b/markitup/sets/default/images/link.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/list-bullet.png b/markitup/sets/default/images/list-bullet.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/list-numeric.png b/markitup/sets/default/images/list-numeric.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/picture.png b/markitup/sets/default/images/picture.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/preview.png b/markitup/sets/default/images/preview.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/images/stroke.png b/markitup/sets/default/images/stroke.png
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/set.js b/markitup/sets/default/set.js
old mode 100644
new mode 100755
diff --git a/markitup/sets/default/style.css b/markitup/sets/default/style.css
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-container.png b/markitup/skins/markitup/images/bg-container.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-bbcode.png b/markitup/skins/markitup/images/bg-editor-bbcode.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-dotclear.png b/markitup/skins/markitup/images/bg-editor-dotclear.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-html.png b/markitup/skins/markitup/images/bg-editor-html.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-json.png b/markitup/skins/markitup/images/bg-editor-json.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-markdown.png b/markitup/skins/markitup/images/bg-editor-markdown.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-textile.png b/markitup/skins/markitup/images/bg-editor-textile.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-wiki.png b/markitup/skins/markitup/images/bg-editor-wiki.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor-xml.png b/markitup/skins/markitup/images/bg-editor-xml.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/bg-editor.png b/markitup/skins/markitup/images/bg-editor.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/handle.png b/markitup/skins/markitup/images/handle.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/menu.png b/markitup/skins/markitup/images/menu.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/images/submenu.png b/markitup/skins/markitup/images/submenu.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/markitup/style.css b/markitup/skins/markitup/style.css
old mode 100644
new mode 100755
diff --git a/markitup/skins/simple/images/handle.png b/markitup/skins/simple/images/handle.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/simple/images/menu.png b/markitup/skins/simple/images/menu.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/simple/images/submenu.png b/markitup/skins/simple/images/submenu.png
old mode 100644
new mode 100755
diff --git a/markitup/skins/simple/style.css b/markitup/skins/simple/style.css
old mode 100644
new mode 100755
diff --git a/markitup/templates/preview.css b/markitup/templates/preview.css
old mode 100644
new mode 100755
diff --git a/markitup/templates/preview.html b/markitup/templates/preview.html
old mode 100644
new mode 100755

From 9f2a51a1181e0409e62e2613c90e785021e54f9e Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 14:17:21 +0200
Subject: [PATCH 29/60] Add package.json

---
 package.json | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package.json

diff --git a/package.json b/package.json
new file mode 100644
index 0000000..c14a5a1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "markItUp! ",
+  "title": "markItUp! universal markup jQuery editor",
+  "description": "markItUp! is a JavaScript plugin built on the jQuery library. It allows you to turn any textarea into a markup editor. Html, Textile, Wiki Syntax, Markdown, BBcode or even your own Markup system can be easily implemented.",
+  "version": "1.1",
+  "homepage": "http://markitup.jaysalvat.com/",
+  "author": {
+    "name": "Jay Salvat",
+    "email": "",
+    "url": "http://jaysalvat.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/markitup/1.x"
+  },
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http://www.opensource.org/licenses/MIT"
+    },
+    {
+      "type": "GPL",
+      "url": "http://www.opensource.org/licenses/GPL-2.0"
+    }
+  ],
+  "keywords": [ "jquery", "markup", "editor", "markdown", "wiki", "bbcode", "html", "textile" ]
+}
\ No newline at end of file

From a439ef9da6d2b05a24507aad5492d07b43b25a67 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 14:29:41 +0200
Subject: [PATCH 30/60] Add jQuery 1.8 to the demo

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 5a3b037..94b8b0f 100755
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
 <title>markItUp! Universal markup editor</title>
 <link rel="stylesheet" type="text/css" href="images/style.css" />
 <!-- jQuery -->
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js"></script>
 <!-- markItUp! -->
 <script type="text/javascript" src="markitup/jquery.markitup.js"></script>
 <!-- markItUp! toolbar settings -->

From 179289e8b10c9b1e691a41621b86674e5c304d96 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 14:35:45 +0200
Subject: [PATCH 31/60] Rewrite the demo page HTML5 oriented

---
 index.html | 59 +++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/index.html b/index.html
index 94b8b0f..91b7c3e 100755
--- a/index.html
+++ b/index.html
@@ -1,24 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>markItUp! Universal markup editor</title>
-<link rel="stylesheet" type="text/css" href="images/style.css" />
-<!-- jQuery -->
-<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js"></script>
-<!-- markItUp! -->
-<script type="text/javascript" src="markitup/jquery.markitup.js"></script>
-<!-- markItUp! toolbar settings -->
-<script type="text/javascript" src="markitup/sets/default/set.js"></script>
-<!-- markItUp! skin -->
-<link rel="stylesheet" type="text/css" href="markitup/skins/markitup/style.css" />
-<!--  markItUp! toolbar skin -->
-<link rel="stylesheet" type="text/css" href="markitup/sets/default/style.css" />
+	<meta charset="utf-8">
+	<title>markItUp! Universal markup editor</title>
+	<link rel="stylesheet" type="text/css" href="images/style.css">
+	<!-- markItUp! skin -->
+	<link rel="stylesheet" type="text/css" href="markitup/skins/markitup/style.css">
+	<!--  markItUp! toolbar skin -->
+	<link rel="stylesheet" type="text/css" href="markitup/sets/default/style.css">
+	<!-- jQuery -->
+	<script type="text/javascript" src="http://code.jquery.com/jquery-1.8.0.min.js"></script>
+	<!-- markItUp! -->
+	<script type="text/javascript" src="markitup/jquery.markitup.js"></script>
+	<!-- markItUp! toolbar settings -->
+	<script type="text/javascript" src="markitup/sets/default/set.js"></script>
 </head>
 <body>
+<h1><a href="http://markitup.jaysalvat.com/">markItUp!</a></h1>
+<p><em><a href="http://www.jaysalvat.com">By Jay Salvat</a></em></p>
+<p>Downloads, examples and documentation at <a href="http://markitup.jaysalvat.com">http://markitup.jaysalvat.com</a>.</p>
+<p>Click <a href="#" class="add">this link to insert content</a> from anywhere in the page or <a href="#" class="toggle">this one to <span>remove markItUp!</span></a></p>
+<p>
+<textarea id="markItUp" cols="80" rows="20">
+&lt;h1&gt;Welcome on markItUp!&lt;/h1&gt;
+
+&lt;p&gt;&lt;strong&gt;markItUp!&lt;/strong&gt; is a JavaScript plugin built on the jQuery library. It allows you to turn any textarea into a markup editor. Html, Textile, Wiki Syntax, Markdown, BBcode or even your own markup system can be easily implemented.&lt;/p&gt;
+</textarea>
+</p>
+<p>Support the project : <a href="http://markitup.jaysalvat.com/">Donate</a> | <a href="http://markitup.jaysalvat.com/">Contact</a></p>
+
 <script type="text/javascript">
-<!--
-$(document).ready(function()	{
+$(function()	{
 	// Add markItUp! to your textarea in one line
 	// $('textarea').markItUp( { Settings }, { OptionalExtraSettings } );
 	$('#markItUp').markItUp(mySettings);
@@ -47,19 +59,6 @@
  		return false;
 	});
 });
--->
 </script>
-<h1><a href="http://markitup.jaysalvat.com/">markItUp!</a></h1>
-<p><em><a href="http://www.jaysalvat.com">By Jay Salvat</a></em></p>
-<p>Downloads, examples and documentation at <a href="http://markitup.jaysalvat.com">http://markitup.jaysalvat.com</a>.</p>
-<p>Click <a href="#" class="add">this link to insert content</a> from anywhere in the page or <a href="#" class="toggle">this one to <span>remove markItUp!</span></a></p>
-<p>
-<textarea id="markItUp" cols="80" rows="20">
-&lt;h1&gt;Welcome on markItUp!&lt;/h1&gt;
-
-&lt;p&gt;&lt;strong&gt;markItUp!&lt;/strong&gt; is a JavaScript plugin built on the jQuery library. It allows you to turn any textarea into a markup editor. Html, Textile, Wiki Syntax, Markdown, BBcode or even your own markup system can be easily implemented.&lt;/p&gt;
-</textarea>
-</p>
-<p>Support the project : <a href="http://markitup.jaysalvat.com/">Donate</a> | <a href="http://markitup.jaysalvat.com/">Contact</a></p>
 </body>
 </html>

From 2a18bb61b951fa0f27834fd895f34b5d10d2825a Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 14:37:51 +0200
Subject: [PATCH 32/60] Change comment date

---
 markitup/jquery.markitup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 0bdca8e..848ea46 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -3,7 +3,7 @@
 // v 1.1.x
 // Dual licensed under the MIT and GPL licenses.
 // ----------------------------------------------------------------------------
-// Copyright (C) 2007-2011 Jay Salvat
+// Copyright (C) 2007-2012 Jay Salvat
 // http://markitup.jaysalvat.com/
 // ----------------------------------------------------------------------------
 // Permission is hereby granted, free of charge, to any person obtaining a copy

From 8caad82647ed08313a509f99299d7927ea45aa32 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 14:47:02 +0200
Subject: [PATCH 33/60] Added some line to Changelog.md

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 556db9b..a4ff88f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
-markItUp! 1.1.12
+markItUp! 1.1.13
 
 CHANGE LOG
+markItUp! 1.1.12 2012-08-30
+- Fixed Ctrl+Enter syntax error (UltCombo)
+- Added the previewHandler option to allow complete control over preview (lecterror)
+- Updated events to use namespace (JoyceBabu)
+- Added package.json
+- Updated jQuery version to 1.8 in the demo
+
 markItUp! 1.1.12 2011-08-11
 - Fixed the insertion on empty selection
 - Enhanced the trailing space management

From 78008958108959677d38f4612a85cc2f6896df86 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 15:19:47 +0200
Subject: [PATCH 34/60] Added ability to render preview in a DOM element

---
 CHANGELOG.md                |  1 +
 markitup/jquery.markitup.js | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ff88f..493feff 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ markItUp! 1.1.13
 
 CHANGE LOG
 markItUp! 1.1.12 2012-08-30
+- Added ability to render preview in a DOM element (ytjohn & jaysalvat)
 - Fixed Ctrl+Enter syntax error (UltCombo)
 - Added the previewHandler option to allow complete control over preview (lecterror)
 - Updated events to use namespace (JoyceBabu)
diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 848ea46..16061ab 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -34,6 +34,7 @@
 					root:					'',
 					previewHandler:			false,
 					previewInWindow:		'', // 'width=800, height=600, resizable=yes, scrollbars=yes'
+					previewInElement:		'',
 					previewAutoRefresh:		true,
 					previewPosition:		'after',
 					previewTemplatePath:	'~/templates/preview.html',
@@ -142,6 +143,10 @@
 				$$.bind('focus.markItUp', function() {
 					$.markItUp.focused = this;
 				});
+
+				if (options.previewInElement) {
+					refreshPreview();
+				}
 			}
 
 			// recursively build header with dropMenus from markupset
@@ -443,6 +448,8 @@
 			function preview() {
 				if (typeof options.previewHandler === 'function') {
 					previewWindow = true;
+				} else if (options.previewInElement) {
+					previewWindow = $(options.previewInElement);
 				} else if (!previewWindow || previewWindow.closed) {
 					if (options.previewInWindow) {
 						previewWindow = window.open('', 'preview', options.previewInWindow);
@@ -485,7 +492,7 @@
 					options.previewHandler( $$.val() );
 				} else if (options.previewParser && typeof options.previewParser === 'function') {
 					var data = options.previewParser( $$.val() );
-					writeInPreview( localize(data, 1) ); 
+					writeInPreview(localize(data, 1) ); 
 				} else if (options.previewParserPath !== '') {
 					$.ajax({
 						type: 'POST',
@@ -513,7 +520,9 @@
 			}
 			
 			function writeInPreview(data) {
-				if (previewWindow.document) {			
+				if (options.previewInElement) {
+					$(options.previewInElement).html(data);
+				} else if (previewWindow.document) {			
 					try {
 						sp = previewWindow.document.documentElement.scrollTop
 					} catch(e) {

From 1a209ed1136b2d364fe66acdc1837ef4bea87a24 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 15:20:00 +0200
Subject: [PATCH 35/60] Minor HTML changes

---
 index.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 91b7c3e..91f7d9f 100755
--- a/index.html
+++ b/index.html
@@ -20,17 +20,15 @@ <h1><a href="http://markitup.jaysalvat.com/">markItUp!</a></h1>
 <p><em><a href="http://www.jaysalvat.com">By Jay Salvat</a></em></p>
 <p>Downloads, examples and documentation at <a href="http://markitup.jaysalvat.com">http://markitup.jaysalvat.com</a>.</p>
 <p>Click <a href="#" class="add">this link to insert content</a> from anywhere in the page or <a href="#" class="toggle">this one to <span>remove markItUp!</span></a></p>
-<p>
 <textarea id="markItUp" cols="80" rows="20">
 &lt;h1&gt;Welcome on markItUp!&lt;/h1&gt;
 
 &lt;p&gt;&lt;strong&gt;markItUp!&lt;/strong&gt; is a JavaScript plugin built on the jQuery library. It allows you to turn any textarea into a markup editor. Html, Textile, Wiki Syntax, Markdown, BBcode or even your own markup system can be easily implemented.&lt;/p&gt;
 </textarea>
-</p>
 <p>Support the project : <a href="http://markitup.jaysalvat.com/">Donate</a> | <a href="http://markitup.jaysalvat.com/">Contact</a></p>
 
 <script type="text/javascript">
-$(function()	{
+$(function() {
 	// Add markItUp! to your textarea in one line
 	// $('textarea').markItUp( { Settings }, { OptionalExtraSettings } );
 	$('#markItUp').markItUp(mySettings);

From 98a170fc1622656725d35e143507628c2892f595 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 16:32:23 +0200
Subject: [PATCH 36/60] Added the syntax $(elm).markItUp('insert', { }); and
 $(elm).markItUp('remove');

---
 CHANGELOG.md                |  3 ++-
 index.html                  | 17 ++++++++++-------
 markitup/jquery.markitup.js | 35 +++++++++++++++++++++++++++++------
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 493feff..04f886f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,9 @@ markItUp! 1.1.12 2012-08-30
 - Fixed Ctrl+Enter syntax error (UltCombo)
 - Added the previewHandler option to allow complete control over preview (lecterror)
 - Updated events to use namespace (JoyceBabu)
+- Added $(elm).markItUp('insert', { }) and $(elm).markItUp('remove');
+- Updated the demo
 - Added package.json
-- Updated jQuery version to 1.8 in the demo
 
 markItUp! 1.1.12 2011-08-11
 - Fixed the insertion on empty selection
diff --git a/index.html b/index.html
index 91f7d9f..5651d28 100755
--- a/index.html
+++ b/index.html
@@ -32,15 +32,18 @@ <h1><a href="http://markitup.jaysalvat.com/">markItUp!</a></h1>
 	// Add markItUp! to your textarea in one line
 	// $('textarea').markItUp( { Settings }, { OptionalExtraSettings } );
 	$('#markItUp').markItUp(mySettings);
-	
+
+
+
 	// You can add content from anywhere in your page
 	// $.markItUp( { Settings } );	
 	$('.add').click(function() {
- 		$.markItUp( { 	openWith:'<opening tag>',
-						closeWith:'<\/closing tag>',
-						placeHolder:"New content"
-					}
-				);
+ 		$('#markItUp').markItUp('insert',
+			{ 	openWith:'<opening tag>',
+				closeWith:'<\/closing tag>',
+				placeHolder:"New content"
+			}
+		);
  		return false;
 	});
 	
@@ -48,7 +51,7 @@ <h1><a href="http://markitup.jaysalvat.com/">markItUp!</a></h1>
 	// $(textarea).markItUpRemove();
 	$('.toggle').click(function() {
 		if ($("#markItUp.markItUpEditor").length === 1) {
- 			$("#markItUp").markItUpRemove();
+ 			$("#markItUp").markItUp('remove');
 			$("span", this).text("get markItUp! back");
 		} else {
 			$('#markItUp').markItUp(mySettings);
diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 16061ab..6012239 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -26,9 +26,13 @@
 // ----------------------------------------------------------------------------
 (function($) {
 	$.fn.markItUp = function(settings, extraSettings) {
-		var options, ctrlKey, shiftKey, altKey;
-		ctrlKey = shiftKey = altKey = false;
-	
+		var method, params, options, ctrlKey, shiftKey, altKey; ctrlKey = shiftKey = altKey = false;
+
+		if (typeof settings == 'string') {
+			method = settings;
+			params = extraSettings;
+		} 
+
 		options = {	id:						'',
 					nameSpace:				'',
 					root:					'',
@@ -75,6 +79,20 @@
 			options.previewParserPath = localize(options.previewParserPath);
 			options.previewTemplatePath = localize(options.previewTemplatePath);
 
+			if (method) {
+				switch(method) {
+					case 'remove':
+						remove();
+					break;
+					case 'insert':
+						markup(params);
+					break;
+					default: 
+						$.error('Method ' +  method + ' does not exist on jQuery.markItUp');
+				}
+				return;
+			}
+
 			// apply the computed path to ~/
 			function localize(data, inText) {
 				if (inText) {
@@ -522,7 +540,7 @@
 			function writeInPreview(data) {
 				if (options.previewInElement) {
 					$(options.previewInElement).html(data);
-				} else if (previewWindow.document) {			
+				} else if (previewWindow && previewWindow.document) {			
 					try {
 						sp = previewWindow.document.documentElement.scrollTop
 					} catch(e) {
@@ -584,14 +602,19 @@
 				}
 			}
 
+			function remove() {
+				$$.unbind(".markItUp").removeClass('markItUpEditor');
+				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
+				$$.data('markItUp', null);
+			}
+
 			init();
 		});
 	};
 
 	$.fn.markItUpRemove = function() {
 		return this.each(function() {
-				var $$ = $(this).unbind(".markItUp").removeClass('markItUpEditor');
-				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
+				$(this).markItUp('remove');
 			}
 		);
 	};

From 7594f3e6be7fcd217d5c3596f10fa7bfcbe9cae1 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 30 Aug 2012 16:45:07 +0200
Subject: [PATCH 37/60] Fixed typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04f886f..1931497 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 markItUp! 1.1.13
 
 CHANGE LOG
-markItUp! 1.1.12 2012-08-30
+markItUp! 1.1.13 2012-08-30
 - Added ability to render preview in a DOM element (ytjohn & jaysalvat)
 - Fixed Ctrl+Enter syntax error (UltCombo)
 - Added the previewHandler option to allow complete control over preview (lecterror)

From aca586e68538a6a2f6714c460aa7adf5104ef0c0 Mon Sep 17 00:00:00 2001
From: michi lehr <michi@jimdo.com>
Date: Sun, 9 Sep 2012 22:21:38 +0200
Subject: [PATCH 38/60] Click on menu bubbles up so it could be reused

---
 markitup/jquery.markitup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 6012239..8d7513f 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -185,8 +185,8 @@
 						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
 						.bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click
 							return false;
-						}).bind('click.markItUp', function() {
-							return false;
+						}).bind('click.markItUp', function(e) {
+							e.preventDefault();
 						}).bind("focusin.markItUp", function(){
                             $$.focus();
 						}).bind('mouseup', function() {

From cbdbacad4e65fd9b38587ea65bd8467c09aeed19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Caput?= <github.com@mirari.fr>
Date: Fri, 4 Jan 2013 17:42:28 +0100
Subject: [PATCH 39/60] Fixed default (placeHolder) selection after using a tag
 having either openBlockWith or closeBlockWith property.

---
 markitup/jquery.markitup.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 6012239..b1fa8d5 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -294,10 +294,12 @@
 				block = openBlockWith + block + closeBlockWith;
 
 				return {	block:block, 
+							openBlockWith:openBlockWith,
 							openWith:openWith, 
 							replaceWith:replaceWith, 
 							placeHolder:placeHolder,
-							closeWith:closeWith
+							closeWith:closeWith,
+							closeBlockWith:closeBlockWith
 					};
 			}
 
@@ -358,8 +360,8 @@
 				if ((selection === '' && string.replaceWith === '')) {
 					caretOffset += fixOperaBug(string.block);
 					
-					start = caretPosition + string.openWith.length;
-					len = string.block.length - string.openWith.length - string.closeWith.length;
+					start = caretPosition + string.openBlockWith.length + string.openWith.length;
+					len = string.block.length - string.openBlockWith.length - string.openWith.length - string.closeWith.length - string.closeBlockWith.length;
 
 					caretOffset = $$.val().substring(caretPosition,  $$.val().length).length;
 					caretOffset -= fixOperaBug($$.val().substring(0, caretPosition));

From bae7bddecb9d505e32c569edcfdc95f452692b49 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Tue, 29 Jan 2013 14:12:15 +0100
Subject: [PATCH 40/60] Add quick patch to keep compatibility with jQuery 1.9+

---
 markitup/jquery.markitup.js | 41 +++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index a9ed06a..b7e2d03 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -66,6 +66,35 @@
 			});
 		}
 
+		// Quick patch to keep compatibility with jQuery 1.9
+		var uaMatch = function(ua) {
+			ua = ua.toLowerCase();
+
+			var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
+				/(webkit)[ \/]([\w.]+)/.exec(ua) ||
+				/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+				/(msie) ([\w.]+)/.exec(ua) ||
+				ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
+				[];
+
+			return {
+				browser: match[ 1 ] || "",
+				version: match[ 2 ] || "0"
+			};
+		};
+		var matched = uaMatch( navigator.userAgent );
+		var browser = {};
+
+		if (matched.browser) {
+			browser[matched.browser] = true;
+			browser.version = matched.version;
+		}
+		if (browser.chrome) {
+			browser.webkit = true;
+		} else if (browser.webkit) {
+			browser.safari = true;
+		}
+
 		return this.each(function() {
 			var $$, textarea, levels, scrollPosition, caretPosition, caretOffset,
 				clicked, hash, header, footer, previewWindow, template, iFrame, abort;
@@ -126,7 +155,7 @@
 				footer = $('<div class="markItUpFooter"></div>').insertAfter($$);
 
 				// add the resize handle after textarea
-				if (options.resizeHandle === true && $.browser.safari !== true) {
+				if (options.resizeHandle === true && browser.safari !== true) {
 					resizeHandle = $('<div class="markItUpResizeHandle"></div>')
 						.insertAfter($$)
 						.bind("mousedown.markItUp", function(e) {
@@ -339,7 +368,7 @@
 
 					string = { block:lines.join('\n')};
 					start = caretPosition;
-					len = string.block.length + (($.browser.opera) ? n-1 : 0);
+					len = string.block.length + ((browser.opera) ? n-1 : 0);
 				} else if (ctrlKey === true) {
 					string = build(selection);
 					start = caretPosition + string.openWith.length;
@@ -396,14 +425,14 @@
 
 			// Substract linefeed in Opera
 			function fixOperaBug(string) {
-				if ($.browser.opera) {
+				if (browser.opera) {
 					return string.length - string.replace(/\n*/g, '').length;
 				}
 				return 0;
 			}
 			// Substract linefeed in IE
 			function fixIeBug(string) {
-				if ($.browser.msie) {
+				if (browser.msie) {
 					return string.length - string.replace(/\r*/g, '').length;
 				}
 				return 0;
@@ -423,7 +452,7 @@
 			function set(start, len) {
 				if (textarea.createTextRange){
 					// quick fix to make it work on Opera 9.5
-					if ($.browser.opera && $.browser.version >= 9.5 && len == 0) {
+					if (browser.opera && browser.version >= 9.5 && len == 0) {
 						return false;
 					}
 					range = textarea.createTextRange();
@@ -445,7 +474,7 @@
 				scrollPosition = textarea.scrollTop;
 				if (document.selection) {
 					selection = document.selection.createRange().text;
-					if ($.browser.msie) { // ie
+					if (browser.msie) { // ie
 						var range = document.selection.createRange(), rangeCopy = range.duplicate();
 						rangeCopy.moveToElementText(textarea);
 						caretPosition = -1;

From 08cf5c497459090c7079b302e2679ca61bbfaf61 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 4 Feb 2013 13:53:47 +0100
Subject: [PATCH 41/60] Update changelog for release 1.1.14

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1931497..a6d07c6 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
-markItUp! 1.1.13
+markItUp! 1.1.14
 
 CHANGE LOG
+markItUp! 1.1.14 2013-02-04
+- Compatibility patch for jQuery 1.9+
+- Click on menu bubbles up so it could be reused (michilehr)
+- Fixed default selection after using a tag having either openBlockWith or closeBlockWith (r3c)
+
 markItUp! 1.1.13 2012-08-30
 - Added ability to render preview in a DOM element (ytjohn & jaysalvat)
 - Fixed Ctrl+Enter syntax error (UltCombo)

From 5d008ae6b8111b22f08040c095f5a361ec34cf65 Mon Sep 17 00:00:00 2001
From: Alexey Sveshnikov <alexey.sveshnikov@gmail.com>
Date: Thu, 11 Jul 2013 22:48:38 +0400
Subject: [PATCH 42/60] make markItUpRemove function idempotent

---
 markitup/jquery.markitup.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index b7e2d03..02c11d5 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -636,6 +636,9 @@
 			function remove() {
 				$$.unbind(".markItUp").removeClass('markItUpEditor');
 				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
+				var relative_ref = $$.parent('div').parent('div.markItUp').parent('div');
+				if (relative_ref.length)
+				    relative_ref.replaceWith($$);
 				$$.data('markItUp', null);
 			}
 

From 5034579f24062baf385d43687e44b497cc72c2b8 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Fri, 12 Jul 2013 12:43:52 +0200
Subject: [PATCH 43/60] Code formating

---
 markitup/jquery.markitup.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 02c11d5..5bb69c3 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -636,9 +636,12 @@
 			function remove() {
 				$$.unbind(".markItUp").removeClass('markItUpEditor');
 				$$.parent('div').parent('div.markItUp').parent('div').replaceWith($$);
-				var relative_ref = $$.parent('div').parent('div.markItUp').parent('div');
-				if (relative_ref.length)
-				    relative_ref.replaceWith($$);
+
+				var relativeRef = $$.parent('div').parent('div.markItUp').parent('div');
+				if (relativeRef.length) {
+				    relativeRef.replaceWith($$);
+				}
+				
 				$$.data('markItUp', null);
 			}
 

From 61a54f58daad3fe5c1fe39100ec2f2c2300e1065 Mon Sep 17 00:00:00 2001
From: Vitaliy Ralle <email4vit@gmail.com>
Date: Thu, 26 Sep 2013 15:33:09 +0300
Subject: [PATCH 44/60] Adding More Customization

Add Custom tags to button name. Backward Compatibility.
markupSet: [
	{name:'<i class="icon-bold"></i>', title:"Font Bold", key:'B', openWith:'[b]', closeWith:'[/b]', className: 'bb-bold'},
	{name:'Tont Italic', key:'I', openWith:'[i]', closeWith:'[/i]', className: 'bb-bold'}
}
Example: http://test.hw-lab.com/viewtopic.php?f=3&t=8&start=40
---
 markitup/jquery.markitup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 5bb69c3..4422b2f 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -202,7 +202,7 @@
 				$('li:hover > ul', ul).css('display', 'block');
 				$.each(markupSet, function() {
 					var button = this, t = '', title, li, j;
-					title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
+					button.title ? title = (button.key) ? (button.title||'')+' [Ctrl+'+button.key+']' : (button.title||'') : title = (button.key) ? (button.name||'')+' [Ctrl+'+button.key+']' : (button.name||'');
 					key   = (button.key) ? 'accesskey="'+button.key+'"' : '';
 					if (button.separator) {
 						li = $('<li class="markItUpSeparator">'+(button.separator||'')+'</li>').appendTo(ul);

From f8c1405b47a1fa12f6873e650649213ed0c15c1f Mon Sep 17 00:00:00 2001
From: Reuben Helms <reuben.helms@celentia.com>
Date: Tue, 8 Oct 2013 12:20:19 +1000
Subject: [PATCH 45/60] Add option previewParserAjaxType

The option previewParserAjaxType allows the user to specify the
HTTP verb when calling the preview parser via Ajax.
The default is POST
---
 markitup/jquery.markitup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 4422b2f..5e46ea5 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -45,6 +45,7 @@
 					previewParser:			false,
 					previewParserPath:		'',
 					previewParserVar:		'data',
+					previewParserAjaxType:	'POST',
 					resizeHandle:			true,
 					beforeInsert:			'',
 					afterInsert:			'',
@@ -544,7 +545,7 @@
 					writeInPreview(localize(data, 1) ); 
 				} else if (options.previewParserPath !== '') {
 					$.ajax({
-						type: 'POST',
+						type: options.previewParserAjaxType,
 						dataType: 'text',
 						global: false,
 						url: options.previewParserPath,

From df32c4901248910909739ecff1fc33748ff6af82 Mon Sep 17 00:00:00 2001
From: Kai W <kaiwatermann@gmail.com>
Date: Wed, 30 Oct 2013 20:37:02 +0100
Subject: [PATCH 46/60] Adding bower.json

---
 bower.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bower.json

diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..b450009
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,13 @@
+{
+  "name": "markitup",
+  "version": "1.1.14",
+  "main": [ "markitup/jquery.markitup.js", "sets/*", "skins/*", "images/*" ],
+  "ignore": [
+    "markitup/templates/*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests",
+    "vendor"
+  ]
+}

From 58c85daf24b1772d4ee10d32630f720d4845b2f4 Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise.maupate@gmail.com>
Date: Tue, 18 Mar 2014 18:43:00 +0100
Subject: [PATCH 47/60] Pass mouse up event to custom delegate with event
 object

---
 markitup/jquery.markitup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 5e46ea5..ad4ef9b 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -219,9 +219,9 @@
 							e.preventDefault();
 						}).bind("focusin.markItUp", function(){
                             $$.focus();
-						}).bind('mouseup', function() {
+						}).bind('mouseup', function(e) {
 							if (button.call) {
-								eval(button.call)();
+								eval(button.call)(e); // Pass the mouseup event to custom delegate
 							}
 							setTimeout(function() { markup(button) },1);
 							return false;

From 05db57c5baa74385ff7f8eed0a7be265a9d5632c Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise.maupate@gmail.com>
Date: Tue, 18 Mar 2014 18:51:48 +0100
Subject: [PATCH 48/60] Added uglified jquery.markitup.min.js

---
 markitup/jquery.markitup.min.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 markitup/jquery.markitup.min.js

diff --git a/markitup/jquery.markitup.min.js b/markitup/jquery.markitup.min.js
new file mode 100644
index 0000000..fa657aa
--- /dev/null
+++ b/markitup/jquery.markitup.min.js
@@ -0,0 +1 @@
+(function($){$.fn.markItUp=function(settings,extraSettings){var method,params,options,ctrlKey,shiftKey,altKey;ctrlKey=shiftKey=altKey=false;if(typeof settings=="string"){method=settings;params=extraSettings}options={id:"",nameSpace:"",root:"",previewHandler:false,previewInWindow:"",previewInElement:"",previewAutoRefresh:true,previewPosition:"after",previewTemplatePath:"~/templates/preview.html",previewParser:false,previewParserPath:"",previewParserVar:"data",previewParserAjaxType:"POST",resizeHandle:true,beforeInsert:"",afterInsert:"",onEnter:{},onShiftEnter:{},onCtrlEnter:{},onTab:{},markupSet:[{}]};$.extend(options,settings,extraSettings);if(!options.root){$("script").each(function(a,tag){miuScript=$(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);if(miuScript!==null){options.root=miuScript[1]}})}var uaMatch=function(ua){ua=ua.toLowerCase();var match=/(chrome)[ \/]([\w.]+)/.exec(ua)||/(webkit)[ \/]([\w.]+)/.exec(ua)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua)||/(msie) ([\w.]+)/.exec(ua)||ua.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)||[];return{browser:match[1]||"",version:match[2]||"0"}};var matched=uaMatch(navigator.userAgent);var browser={};if(matched.browser){browser[matched.browser]=true;browser.version=matched.version}if(browser.chrome){browser.webkit=true}else if(browser.webkit){browser.safari=true}return this.each(function(){var $$,textarea,levels,scrollPosition,caretPosition,caretOffset,clicked,hash,header,footer,previewWindow,template,iFrame,abort;$$=$(this);textarea=this;levels=[];abort=false;scrollPosition=caretPosition=0;caretOffset=-1;options.previewParserPath=localize(options.previewParserPath);options.previewTemplatePath=localize(options.previewTemplatePath);if(method){switch(method){case"remove":remove();break;case"insert":markup(params);break;default:$.error("Method "+method+" does not exist on jQuery.markItUp")}return}function localize(data,inText){if(inText){return data.replace(/("|')~\//g,"$1"+options.root)}return data.replace(/^~\//,options.root)}function init(){id="";nameSpace="";if(options.id){id='id="'+options.id+'"'}else if($$.attr("id")){id='id="markItUp'+$$.attr("id").substr(0,1).toUpperCase()+$$.attr("id").substr(1)+'"'}if(options.nameSpace){nameSpace='class="'+options.nameSpace+'"'}$$.wrap("<div "+nameSpace+"></div>");$$.wrap("<div "+id+' class="markItUp"></div>');$$.wrap('<div class="markItUpContainer"></div>');$$.addClass("markItUpEditor");header=$('<div class="markItUpHeader"></div>').insertBefore($$);$(dropMenus(options.markupSet)).appendTo(header);footer=$('<div class="markItUpFooter"></div>').insertAfter($$);if(options.resizeHandle===true&&browser.safari!==true){resizeHandle=$('<div class="markItUpResizeHandle"></div>').insertAfter($$).bind("mousedown.markItUp",function(e){var h=$$.height(),y=e.clientY,mouseMove,mouseUp;mouseMove=function(e){$$.css("height",Math.max(20,e.clientY+h-y)+"px");return false};mouseUp=function(e){$("html").unbind("mousemove.markItUp",mouseMove).unbind("mouseup.markItUp",mouseUp);return false};$("html").bind("mousemove.markItUp",mouseMove).bind("mouseup.markItUp",mouseUp)});footer.append(resizeHandle)}$$.bind("keydown.markItUp",keyPressed).bind("keyup",keyPressed);$$.bind("insertion.markItUp",function(e,settings){if(settings.target!==false){get()}if(textarea===$.markItUp.focused){markup(settings)}});$$.bind("focus.markItUp",function(){$.markItUp.focused=this});if(options.previewInElement){refreshPreview()}}function dropMenus(markupSet){var ul=$("<ul></ul>"),i=0;$("li:hover > ul",ul).css("display","block");$.each(markupSet,function(){var button=this,t="",title,li,j;button.title?title=button.key?(button.title||"")+" [Ctrl+"+button.key+"]":button.title||"":title=button.key?(button.name||"")+" [Ctrl+"+button.key+"]":button.name||"";key=button.key?'accesskey="'+button.key+'"':"";if(button.separator){li=$('<li class="markItUpSeparator">'+(button.separator||"")+"</li>").appendTo(ul)}else{i++;for(j=levels.length-1;j>=0;j--){t+=levels[j]+"-"}li=$('<li class="markItUpButton markItUpButton'+t+i+" "+(button.className||"")+'"><a href="" '+key+' title="'+title+'">'+(button.name||"")+"</a></li>").bind("contextmenu.markItUp",function(){return false}).bind("click.markItUp",function(e){e.preventDefault()}).bind("focusin.markItUp",function(){$$.focus()}).bind("mouseup",function(e){if(button.call){eval(button.call)(e)}setTimeout(function(){markup(button)},1);return false}).bind("mouseenter.markItUp",function(){$("> ul",this).show();$(document).one("click",function(){$("ul ul",header).hide()})}).bind("mouseleave.markItUp",function(){$("> ul",this).hide()}).appendTo(ul);if(button.dropMenu){levels.push(i);$(li).addClass("markItUpDropMenu").append(dropMenus(button.dropMenu))}}});levels.pop();return ul}function magicMarkups(string){if(string){string=string.toString();string=string.replace(/\(\!\(([\s\S]*?)\)\!\)/g,function(x,a){var b=a.split("|!|");if(altKey===true){return b[1]!==undefined?b[1]:b[0]}else{return b[1]===undefined?"":b[0]}});string=string.replace(/\[\!\[([\s\S]*?)\]\!\]/g,function(x,a){var b=a.split(":!:");if(abort===true){return false}value=prompt(b[0],b[1]?b[1]:"");if(value===null){abort=true}return value});return string}return""}function prepare(action){if($.isFunction(action)){action=action(hash)}return magicMarkups(action)}function build(string){var openWith=prepare(clicked.openWith);var placeHolder=prepare(clicked.placeHolder);var replaceWith=prepare(clicked.replaceWith);var closeWith=prepare(clicked.closeWith);var openBlockWith=prepare(clicked.openBlockWith);var closeBlockWith=prepare(clicked.closeBlockWith);var multiline=clicked.multiline;if(replaceWith!==""){block=openWith+replaceWith+closeWith}else if(selection===""&&placeHolder!==""){block=openWith+placeHolder+closeWith}else{string=string||selection;var lines=[string],blocks=[];if(multiline===true){lines=string.split(/\r?\n/)}for(var l=0;l<lines.length;l++){line=lines[l];var trailingSpaces;if(trailingSpaces=line.match(/ *$/)){blocks.push(openWith+line.replace(/ *$/g,"")+closeWith+trailingSpaces)}else{blocks.push(openWith+line+closeWith)}}block=blocks.join("\n")}block=openBlockWith+block+closeBlockWith;return{block:block,openBlockWith:openBlockWith,openWith:openWith,replaceWith:replaceWith,placeHolder:placeHolder,closeWith:closeWith,closeBlockWith:closeBlockWith}}function markup(button){var len,j,n,i;hash=clicked=button;get();$.extend(hash,{line:"",root:options.root,textarea:textarea,selection:selection||"",caretPosition:caretPosition,ctrlKey:ctrlKey,shiftKey:shiftKey,altKey:altKey});prepare(options.beforeInsert);prepare(clicked.beforeInsert);if(ctrlKey===true&&shiftKey===true||button.multiline===true){prepare(clicked.beforeMultiInsert)}$.extend(hash,{line:1});if(ctrlKey===true&&shiftKey===true){lines=selection.split(/\r?\n/);for(j=0,n=lines.length,i=0;i<n;i++){if($.trim(lines[i])!==""){$.extend(hash,{line:++j,selection:lines[i]});lines[i]=build(lines[i]).block}else{lines[i]=""}}string={block:lines.join("\n")};start=caretPosition;len=string.block.length+(browser.opera?n-1:0)}else if(ctrlKey===true){string=build(selection);start=caretPosition+string.openWith.length;len=string.block.length-string.openWith.length-string.closeWith.length;len=len-(string.block.match(/ $/)?1:0);len-=fixIeBug(string.block)}else if(shiftKey===true){string=build(selection);start=caretPosition;len=string.block.length;len-=fixIeBug(string.block)}else{string=build(selection);start=caretPosition+string.block.length;len=0;start-=fixIeBug(string.block)}if(selection===""&&string.replaceWith===""){caretOffset+=fixOperaBug(string.block);start=caretPosition+string.openBlockWith.length+string.openWith.length;len=string.block.length-string.openBlockWith.length-string.openWith.length-string.closeWith.length-string.closeBlockWith.length;caretOffset=$$.val().substring(caretPosition,$$.val().length).length;caretOffset-=fixOperaBug($$.val().substring(0,caretPosition))}$.extend(hash,{caretPosition:caretPosition,scrollPosition:scrollPosition});if(string.block!==selection&&abort===false){insert(string.block);set(start,len)}else{caretOffset=-1}get();$.extend(hash,{line:"",selection:selection});if(ctrlKey===true&&shiftKey===true||button.multiline===true){prepare(clicked.afterMultiInsert)}prepare(clicked.afterInsert);prepare(options.afterInsert);if(previewWindow&&options.previewAutoRefresh){refreshPreview()}shiftKey=altKey=ctrlKey=abort=false}function fixOperaBug(string){if(browser.opera){return string.length-string.replace(/\n*/g,"").length}return 0}function fixIeBug(string){if(browser.msie){return string.length-string.replace(/\r*/g,"").length}return 0}function insert(block){if(document.selection){var newSelection=document.selection.createRange();newSelection.text=block}else{textarea.value=textarea.value.substring(0,caretPosition)+block+textarea.value.substring(caretPosition+selection.length,textarea.value.length)}}function set(start,len){if(textarea.createTextRange){if(browser.opera&&browser.version>=9.5&&len==0){return false}range=textarea.createTextRange();range.collapse(true);range.moveStart("character",start);range.moveEnd("character",len);range.select()}else if(textarea.setSelectionRange){textarea.setSelectionRange(start,start+len)}textarea.scrollTop=scrollPosition;textarea.focus()}function get(){textarea.focus();scrollPosition=textarea.scrollTop;if(document.selection){selection=document.selection.createRange().text;if(browser.msie){var range=document.selection.createRange(),rangeCopy=range.duplicate();rangeCopy.moveToElementText(textarea);caretPosition=-1;while(rangeCopy.inRange(range)){rangeCopy.moveStart("character");caretPosition++}}else{caretPosition=textarea.selectionStart}}else{caretPosition=textarea.selectionStart;selection=textarea.value.substring(caretPosition,textarea.selectionEnd)}return selection}function preview(){if(typeof options.previewHandler==="function"){previewWindow=true}else if(options.previewInElement){previewWindow=$(options.previewInElement)}else if(!previewWindow||previewWindow.closed){if(options.previewInWindow){previewWindow=window.open("","preview",options.previewInWindow);$(window).unload(function(){previewWindow.close()})}else{iFrame=$('<iframe class="markItUpPreviewFrame"></iframe>');if(options.previewPosition=="after"){iFrame.insertAfter(footer)}else{iFrame.insertBefore(header)}previewWindow=iFrame[iFrame.length-1].contentWindow||frame[iFrame.length-1]}}else if(altKey===true){if(iFrame){iFrame.remove()}else{previewWindow.close()}previewWindow=iFrame=false}if(!options.previewAutoRefresh){refreshPreview()}if(options.previewInWindow){previewWindow.focus()}}function refreshPreview(){renderPreview()}function renderPreview(){var phtml;if(options.previewHandler&&typeof options.previewHandler==="function"){options.previewHandler($$.val())}else if(options.previewParser&&typeof options.previewParser==="function"){var data=options.previewParser($$.val());writeInPreview(localize(data,1))}else if(options.previewParserPath!==""){$.ajax({type:options.previewParserAjaxType,dataType:"text",global:false,url:options.previewParserPath,data:options.previewParserVar+"="+encodeURIComponent($$.val()),success:function(data){writeInPreview(localize(data,1))}})}else{if(!template){$.ajax({url:options.previewTemplatePath,dataType:"text",global:false,success:function(data){writeInPreview(localize(data,1).replace(/<!-- content -->/g,$$.val()))}})}}return false}function writeInPreview(data){if(options.previewInElement){$(options.previewInElement).html(data)}else if(previewWindow&&previewWindow.document){try{sp=previewWindow.document.documentElement.scrollTop}catch(e){sp=0}previewWindow.document.open();previewWindow.document.write(data);previewWindow.document.close();previewWindow.document.documentElement.scrollTop=sp}}function keyPressed(e){shiftKey=e.shiftKey;altKey=e.altKey;ctrlKey=!(e.altKey&&e.ctrlKey)?e.ctrlKey||e.metaKey:false;if(e.type==="keydown"){if(ctrlKey===true){li=$('a[accesskey="'+(e.keyCode==13?"\\n":String.fromCharCode(e.keyCode))+'"]',header).parent("li");if(li.length!==0){ctrlKey=false;setTimeout(function(){li.triggerHandler("mouseup")},1);return false}}if(e.keyCode===13||e.keyCode===10){if(ctrlKey===true){ctrlKey=false;markup(options.onCtrlEnter);return options.onCtrlEnter.keepDefault}else if(shiftKey===true){shiftKey=false;markup(options.onShiftEnter);return options.onShiftEnter.keepDefault}else{markup(options.onEnter);return options.onEnter.keepDefault}}if(e.keyCode===9){if(shiftKey==true||ctrlKey==true||altKey==true){return false}if(caretOffset!==-1){get();caretOffset=$$.val().length-caretOffset;set(caretOffset,0);caretOffset=-1;return false}else{markup(options.onTab);return options.onTab.keepDefault}}}}function remove(){$$.unbind(".markItUp").removeClass("markItUpEditor");$$.parent("div").parent("div.markItUp").parent("div").replaceWith($$);var relativeRef=$$.parent("div").parent("div.markItUp").parent("div");if(relativeRef.length){relativeRef.replaceWith($$)}$$.data("markItUp",null)}init()})};$.fn.markItUpRemove=function(){return this.each(function(){$(this).markItUp("remove")})};$.markItUp=function(settings){var options={target:false};$.extend(options,settings);if(options.target){return $(options.target).each(function(){$(this).focus();$(this).trigger("insertion",[options])})}else{$("textarea").trigger("insertion",[options])}}})(jQuery);
\ No newline at end of file

From d248487a394d2af85ce05443fd0ef2be9050c54b Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 20 Mar 2014 17:18:22 +0100
Subject: [PATCH 49/60] Pass mouse up event to custom delegate with event
 object (rezozero)

---
 markitup/jquery.markitup.min.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 markitup/jquery.markitup.min.js

diff --git a/markitup/jquery.markitup.min.js b/markitup/jquery.markitup.min.js
deleted file mode 100644
index fa657aa..0000000
--- a/markitup/jquery.markitup.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function($){$.fn.markItUp=function(settings,extraSettings){var method,params,options,ctrlKey,shiftKey,altKey;ctrlKey=shiftKey=altKey=false;if(typeof settings=="string"){method=settings;params=extraSettings}options={id:"",nameSpace:"",root:"",previewHandler:false,previewInWindow:"",previewInElement:"",previewAutoRefresh:true,previewPosition:"after",previewTemplatePath:"~/templates/preview.html",previewParser:false,previewParserPath:"",previewParserVar:"data",previewParserAjaxType:"POST",resizeHandle:true,beforeInsert:"",afterInsert:"",onEnter:{},onShiftEnter:{},onCtrlEnter:{},onTab:{},markupSet:[{}]};$.extend(options,settings,extraSettings);if(!options.root){$("script").each(function(a,tag){miuScript=$(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);if(miuScript!==null){options.root=miuScript[1]}})}var uaMatch=function(ua){ua=ua.toLowerCase();var match=/(chrome)[ \/]([\w.]+)/.exec(ua)||/(webkit)[ \/]([\w.]+)/.exec(ua)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua)||/(msie) ([\w.]+)/.exec(ua)||ua.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)||[];return{browser:match[1]||"",version:match[2]||"0"}};var matched=uaMatch(navigator.userAgent);var browser={};if(matched.browser){browser[matched.browser]=true;browser.version=matched.version}if(browser.chrome){browser.webkit=true}else if(browser.webkit){browser.safari=true}return this.each(function(){var $$,textarea,levels,scrollPosition,caretPosition,caretOffset,clicked,hash,header,footer,previewWindow,template,iFrame,abort;$$=$(this);textarea=this;levels=[];abort=false;scrollPosition=caretPosition=0;caretOffset=-1;options.previewParserPath=localize(options.previewParserPath);options.previewTemplatePath=localize(options.previewTemplatePath);if(method){switch(method){case"remove":remove();break;case"insert":markup(params);break;default:$.error("Method "+method+" does not exist on jQuery.markItUp")}return}function localize(data,inText){if(inText){return data.replace(/("|')~\//g,"$1"+options.root)}return data.replace(/^~\//,options.root)}function init(){id="";nameSpace="";if(options.id){id='id="'+options.id+'"'}else if($$.attr("id")){id='id="markItUp'+$$.attr("id").substr(0,1).toUpperCase()+$$.attr("id").substr(1)+'"'}if(options.nameSpace){nameSpace='class="'+options.nameSpace+'"'}$$.wrap("<div "+nameSpace+"></div>");$$.wrap("<div "+id+' class="markItUp"></div>');$$.wrap('<div class="markItUpContainer"></div>');$$.addClass("markItUpEditor");header=$('<div class="markItUpHeader"></div>').insertBefore($$);$(dropMenus(options.markupSet)).appendTo(header);footer=$('<div class="markItUpFooter"></div>').insertAfter($$);if(options.resizeHandle===true&&browser.safari!==true){resizeHandle=$('<div class="markItUpResizeHandle"></div>').insertAfter($$).bind("mousedown.markItUp",function(e){var h=$$.height(),y=e.clientY,mouseMove,mouseUp;mouseMove=function(e){$$.css("height",Math.max(20,e.clientY+h-y)+"px");return false};mouseUp=function(e){$("html").unbind("mousemove.markItUp",mouseMove).unbind("mouseup.markItUp",mouseUp);return false};$("html").bind("mousemove.markItUp",mouseMove).bind("mouseup.markItUp",mouseUp)});footer.append(resizeHandle)}$$.bind("keydown.markItUp",keyPressed).bind("keyup",keyPressed);$$.bind("insertion.markItUp",function(e,settings){if(settings.target!==false){get()}if(textarea===$.markItUp.focused){markup(settings)}});$$.bind("focus.markItUp",function(){$.markItUp.focused=this});if(options.previewInElement){refreshPreview()}}function dropMenus(markupSet){var ul=$("<ul></ul>"),i=0;$("li:hover > ul",ul).css("display","block");$.each(markupSet,function(){var button=this,t="",title,li,j;button.title?title=button.key?(button.title||"")+" [Ctrl+"+button.key+"]":button.title||"":title=button.key?(button.name||"")+" [Ctrl+"+button.key+"]":button.name||"";key=button.key?'accesskey="'+button.key+'"':"";if(button.separator){li=$('<li class="markItUpSeparator">'+(button.separator||"")+"</li>").appendTo(ul)}else{i++;for(j=levels.length-1;j>=0;j--){t+=levels[j]+"-"}li=$('<li class="markItUpButton markItUpButton'+t+i+" "+(button.className||"")+'"><a href="" '+key+' title="'+title+'">'+(button.name||"")+"</a></li>").bind("contextmenu.markItUp",function(){return false}).bind("click.markItUp",function(e){e.preventDefault()}).bind("focusin.markItUp",function(){$$.focus()}).bind("mouseup",function(e){if(button.call){eval(button.call)(e)}setTimeout(function(){markup(button)},1);return false}).bind("mouseenter.markItUp",function(){$("> ul",this).show();$(document).one("click",function(){$("ul ul",header).hide()})}).bind("mouseleave.markItUp",function(){$("> ul",this).hide()}).appendTo(ul);if(button.dropMenu){levels.push(i);$(li).addClass("markItUpDropMenu").append(dropMenus(button.dropMenu))}}});levels.pop();return ul}function magicMarkups(string){if(string){string=string.toString();string=string.replace(/\(\!\(([\s\S]*?)\)\!\)/g,function(x,a){var b=a.split("|!|");if(altKey===true){return b[1]!==undefined?b[1]:b[0]}else{return b[1]===undefined?"":b[0]}});string=string.replace(/\[\!\[([\s\S]*?)\]\!\]/g,function(x,a){var b=a.split(":!:");if(abort===true){return false}value=prompt(b[0],b[1]?b[1]:"");if(value===null){abort=true}return value});return string}return""}function prepare(action){if($.isFunction(action)){action=action(hash)}return magicMarkups(action)}function build(string){var openWith=prepare(clicked.openWith);var placeHolder=prepare(clicked.placeHolder);var replaceWith=prepare(clicked.replaceWith);var closeWith=prepare(clicked.closeWith);var openBlockWith=prepare(clicked.openBlockWith);var closeBlockWith=prepare(clicked.closeBlockWith);var multiline=clicked.multiline;if(replaceWith!==""){block=openWith+replaceWith+closeWith}else if(selection===""&&placeHolder!==""){block=openWith+placeHolder+closeWith}else{string=string||selection;var lines=[string],blocks=[];if(multiline===true){lines=string.split(/\r?\n/)}for(var l=0;l<lines.length;l++){line=lines[l];var trailingSpaces;if(trailingSpaces=line.match(/ *$/)){blocks.push(openWith+line.replace(/ *$/g,"")+closeWith+trailingSpaces)}else{blocks.push(openWith+line+closeWith)}}block=blocks.join("\n")}block=openBlockWith+block+closeBlockWith;return{block:block,openBlockWith:openBlockWith,openWith:openWith,replaceWith:replaceWith,placeHolder:placeHolder,closeWith:closeWith,closeBlockWith:closeBlockWith}}function markup(button){var len,j,n,i;hash=clicked=button;get();$.extend(hash,{line:"",root:options.root,textarea:textarea,selection:selection||"",caretPosition:caretPosition,ctrlKey:ctrlKey,shiftKey:shiftKey,altKey:altKey});prepare(options.beforeInsert);prepare(clicked.beforeInsert);if(ctrlKey===true&&shiftKey===true||button.multiline===true){prepare(clicked.beforeMultiInsert)}$.extend(hash,{line:1});if(ctrlKey===true&&shiftKey===true){lines=selection.split(/\r?\n/);for(j=0,n=lines.length,i=0;i<n;i++){if($.trim(lines[i])!==""){$.extend(hash,{line:++j,selection:lines[i]});lines[i]=build(lines[i]).block}else{lines[i]=""}}string={block:lines.join("\n")};start=caretPosition;len=string.block.length+(browser.opera?n-1:0)}else if(ctrlKey===true){string=build(selection);start=caretPosition+string.openWith.length;len=string.block.length-string.openWith.length-string.closeWith.length;len=len-(string.block.match(/ $/)?1:0);len-=fixIeBug(string.block)}else if(shiftKey===true){string=build(selection);start=caretPosition;len=string.block.length;len-=fixIeBug(string.block)}else{string=build(selection);start=caretPosition+string.block.length;len=0;start-=fixIeBug(string.block)}if(selection===""&&string.replaceWith===""){caretOffset+=fixOperaBug(string.block);start=caretPosition+string.openBlockWith.length+string.openWith.length;len=string.block.length-string.openBlockWith.length-string.openWith.length-string.closeWith.length-string.closeBlockWith.length;caretOffset=$$.val().substring(caretPosition,$$.val().length).length;caretOffset-=fixOperaBug($$.val().substring(0,caretPosition))}$.extend(hash,{caretPosition:caretPosition,scrollPosition:scrollPosition});if(string.block!==selection&&abort===false){insert(string.block);set(start,len)}else{caretOffset=-1}get();$.extend(hash,{line:"",selection:selection});if(ctrlKey===true&&shiftKey===true||button.multiline===true){prepare(clicked.afterMultiInsert)}prepare(clicked.afterInsert);prepare(options.afterInsert);if(previewWindow&&options.previewAutoRefresh){refreshPreview()}shiftKey=altKey=ctrlKey=abort=false}function fixOperaBug(string){if(browser.opera){return string.length-string.replace(/\n*/g,"").length}return 0}function fixIeBug(string){if(browser.msie){return string.length-string.replace(/\r*/g,"").length}return 0}function insert(block){if(document.selection){var newSelection=document.selection.createRange();newSelection.text=block}else{textarea.value=textarea.value.substring(0,caretPosition)+block+textarea.value.substring(caretPosition+selection.length,textarea.value.length)}}function set(start,len){if(textarea.createTextRange){if(browser.opera&&browser.version>=9.5&&len==0){return false}range=textarea.createTextRange();range.collapse(true);range.moveStart("character",start);range.moveEnd("character",len);range.select()}else if(textarea.setSelectionRange){textarea.setSelectionRange(start,start+len)}textarea.scrollTop=scrollPosition;textarea.focus()}function get(){textarea.focus();scrollPosition=textarea.scrollTop;if(document.selection){selection=document.selection.createRange().text;if(browser.msie){var range=document.selection.createRange(),rangeCopy=range.duplicate();rangeCopy.moveToElementText(textarea);caretPosition=-1;while(rangeCopy.inRange(range)){rangeCopy.moveStart("character");caretPosition++}}else{caretPosition=textarea.selectionStart}}else{caretPosition=textarea.selectionStart;selection=textarea.value.substring(caretPosition,textarea.selectionEnd)}return selection}function preview(){if(typeof options.previewHandler==="function"){previewWindow=true}else if(options.previewInElement){previewWindow=$(options.previewInElement)}else if(!previewWindow||previewWindow.closed){if(options.previewInWindow){previewWindow=window.open("","preview",options.previewInWindow);$(window).unload(function(){previewWindow.close()})}else{iFrame=$('<iframe class="markItUpPreviewFrame"></iframe>');if(options.previewPosition=="after"){iFrame.insertAfter(footer)}else{iFrame.insertBefore(header)}previewWindow=iFrame[iFrame.length-1].contentWindow||frame[iFrame.length-1]}}else if(altKey===true){if(iFrame){iFrame.remove()}else{previewWindow.close()}previewWindow=iFrame=false}if(!options.previewAutoRefresh){refreshPreview()}if(options.previewInWindow){previewWindow.focus()}}function refreshPreview(){renderPreview()}function renderPreview(){var phtml;if(options.previewHandler&&typeof options.previewHandler==="function"){options.previewHandler($$.val())}else if(options.previewParser&&typeof options.previewParser==="function"){var data=options.previewParser($$.val());writeInPreview(localize(data,1))}else if(options.previewParserPath!==""){$.ajax({type:options.previewParserAjaxType,dataType:"text",global:false,url:options.previewParserPath,data:options.previewParserVar+"="+encodeURIComponent($$.val()),success:function(data){writeInPreview(localize(data,1))}})}else{if(!template){$.ajax({url:options.previewTemplatePath,dataType:"text",global:false,success:function(data){writeInPreview(localize(data,1).replace(/<!-- content -->/g,$$.val()))}})}}return false}function writeInPreview(data){if(options.previewInElement){$(options.previewInElement).html(data)}else if(previewWindow&&previewWindow.document){try{sp=previewWindow.document.documentElement.scrollTop}catch(e){sp=0}previewWindow.document.open();previewWindow.document.write(data);previewWindow.document.close();previewWindow.document.documentElement.scrollTop=sp}}function keyPressed(e){shiftKey=e.shiftKey;altKey=e.altKey;ctrlKey=!(e.altKey&&e.ctrlKey)?e.ctrlKey||e.metaKey:false;if(e.type==="keydown"){if(ctrlKey===true){li=$('a[accesskey="'+(e.keyCode==13?"\\n":String.fromCharCode(e.keyCode))+'"]',header).parent("li");if(li.length!==0){ctrlKey=false;setTimeout(function(){li.triggerHandler("mouseup")},1);return false}}if(e.keyCode===13||e.keyCode===10){if(ctrlKey===true){ctrlKey=false;markup(options.onCtrlEnter);return options.onCtrlEnter.keepDefault}else if(shiftKey===true){shiftKey=false;markup(options.onShiftEnter);return options.onShiftEnter.keepDefault}else{markup(options.onEnter);return options.onEnter.keepDefault}}if(e.keyCode===9){if(shiftKey==true||ctrlKey==true||altKey==true){return false}if(caretOffset!==-1){get();caretOffset=$$.val().length-caretOffset;set(caretOffset,0);caretOffset=-1;return false}else{markup(options.onTab);return options.onTab.keepDefault}}}}function remove(){$$.unbind(".markItUp").removeClass("markItUpEditor");$$.parent("div").parent("div.markItUp").parent("div").replaceWith($$);var relativeRef=$$.parent("div").parent("div.markItUp").parent("div");if(relativeRef.length){relativeRef.replaceWith($$)}$$.data("markItUp",null)}init()})};$.fn.markItUpRemove=function(){return this.each(function(){$(this).markItUp("remove")})};$.markItUp=function(settings){var options={target:false};$.extend(options,settings);if(options.target){return $(options.target).each(function(){$(this).focus();$(this).trigger("insertion",[options])})}else{$("textarea").trigger("insertion",[options])}}})(jQuery);
\ No newline at end of file

From c014800bc5663cfe7fa4efa591e056ccdd707b5e Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Mon, 2 Jun 2014 13:07:56 +0200
Subject: [PATCH 50/60] Never use empty href in links #27 (ambroisemaupate)

---
 markitup/jquery.markitup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index ad4ef9b..281ee20 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -212,7 +212,7 @@
 						for (j = levels.length -1; j >= 0; j--) {
 							t += levels[j]+"-";
 						}
-						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
+						li = $('<li class="markItUpButton markItUpButton'+t+(i)+' '+(button.className||'')+'"><a href="#" '+key+' title="'+title+'">'+(button.name||'')+'</a></li>')
 						.bind("contextmenu.markItUp", function() { // prevent contextmenu on mac and allow ctrl+click
 							return false;
 						}).bind('click.markItUp', function(e) {

From c14c2a371836385eed4f500d5513c1a68ed53eaf Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Wed, 31 Dec 2014 18:00:07 +0100
Subject: [PATCH 51/60] Add dependencies to bower.json

---
 bower.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index b450009..81b2f49 100644
--- a/bower.json
+++ b/bower.json
@@ -9,5 +9,8 @@
     "test",
     "tests",
     "vendor"
-  ]
+  ],
+  "dependencies": {
+    "jquery": "^1.4.2"
+  }
 }

From d50480911be7626a0ea344a741acf04b8f2972e8 Mon Sep 17 00:00:00 2001
From: Liviu Cristian Mirea-Ghiban <contact@liviucmg.com>
Date: Thu, 22 Jan 2015 22:22:55 +0200
Subject: [PATCH 52/60] Mark as compatible with jQuery 2.x in bower.json

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 81b2f49..2a0d635 100644
--- a/bower.json
+++ b/bower.json
@@ -11,6 +11,6 @@
     "vendor"
   ],
   "dependencies": {
-    "jquery": "^1.4.2"
+    "jquery": ">=1.4.2 <3.0.0"
   }
 }

From c33f8374e0681182815a1762399e7642c7bc7c10 Mon Sep 17 00:00:00 2001
From: Markus Henn <brezelman@yahoo.de>
Date: Sat, 7 Feb 2015 01:11:54 +0100
Subject: [PATCH 53/60] previewParser can now be used in conjunction with
 previewHandler, previewParserPath or previewTeamplatePath

---
 markitup/jquery.markitup.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 281ee20..fc1ba1a 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -538,18 +538,19 @@
 
 			function renderPreview() {
 				var phtml;
+				var parsedData = $$.val();
+				if (options.previewParser && typeof options.previewParser === 'function') {
+					parsedData = options.previewParser(parsedData); 
+				}
 				if (options.previewHandler && typeof options.previewHandler === 'function') {
-					options.previewHandler( $$.val() );
-				} else if (options.previewParser && typeof options.previewParser === 'function') {
-					var data = options.previewParser( $$.val() );
-					writeInPreview(localize(data, 1) ); 
+					options.previewHandler(parsedData);
 				} else if (options.previewParserPath !== '') {
 					$.ajax({
 						type: options.previewParserAjaxType,
 						dataType: 'text',
 						global: false,
 						url: options.previewParserPath,
-						data: options.previewParserVar+'='+encodeURIComponent($$.val()),
+						data: options.previewParserVar+'='+encodeURIComponent(parsedData),
 						success: function(data) {
 							writeInPreview( localize(data, 1) ); 
 						}
@@ -561,7 +562,7 @@
 							dataType: 'text',
 							global: false,
 							success: function(data) {
-								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, $$.val()) );
+								writeInPreview( localize(data, 1).replace(/<!-- content -->/g, parsedData) );
 							}
 						});
 					}

From ba7aae2c520780a9f154a4a78c08fc1b242085d8 Mon Sep 17 00:00:00 2001
From: xorock <aaatoja@o2.pl>
Date: Tue, 27 Oct 2015 20:37:17 +0100
Subject: [PATCH 54/60] Update package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c14a5a1..c747721 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "markItUp! ",
   "title": "markItUp! universal markup jQuery editor",
   "description": "markItUp! is a JavaScript plugin built on the jQuery library. It allows you to turn any textarea into a markup editor. Html, Textile, Wiki Syntax, Markdown, BBcode or even your own Markup system can be easily implemented.",
-  "version": "1.1",
+  "version": "1.1.0",
   "homepage": "http://markitup.jaysalvat.com/",
   "author": {
     "name": "Jay Salvat",
@@ -24,4 +24,4 @@
     }
   ],
   "keywords": [ "jquery", "markup", "editor", "markdown", "wiki", "bbcode", "html", "textile" ]
-}
\ No newline at end of file
+}

From 0296d458c1dada9aee2c80e853267075a89e6015 Mon Sep 17 00:00:00 2001
From: Mark Sch <dereuromark@users.noreply.github.com>
Date: Sun, 21 Jan 2018 18:58:50 +0100
Subject: [PATCH 55/60] Support jquery 3

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 2a0d635..58de17d 100644
--- a/bower.json
+++ b/bower.json
@@ -11,6 +11,6 @@
     "vendor"
   ],
   "dependencies": {
-    "jquery": ">=1.4.2 <3.0.0"
+    "jquery": ">=1.4.2"
   }
 }

From 6a4f0fb24fb0f7448a0855feb6882575a370e324 Mon Sep 17 00:00:00 2001
From: Remi Caput <r.caput@criteo.com>
Date: Sat, 11 Aug 2018 16:53:15 +0200
Subject: [PATCH 56/60] Add missing "var" to avoid global namespace pollution.

---
 markitup/jquery.markitup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index fc1ba1a..4ea585c 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -60,7 +60,7 @@
 		// compute markItUp! path
 		if (!options.root) {
 			$('script').each(function(a, tag) {
-				miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
+				var miuScript = $(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);
 				if (miuScript !== null) {
 					options.root = miuScript[1];
 				}

From e147ca35557d5bae2d373eefb0dfa68c21736584 Mon Sep 17 00:00:00 2001
From: Jay Salvat <jay@jaysalvat.com>
Date: Thu, 16 Aug 2018 11:27:54 +0200
Subject: [PATCH 57/60] Create MIT-LICENSE

---
 MIT-LICENSE | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 MIT-LICENSE

diff --git a/MIT-LICENSE b/MIT-LICENSE
new file mode 100644
index 0000000..f0fd20a
--- /dev/null
+++ b/MIT-LICENSE
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From 1739f6cb0e80a0d44ff0ebfacc11f9f804a99c02 Mon Sep 17 00:00:00 2001
From: stonio <stonio@users.noreply.github.com>
Date: Sat, 18 Aug 2018 13:57:38 +0200
Subject: [PATCH 58/60] Fix Bower invalid-meta

---
 bower.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 58de17d..3a12468 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "markitup",
-  "version": "1.1.14",
-  "main": [ "markitup/jquery.markitup.js", "sets/*", "skins/*", "images/*" ],
+  "version": "1.1.15",
+  "main": [ "markitup/jquery.markitup.js" ],
   "ignore": [
     "markitup/templates/*",
     "node_modules",

From 4370e90f68fa70b18aa089283373c94be6b7ecdd Mon Sep 17 00:00:00 2001
From: Artur Weigandt <Art4@users.noreply.github.com>
Date: Tue, 21 Aug 2018 08:44:30 +0200
Subject: [PATCH 59/60] Updated CHANGELOG.md to "Keep a Changelog" format

---
 CHANGELOG.md | 227 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 190 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6d07c6..9e6276e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,81 +1,191 @@
-markItUp! 1.1.14
+# Changelog
+All notable changes to **markItUp!** will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
+
+## [Unreleased]
+
+### Changed
+
+- Changelog is now based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+
+### Fixed
+
+- Fixed invalid meta in bower.json
+
+## [1.1.15] - 2018-08-16
+
+### Added
+
+- Allow Custom tags to button name
+- Added HTTP method config for AJAX preview request
+- Added support for jQuery 2 and 3
+- Added MIT license
+- Added bower.json
+
+### Changed
+
+- markItUpRemove function is now idempotent 
+
+### Fixed
+
+- avoid global namespace pollution
+- Never use empty href in links
+
+## [1.1.14] - 2013-02-04
+
+### Changed
 
-CHANGE LOG
-markItUp! 1.1.14 2013-02-04
 - Compatibility patch for jQuery 1.9+
 - Click on menu bubbles up so it could be reused (michilehr)
+
+### Fixed
+
 - Fixed default selection after using a tag having either openBlockWith or closeBlockWith (r3c)
 
-markItUp! 1.1.13 2012-08-30
+## [1.1.13] - 2012-08-30
+
+### Added
+
 - Added ability to render preview in a DOM element (ytjohn & jaysalvat)
-- Fixed Ctrl+Enter syntax error (UltCombo)
 - Added the previewHandler option to allow complete control over preview (lecterror)
+- Added `$(elm).markItUp('insert', { })` and `$(elm).markItUp('remove');`
+- Added package.json
+
+### Changed
+
 - Updated events to use namespace (JoyceBabu)
-- Added $(elm).markItUp('insert', { }) and $(elm).markItUp('remove');
 - Updated the demo
-- Added package.json
 
-markItUp! 1.1.12 2011-08-11
-- Fixed the insertion on empty selection
+### Fixed
+
+- Fixed Ctrl+Enter syntax error (UltCombo)
+
+## [1.1.12] - 2011-08-11
+
+### Changed
+
 - Enhanced the trailing space management
 
-markItUp! 1.1.11 2011-07-19
+### Fixed
+
+- Fixed the insertion on empty selection
+
+## [1.1.11] - 2011-07-19
+
+### Added
+
 - Enabled parsing the markup in javascript (amroth)
 - Added multiline support (alevchuk)
-- Updated with jQuery 1.6.2
 - Added quotes to attribute selectors
-- Tried to fix the endless IE caret position bug
 - Added metakey support for Mac users (michal-krause)
 
-markItUp! 1.1.10 2011-02-20
+### Changed
+
+- Updated with jQuery 1.6.2
+
+### Fixed
+
+- Tried to fix the endless IE caret position bug
+
+## [1.1.10] - 2011-02-20
+
+### Changed
+
 - Improved: Ajax property 'dataType' set to 'text'
 - Improved: Ajax property 'global' set to 'false'
+
+### Fixed
+
 - Fixed: Ctrl+click selection problem
 
-markItUp! 1.1.9 2010-11-04
+## [1.1.9] - 2010-11-04
+
+### Changed
+
 - Improved: Selection accuracy in Internet Explorer
 - Improved: Replace focusin() by bind('focusin') to solve some backward compatibility issues (Nick B. C.)
 - Cosmetic: Add new logo
 - Cosmetic: Remove jQuery library and use CDN
 
-markItUp! 1.1.8 2010-08-27
+## [1.1.8] - 2010-08-27
+
+### Changed
+
 - Improved: Some skin PNG have been optimized (lukescammell)
-- Fixed: Opera 10 selection bug (Marius G.)
-- Fixed: Accessibility issue with the background default color in the default skin
 - Improved: Avoid giving the preview focus each time autorefresh kicks in. It still gets the focus when the preview button is pressed (DrSlump)
 - Improved: In pop-up mode the preview is closed when the page containing the editor is unloaded (DrSlump)
 - Improved: Press TAB jump right inside the textarea (Yakir)
 
-markItUp! 1.1.7 2010-04-06
+### Fixed
+
+- Fixed: Opera 10 selection bug (Marius G.)
+- Fixed: Accessibility issue with the background default color in the default skin
+
+## [1.1.7] - 2010-04-06
+
+### Fixed
+
 - Fixed: Empty lines are removed at insertion on Webkit
 - Fixed: Focus lost when shortcut is used on FF
 - Fixed: var missing before $$ in markItUpRemove()
 
-markItUp! 1.1.6 2010-01-12
+## 1.1.6.1 - 2010-03-02
+
+### Added
+
+- Git is used for versioning and tagging
+
+## 1.1.6 - 2010-01-12
+
+### Changed
+
 - Improved: Ajax requests are now asynchronous
+
+### Fixed
+
 - Fixed: Double empty line problem with preview and parsers
 - Fixed: IE8 now close the preview properly
 
-markItUp! 1.1.5 2009-05-01
+## 1.1.5 - 2009-05-01
+
+### Changed
+
 - Modified: http://drupal.org/project/wysiwyg compatibility
 - Modified: Alt/Ctrl/Alt+Tab are now disabled
 
-markItUp! 1.1.4 2008-12-03
+## 1.1.4 - 2008-12-03
+
+### Fixed
+
 - Fixed: Extra quote deleted line 95
 
-markItUp! 1.1.3 2008-09-12
+## 1.1.3 - 2008-09-12
+
+### Fixed
+
 - Fixed: IE7 preview problem
 
-markItUp! 1.1.2 2008-07-17
+## 1.1.2 - 2008-07-17
+
+### Fixed
+
 - Fixed: Quick fix for Opera 9.5 caret position problem after insertion
 
-markItUp! 1.1.1 2008-06-02
-- Fixed: Key events status are passed to callbacks properly
+## 1.1.1 - 2008-06-02
+
+### Changed
+
 - Improved: ScrollPosition is kept in the preview when its refreshed
 
-markItUp! 1.1.0 2008-05-04
-- Modified: Textarea's id is no more moved to the main container
-- Modified: NameSpace Span become a Div to remain strict
+### Fixed
+
+- Fixed: Key events status are passed to callbacks properly
+
+## 1.1.0 - 2008-05-04
+
+### Added
+
 - Added: Relative path to the script is computed
 - Added: Relative path to the script passed to callbacks
 - Added: Global instance ID property
@@ -83,14 +193,20 @@ markItUp! 1.1.0 2008-05-04
 - Added: Resize handle is now optional with resizeHandle property
 - Added: Property previewInWindow is added and accept window parameter
 - Added: Property previewPosition is added
+
+### Changed
+
+- Modified: Textarea's id is no more moved to the main container
+- Modified: NameSpace Span become a Div to remain strict
 - Modified: Resize handle is no more displayed in Safari to avoid repetition with the native handle
 - Modified: Property previewIframeRefresh become previewAutorefresh
 - Modified: Built-in Html Preview call a template file
 - Improved: Autorefreshing is now apply for preview in window too
 - Improved: Cancel button in prompt window cancel now the whole insertion process
 - Improved: Cleaner markItUp! code added to the DOM
-- Removed: Depreciated preview properties as previewBaseUrl, previewCharset, previewCssPath, previewBodyId, previewBodyClassName
-- Removed: Property previewIframe not longer exists
+
+### Fixed
+
 - Fixed: "Magic markups" works with line feeds
 - Fixed: Key events are initialized after insertion
 - Fixed: Internet Explorer line feed offset bug
@@ -99,19 +215,56 @@ markItUp! 1.1.0 2008-05-04
 - Fixed: Ctrl+click works and doesn't open the page in a new tab anymore
 - Fixed: Minor Css modifications
 
-markItUp! 1.0.3 2008-04-04
+### Removed
+
+- Removed: Depreciated preview properties as previewBaseUrl, previewCharset, previewCssPath, previewBodyId, previewBodyClassName
+- Removed: Property previewIframe not longer exists
+
+## 1.0.3 - 2008-04-04
+
+### Added
+
+- Added: Property scrollPosition is passed to callbacks functions
+
+### Fixed
+
 - Fixed: IE7 Preview empty baseurl problem
 - Fixed: IE7 external targeted insertion
-- Added: Property scrollPosition is passed to callbacks functions
 
-markItUp! 1.0.2 2008-03-31
+## 1.0.2 - 2008-03-31
+
+### Changed
+
+- Improved: Code minified
+
+### Fixed
+
 - Fixed: IE7 Html preview problems
 - Fixed: Selection is kept if nothing is inserted
-- Improved: Code minified
 
-markItUp! 1.0.1 2008-03-21
-- Removed: Global PlaceHolder
+## 1.0.1 - 2008-03-21
+
+### Changed
+
 - Modified: Property previewCharset is setted to "utf-8" by default
 
-markItUp! 1.0.0 2008-03-01
+### Removed
+
+- Removed: Global PlaceHolder
+
+## 1.0.0 - 2008-03-01
+
+### Added
+
 - First public release
+
+[Unreleased]: https://github.com/markitup/1.x/compare/1.1.15...HEAD
+[1.1.15]: https://github.com/markitup/1.x/compare/1.1.14...1.1.15
+[1.1.14]: https://github.com/markitup/1.x/compare/1.1.13...1.1.14
+[1.1.13]: https://github.com/markitup/1.x/compare/1.1.12...1.1.13
+[1.1.12]: https://github.com/markitup/1.x/compare/1.1.11...1.1.12
+[1.1.11]: https://github.com/markitup/1.x/compare/1.1.10...1.1.11
+[1.1.10]: https://github.com/markitup/1.x/compare/1.1.9...1.1.10
+[1.1.9]: https://github.com/markitup/1.x/compare/1.1.8...1.1.9
+[1.1.8]: https://github.com/markitup/1.x/compare/1.1.7...1.1.8
+[1.1.7]: https://github.com/markitup/1.x/compare/1.1.6.1...1.1.7

From 51f424f2d3e909090b317366ea031215673f945a Mon Sep 17 00:00:00 2001
From: Edouard Cunibil <edouard@happyculture.coop>
Date: Fri, 19 Oct 2018 17:15:40 +0200
Subject: [PATCH 60/60] Trigger an input event after inserting markup.

---
 markitup/jquery.markitup.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/markitup/jquery.markitup.js b/markitup/jquery.markitup.js
index 4ea585c..68d131d 100755
--- a/markitup/jquery.markitup.js
+++ b/markitup/jquery.markitup.js
@@ -419,6 +419,9 @@
 				if (previewWindow && options.previewAutoRefresh) {
 					refreshPreview(); 
 				}
+
+				// Triggers an input event to allow other scripts to react.
+				textarea.dispatchEvent(new Event('input'));
 																									
 				// reinit keyevent
 				shiftKey = altKey = ctrlKey = abort = false;