godmin-redactor 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1502d0bf0501d2055f37cdbe4a1a20f3632927
-  data.tar.gz: 36e8ea25f9c002f1ec99b6c1f39c41315344ee4f
+  metadata.gz: 746d8e6fbdef09a044815e075466dde6835d6f09
+  data.tar.gz: 1ead471ad25a0eb497ce86832af2ff0da436427c
 SHA512:
-  metadata.gz: 38acac7271672953f1ce61e524c45582266ec619ace9687d595852101216bc2a656d019ce1dde4176e9dea06cbbe597a71c8c7117005c966070ce1fea7da0cdd
-  data.tar.gz: c92b1453f907882ed23e6eef94522b0acea5313e6dd4515a366b1d42e26b1494e3ae41535715513ebecdf2674d0b25dfff53ae4403436af29b08aa3d12f47bfd
+  metadata.gz: 5379c58b111a937492e9a4faad39859f36d1b0c17013b7d0de970b0770604895674ef9dc3a204c84711c911eefd198a5954fb35e8327fdbc03488a48931b90c1
+  data.tar.gz: 6ef4c885723a269d439bb7af2f260e4794182e4299d66ba51fdd2ad5773d674f13af5063941f517376dc2d8b03befc1e861eb6e48976b44143c9148464d8e2df

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+### 1.0.2 - 2017-11-02
+Features
+- Update to [Redactor version 10.2.5](http://imperavi.com/redactor/log/)
+
+Issues
+- Fixes Redactor bug with Chrome 58 (https://github.com/varvet/godmin-redactor/pull/8)
+
+### 1.0.1 - 2016-03-10
+Issues
+- Multiple redactor boxes on same page (https://github.com/varvet/godmin-redactor/pull/6)
+
 ### 1.0.0 - 2016-02-01
 Features
 - Compatible with Godmin 1.0

data/lib/godmin/redactor/version.rb

@@ -1,5 +1,5 @@
 module Godmin
   module Redactor
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/vendor/assets/javascripts/redactor/redactor.js

@@ -1,6 +1,6 @@
 /*
-	Redactor v10.1.1
-	Updated: April 28, 2015
+	Redactor 10.2.5
+	Updated: October 1, 2015
 
 	http://imperavi.com/redactor/
 
@@ -12,6 +12,7 @@
 
 (function($)
 {
+
 	'use strict';
 
 	if (!Function.prototype.bind)
@@ -91,13 +92,13 @@
 
 	// Functionality
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '10.1.1';
+	$.Redactor.VERSION = '10.2.5';
 	$.Redactor.modules = ['alignment', 'autosave', 'block', 'buffer', 'build', 'button',
 						  'caret', 'clean', 'code', 'core', 'dropdown', 'file', 'focus',
 						  'image', 'indent', 'inline', 'insert', 'keydown', 'keyup',
-						  'lang', 'line', 'link', 'list', 'modal', 'observe', 'paragraphize',
+						  'lang', 'line', 'link', 'linkify', 'list', 'modal', 'observe', 'paragraphize',
 						  'paste', 'placeholder', 'progress', 'selection', 'shortcuts',
-						  'tabifier', 'tidy',  'toolbar', 'upload', 'utils', 'linkify'];
+						  'tabifier', 'tidy',  'toolbar', 'upload', 'utils'];
 
 	$.Redactor.opts = {
 
@@ -198,7 +199,8 @@
 
 		removeComments: false,
 		replaceTags: [
-			['strike', 'del']
+			['strike', 'del'],
+			['b', 'strong']
 		],
 		replaceStyles: [
             ['font-weight:\\s?bold', "strong"],
@@ -251,7 +253,10 @@
 		inlineTags: 		['strong', 'b', 'u', 'em', 'i', 'code', 'del', 'ins', 'samp', 'kbd', 'sup', 'sub', 'mark', 'var', 'cite', 'small'],
 		alignmentTags: 		['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6',  'DL', 'DT', 'DD', 'DIV', 'TD', 'BLOCKQUOTE', 'OUTPUT', 'FIGCAPTION', 'ADDRESS', 'SECTION', 'HEADER', 'FOOTER', 'ASIDE', 'ARTICLE'],
 		blockLevelElements: ['PRE', 'UL', 'OL', 'LI'],
-
+		highContrast: false,
+		observe: {
+			dropdowns: []
+		},
 
 		// lang
 		langs: {
@@ -327,7 +332,6 @@
 				filename: 'Name (optional)',
 				edit: 'Edit',
 				upload_label: 'Drop file here or '
-
 			}
 		},
 
@@ -349,6 +353,7 @@
 		keyCode: {
 			BACKSPACE: 8,
 			DELETE: 46,
+			UP: 38,
 			DOWN: 40,
 			ENTER: 13,
 			SPACE: 32,
@@ -450,7 +455,6 @@
 				this[module][methods[z]] = this[module][methods[z]].bind(this);
 			}
 		},
-
 		alignment: function()
 		{
 			return {
@@ -473,15 +477,18 @@
 				set: function(type)
 				{
 					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
-
-					this.buffer.set();
-					this.selection.save();
+					if (!this.utils.browser('msie') && !this.opts.linebreaks)
+					{
+						this.$editor.focus();
+					}
 
 					// get blocks
 					this.alignment.blocks = this.selection.getBlocks();
 					this.alignment.type = type;
 
+					this.buffer.set();
+					this.selection.save();
+
 					// set alignment
 					if (this.alignment.isLinebreaksOrNoBlocks())
 					{
@@ -558,10 +565,11 @@
 				},
 				load: function()
 				{
+					if (!this.opts.autosave) return;
+
 					this.autosave.source = this.code.get();
 
 					if (this.autosave.html === this.autosave.source) return;
-					//if (this.utils.isEmpty(this.autosave.source)) return;
 
 					// data
 					var data = {};
@@ -653,6 +661,23 @@
 					// focus
 					if (!this.utils.browser('msie')) this.$editor.focus();
 
+					var html = $.trim(this.$editor.html());
+					this.block.isEmpty = this.utils.isEmpty(html);
+
+					// FF focus
+					if (this.utils.browser('mozilla') && !this.focus.isFocused())
+					{
+						if (this.block.isEmpty)
+						{
+							var $first;
+							if (!this.opts.linebreaks)
+							{
+								$first = this.$editor.children().first();
+								this.caret.setEnd($first);
+							}
+						}
+					}
+
 					this.block.blocks = this.selection.getBlocks();
 
 					this.block.blocksSize = this.block.blocks.length;
@@ -666,10 +691,12 @@
 
 					this.selection.restore();
 					this.code.sync();
+					this.observe.load();
 
 				},
 				set: function(tag)
 				{
+
 					this.selection.get();
 					this.block.containerTag = this.range.commonAncestorContainer.tagName;
 
@@ -684,6 +711,15 @@
 				},
 				setCollapsed: function(tag)
 				{
+					if (this.opts.linebreaks && this.block.isEmpty && tag != 'p')
+					{
+						var node = document.createElement(tag);
+						this.$editor.html(node);
+						this.caret.setEnd(node);
+
+						return;
+					}
+
 					var block = this.block.blocks[0];
 					if (block === false) return;
 
@@ -698,7 +734,6 @@
 					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
 					if (isContainerTable && !this.opts.linebreaks)
 					{
-
 						document.execCommand('formatblock', false, '<' + tag + '>');
 
 						block = this.selection.getBlock();
@@ -709,7 +744,7 @@
 					{
 						if (this.opts.linebreaks && tag == 'p')
 						{
-							$(block).prepend('<br>').append('<br>');
+							$(block).append('<br>');
 							this.utils.replaceWithContents(block);
 						}
 						else
@@ -730,7 +765,7 @@
 						// blockquote off
 						if (this.opts.linebreaks)
 						{
-							$(block).prepend('<br>').append('<br>');
+							$(block).append('<br>');
 							this.utils.replaceWithContents(block);
 						}
 						else
@@ -744,15 +779,16 @@
 						this.block.toggle($(block));
 					}
 
+
 					if (typeof this.block.type == 'undefined' && typeof this.block.value == 'undefined')
 					{
 						$(block).removeAttr('class').removeAttr('style');
 					}
-
 				},
 				setMultiple: function(tag)
 				{
 					var block = this.block.blocks[0];
+
 					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
 
 					if (block !== false && this.block.blocksSize === 1)
@@ -762,7 +798,7 @@
 							// blockquote off
 							if (this.opts.linebreaks)
 							{
-								$(block).prepend('<br>').append('<br>');
+								$(block).append('<br>');
 								this.utils.replaceWithContents(block);
 							}
 							else
@@ -809,7 +845,6 @@
 					}
 					else
 					{
-
 						if (this.opts.linebreaks || tag != 'p')
 						{
 							if (tag == 'blockquote')
@@ -848,7 +883,6 @@
 
 							}
 
-
 							this.block.formatWrap(tag);
 						}
 						else
@@ -1011,11 +1045,6 @@
 
 					var $elements = $formatted.find(this.opts.blockLevelElements.join(',') + ', td, table, thead, tbody, tfoot, th, tr');
 
-					if ((this.opts.linebreaks && tag == 'p') || tag == 'pre' || tag == 'blockquote')
-					{
-						$elements.append('<br />');
-					}
-
 					$elements.contents().unwrap();
 
 					if (tag != 'p' && tag != 'blockquote') $formatted.find('img').remove();
@@ -1042,6 +1071,17 @@
 						this.utils.replaceWithContents($formatted);
 					}
 
+					if (this.opts.linebreaks)
+					{
+						var $next = $formatted.next().next();
+						if ($next.size() != 0 && $next[0].tagName === 'BR')
+						{
+							$next.remove();
+						}
+					}
+
+
+
 				},
 				formatTableWrapping: function($formatted)
 				{
@@ -1201,6 +1241,8 @@
 		build: function()
 		{
 			return {
+				focused: false,
+				blured: true,
 				run: function()
 				{
 					this.build.createContainerBox();
@@ -1215,7 +1257,7 @@
 				},
 				createContainerBox: function()
 				{
-					this.$box = $('<div class="redactor-box" />');
+					this.$box = $('<div class="redactor-box" role="application" />');
 				},
 				createTextarea: function()
 				{
@@ -1272,6 +1314,7 @@
 				callEditor: function()
 				{
 					this.build.disableMozillaEditing();
+					this.build.disableIeLinks();
 					this.build.setEvents();
 					this.build.setHelpers();
 
@@ -1311,7 +1354,8 @@
 				{
 					e.preventDefault();
 
-					if (!this.opts.dragImageUpload || !this.opts.dragFileUpload) return;
+					if (!this.opts.dragImageUpload && !this.opts.dragFileUpload) return;
+					if (this.opts.imageUpload === null && this.opts.fileUpload === null) return;
 
 					var files = e.dataTransfer.files;
 					this.upload.directUpload(files[0], e);
@@ -1325,6 +1369,12 @@
 				setEvents: function()
 				{
 					// drop
+					this.$editor.on('dragover.redactor dragenter.redactor', function(e)
+					{
+						e.preventDefault();
+						e.stopPropagation();
+				    });
+
 					this.$editor.on('drop.redactor', $.proxy(function(e)
 					{
 						e = e.originalEvent || e;
@@ -1383,30 +1433,50 @@
 					}
 
 					// focus
-					if ($.isFunction(this.opts.focusCallback))
+					this.$editor.on('focus.redactor', $.proxy(function(e)
 					{
-						this.$editor.on('focus.redactor', $.proxy(this.opts.focusCallback, this));
-					}
+						if ($.isFunction(this.opts.focusCallback))
+						{
+							this.core.setCallback('focus', e);
+						}
+
+						this.build.focused = true;
+						this.build.blured = false;
+
+						if (this.selection.getCurrent() === false)
+						{
+							this.selection.get();
+							this.range.setStart(this.$editor[0], 0);
+							this.range.setEnd(this.$editor[0], 0);
+							this.selection.addRange();
+						}
+
+
+					}, this));
 
-					var clickedElement;
-					$(document).on('mousedown', function(e) { clickedElement = e.target; });
 
 					// blur
-					this.$editor.on('blur.redactor', $.proxy(function(e)
+					$(document).on('mousedown.redactor-blur.' + this.uuid, $.proxy(function(e)
 					{
+						if (this.start) return;
 						if (this.rtePaste) return;
-						if (!this.build.isBlured(clickedElement)) return;
+
+						if ($(e.target).closest('.redactor-editor, .redactor-toolbar, .redactor-dropdown').size() !== 0)
+						{
+							return;
+						}
 
 						this.utils.disableSelectAll();
-						if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
+						if (!this.build.blured && $.isFunction(this.opts.blurCallback))
+						{
+							this.core.setCallback('blur', e);
+						}
+
+						this.build.focused = false;
+						this.build.blured = true;
 
 					}, this));
-				},
-				isBlured: function(clickedElement)
-				{
-					var $el = $(clickedElement);
 
-					return (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').length === 0);
 				},
 				setHelpers: function()
 				{
@@ -1427,21 +1497,17 @@
 				plugins: function()
 				{
 					if (!this.opts.plugins) return;
-					if (!RedactorPlugins) return;
 
 					$.each(this.opts.plugins, $.proxy(function(i, s)
 					{
-						if (typeof RedactorPlugins[s] === 'undefined') return;
+						var func = (typeof RedactorPlugins !== 'undefined' && typeof RedactorPlugins[s] !== 'undefined') ? RedactorPlugins : Redactor.fn;
 
-						if ($.inArray(s, $.Redactor.modules) !== -1)
+						if (!$.isFunction(func[s]))
 						{
-							$.error('Plugin name "' + s + '" matches the name of the Redactor\'s module.');
 							return;
 						}
 
-						if (!$.isFunction(RedactorPlugins[s])) return;
-
-						this[s] = RedactorPlugins[s]();
+						this[s] = func[s]();
 
 						// get methods
 						var methods = this.getModuleMethods(this[s]);
@@ -1453,7 +1519,10 @@
 							this[s][methods[z]] = this[s][methods[z]].bind(this);
 						}
 
-						if ($.isFunction(this[s].init)) this[s].init();
+						if ($.isFunction(this[s].init))
+						{
+							this[s].init();
+						}
 
 
 					}, this));
@@ -1468,6 +1537,13 @@
 						document.execCommand('enableObjectResizing', false, false);
 						document.execCommand('enableInlineTableEditing', false, false);
 					} catch (e) {}
+				},
+				disableIeLinks: function()
+				{
+					if (!this.utils.browser('msie')) return;
+
+					// IE prevent converting links
+					document.execCommand("AutoUrlDetect", false, false);
 				}
 			};
 		},
@@ -1476,7 +1552,7 @@
 			return {
 				build: function(btnName, btnObject)
 				{
-					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
+					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr({'role': 'button', 'aria-label': btnObject.title, 'tabindex': '-1'});
 
 					// click
 					if (btnObject.func || btnObject.command || btnObject.dropdown)
@@ -1487,6 +1563,8 @@
 					// dropdown
 					if (btnObject.dropdown)
 					{
+						$button.addClass('redactor-toolbar-link-dropdown').attr('aria-haspopup', true);
+
 						var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-' + this.uuid + ' redactor-dropdown-box-' + btnName + '" style="display: none;">');
 						$button.data('dropdown', $dropdown);
 						this.dropdown.build(btnName, $dropdown, btnObject.dropdown);
@@ -1526,20 +1604,24 @@
 				},
 				createTooltip: function($button, name, title)
 				{
-					var $tooltip = $('<span>').addClass('redactor-toolbar-tooltip redactor-toolbar-tooltip-' + name).hide().html(title);
+					var $tooltip = $('<span>').addClass('redactor-toolbar-tooltip redactor-toolbar-tooltip-' + this.uuid + ' redactor-toolbar-tooltip-' + name).hide().html(title);
 					$tooltip.appendTo('body');
 
 					$button.on('mouseover', function()
 					{
-						if ($(this).hasClass('redactor-button-disabled')) return;
+						if ($(this).hasClass('redactor-button-disabled'))
+						{
+							return;
+						}
 
 						var pos = $button.offset();
 
-						$tooltip.show();
 						$tooltip.css({
 							top: (pos.top + $button.innerHeight()) + 'px',
 							left: (pos.left + $button.innerWidth()/2 - $tooltip.innerWidth()/2) + 'px'
 						});
+						$tooltip.show();
+
 					});
 
 					$button.on('mouseout', function()
@@ -1554,6 +1636,8 @@
 
 					e.preventDefault();
 
+					$(document).find('.redactor-toolbar-tooltip').hide();
+
 					if (this.utils.browser('msie')) e.returnValue = false;
 
 					if (type == 'command') this.inline.format(callback);
@@ -1601,11 +1685,11 @@
 				},
 				setActiveInVisual: function()
 				{
-					this.$toolbar.find('a.re-icon').not('a.re-html').removeClass('redactor-button-disabled');
+					this.$toolbar.find('a.re-icon').not('a.re-html, a.re-fullscreen').removeClass('redactor-button-disabled');
 				},
 				setInactiveInCode: function()
 				{
-					this.$toolbar.find('a.re-icon').not('a.re-html').addClass('redactor-button-disabled');
+					this.$toolbar.find('a.re-icon').not('a.re-html, a.re-fullscreen').addClass('redactor-button-disabled');
 				},
 				changeIcon: function(key, classname)
 				{
@@ -1623,6 +1707,8 @@
 				},
 				addCallback: function($btn, callback)
 				{
+					if ($btn == "buffer") return;
+
 					var type = (callback == 'dropdown') ? 'dropdown' : 'func';
 					var key = $btn.attr('rel');
 					$btn.on('touchstart click', $.proxy(function(e)
@@ -1634,6 +1720,8 @@
 				},
 				addDropdown: function($btn, dropdown)
 				{
+					$btn.addClass('redactor-toolbar-link-dropdown').attr('aria-haspopup', true);
+
 					var key = $btn.attr('rel');
 					this.button.addCallback($btn, 'dropdown');
 
@@ -1649,6 +1737,8 @@
 				{
 					if (!this.opts.toolbar) return;
 
+					if (this.button.isMobileUndoRedo(key)) return "buffer";
+
 					var btn = this.button.build(key, { title: title });
 					btn.addClass('redactor-btn-image');
 
@@ -1660,6 +1750,8 @@
 				{
 					if (!this.opts.toolbar) return;
 
+					if (this.button.isMobileUndoRedo(key)) return "buffer";
+
 					var btn = this.button.build(key, { title: title });
 					btn.addClass('redactor-btn-image');
 					this.$toolbar.prepend($('<li>').append(btn));
@@ -1670,6 +1762,8 @@
 				{
 					if (!this.opts.toolbar) return;
 
+					if (this.button.isMobileUndoRedo(key)) return "buffer";
+
 					var btn = this.button.build(key, { title: title });
 					btn.addClass('redactor-btn-image');
 					var $btn = this.button.get(afterkey);
@@ -1683,6 +1777,8 @@
 				{
 					if (!this.opts.toolbar) return;
 
+					if (this.button.isMobileUndoRedo(key)) return "buffer";
+
 					var btn = this.button.build(key, { title: title });
 					btn.addClass('redactor-btn-image');
 					var $btn = this.button.get(beforekey);
@@ -1695,6 +1791,10 @@
 				remove: function(key)
 				{
 					this.button.get(key).remove();
+				},
+				isMobileUndoRedo: function(key)
+				{
+					return (key == "undo" || key == "redo") && !this.utils.isDesktop();
 				}
 			};
 		},
@@ -1718,7 +1818,14 @@
 				},
 				setEnd: function(node)
 				{
+					node = node[0] || node;
+					if (node.lastChild.nodeType == 1)
+					{
+						return this.caret.setAfter(node.lastChild);
+					}
+
 					this.caret.set(node, 1, node, 1);
+
 				},
 				set: function(orgn, orgo, focn, foco)
 				{
@@ -1912,7 +2019,7 @@
 					// replace special characters in links
 					html = html.replace(/<a href="(.*?[^>]?)®(.*?[^>]?)">/gi, '<a href="$1&reg$2">');
 
-					if (this.opts.replaceDivs) html = this.clean.replaceDivs(html);
+					if (this.opts.replaceDivs && !this.opts.linebreaks) html = this.clean.replaceDivs(html);
 					if (this.opts.linebreaks)  html = this.clean.replaceParagraphsToBr(html);
 
 					// save form tag
@@ -1933,10 +2040,11 @@
 
 						html = $div.html();
 					}
+
 					$div.remove();
 
 					// remove font tag
-					html = html.replace(/<font(.*?[^<])>/gi, '');
+					html = html.replace(/<font(.*?)>/gi, '');
 					html = html.replace(/<\/font>/gi, '');
 
 					// tidy html
@@ -1951,12 +2059,14 @@
 					// convert inline tags
 					html = this.clean.convertInline(html);
 
+					html = html.replace(/&amp;/g, '&');
+
 					return html;
 				},
 				onSync: function(html)
 				{
 					// remove spaces
-					html = html.replace(/[\u200B-\u200D\uFEFF]/g, '');
+					html = html.replace(/\u200B/g, '');
 					html = html.replace(/&#x200b;/gi, '');
 
 					if (this.opts.cleanSpaces)
@@ -1988,17 +2098,41 @@
 						html = html.replace(new RegExp(i, 'g'), s);
 					});
 
-					// remove br in the of li
+					// remove last br in FF
+					if (this.utils.browser('mozilla'))
+					{
+						html = html.replace(/<br\s?\/?>$/gi, '');
+					}
+
+					// remove br in|of li tags
 					html = html.replace(new RegExp('<br\\s?/?></li>', 'gi'), '</li>');
 					html = html.replace(new RegExp('</li><br\\s?/?>', 'gi'), '</li>');
+
+					// remove empty attributes
+					html = html.replace(/<(.*?)rel="\s*?"(.*?[^>]?)>/gi, '<$1$2">');
+					html = html.replace(/<(.*?)style="\s*?"(.*?[^>]?)>/gi, '<$1$2">');
+					html = html.replace(/="">/gi, '>');
+					html = html.replace(/""">/gi, '">');
+					html = html.replace(/"">/gi, '">');
+
 					// remove verified
-					html = html.replace(/<div(.*?[^>]) data-tagblock="redactor"(.*?[^>])>/gi, '<div$1$2>');
+					html = html.replace(/<div(.*?)data-tagblock="redactor"(.*?[^>])>/gi, '<div$1$2>');
 					html = html.replace(/<(.*?) data-verified="redactor"(.*?[^>])>/gi, '<$1$2>');
-					html = html.replace(/<span(.*?[^>])\srel="(.*?[^>])"(.*?[^>])>/gi, '<span$1$3>');
-					html = html.replace(/<img(.*?[^>])\srel="(.*?[^>])"(.*?[^>])>/gi, '<img$1$3>');
-					html = html.replace(/<img(.*?[^>])\sstyle="" (.*?[^>])>'/gi, '<img$1 $2>');
-					html = html.replace(/<img(.*?[^>])\sstyle (.*?[^>])>'/gi, '<img$1 $2>');
+
+					var $div = $("<div/>").html($.parseHTML(html, document, true));
+					$div.find("span").removeAttr("rel");
+
+					$div.find('pre .redactor-invisible-space').each(function()
+					{
+						$(this).contents().unwrap();
+					});
+
+					html = $div.html();
+
+					// remove rel attribute from img
+					html = html.replace(/<img(.*?[^>])rel="(.*?[^>])"(.*?[^>])>/gi, '<img$1$3>');
 					html = html.replace(/<span class="redactor-invisible-space">(.*?)<\/span>/gi, '$1');
+
 					html = html.replace(/ data-save-url="(.*?[^>])"/gi, '');
 
 					// remove image resize
@@ -2007,7 +2141,7 @@
 					html = html.replace(/<span(.*?)id="redactor-image-editter"(.*?[^>])>(.*?)<\/span>/gi, '');
 
 					// remove font tag
-					html = html.replace(/<font(.*?[^<])>/gi, '');
+					html = html.replace(/<font(.*?)>/gi, '');
 					html = html.replace(/<\/font>/gi, '');
 
 					// tidy html
@@ -2025,16 +2159,17 @@
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor"(.*?[^>])>', 'gi'), '<$1$2>');
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor">', 'gi'), '<$1>');
 
+					html = html.replace(/&amp;/g, '&');
+
 					return html;
 				},
 				onPaste: function(html, setMode)
 				{
 					html = $.trim(html);
-
 					html = html.replace(/\$/g, '&#36;');
 
 					// convert dirty spaces
-					html = html.replace(/<span class="s1">/gi, '<span>');
+					html = html.replace(/<span class="s[0-9]">/gi, '<span>');
 					html = html.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi, ' ');
 					html = html.replace(/<span class="Apple-tab-span"[^>]*>\t<\/span>/gi, '\t');
 					html = html.replace(/<span[^>]*>(\s|&nbsp;)<\/span>/gi, ' ');
@@ -2136,20 +2271,108 @@
 					// style
 					html = html.replace(/<style[^>]*>[\s\S]*?<\/style>/gi, '');
 
-					if (/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(html))
+					// op
+					html = html.replace(/<o\:p[^>]*>[\s\S]*?<\/o\:p>/gi, '');
+
+					if (html.match(/class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i))
 					{
+						// comments
+						html = html.replace(/<!--[\s\S]+?-->/gi, '');
+
+						// scripts
+						html = html.replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi, '');
+
+						// Convert <s> into <strike>
+						html = html.replace(/<(\/?)s>/gi, "<$1strike>");
+
+						// Replace nbsp entites to char since it's easier to handle
+						html = html.replace(/ /gi, ' ');
+
+						// Convert <span style="mso-spacerun:yes">___</span> to string of alternating
+						// breaking/non-breaking spaces of same length
+						html = html.replace(/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi, function(str, spaces) {
+							return (spaces.length > 0) ? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : '';
+						});
+
 						html = this.clean.onPasteIeFixLinks(html);
 
 						// shapes
 						html = html.replace(/<img(.*?)v:shapes=(.*?)>/gi, '');
 						html = html.replace(/src="file\:\/\/(.*?)"/, 'src=""');
 
-						// list
-						html = html.replace(/<p(.*?)class="MsoListParagraphCxSpFirst"([\w\W]*?)<\/p>/gi, '<ul><li$2</li>');
-						html = html.replace(/<p(.*?)class="MsoListParagraphCxSpMiddle"([\w\W]*?)<\/p>/gi, '<li$2</li>');
-						html = html.replace(/<p(.*?)class="MsoListParagraphCxSpLast"([\w\W]*?)<\/p>/gi, '<li$2</li></ul>');
-						// one line
-						html = html.replace(/<p(.*?)class="MsoListParagraph"([\w\W]*?)<\/p>/gi, '<ul><li$2</li></ul>');
+						// lists
+						var $div = $("<div/>").html(html);
+
+						var lastList = false;
+						var lastLevel = 1;
+						var listsIds = [];
+
+						$div.find("p[style]").each(function()
+						{
+							var matches = $(this).attr('style').match(/mso\-list\:l([0-9]+)\slevel([0-9]+)/);
+
+							if (matches)
+							{
+								var currentList = parseInt(matches[1]);
+								var currentLevel = parseInt(matches[2]);
+								var listType = $(this).html().match(/^[\w]+\./) ? "ol" : "ul";
+
+								var $li = $("<li/>").html($(this).html());
+
+								$li.html($li.html().replace(/^([\w\.]+)</, '<'));
+								$li.find("span:first").remove();
+
+								if (currentLevel == 1 && $.inArray(currentList, listsIds) == -1)
+								{
+									var $list = $("<" + listType + "/>").attr({"data-level": currentLevel,
+																			   "data-list": currentList})
+																	  .html($li);
+
+									$(this).replaceWith($list);
+
+									lastList = currentList;
+									listsIds.push(currentList);
+								}
+								else
+								{
+									if (currentLevel > lastLevel)
+									{
+										var $prevList = $div.find('[data-level="' + lastLevel + '"][data-list="' + lastList + '"]');
+
+										var $lastList = $prevList;
+
+										for(var i = lastLevel; i < currentLevel; i++)
+										{
+											$list = $("<" + listType + "/>");
+
+											$list.appendTo($lastList.find("li").last());
+
+											$lastList = $list;
+										}
+
+										$lastList.attr({"data-level": currentLevel,
+														"data-list": currentList})
+												 .html($li);
+
+									}
+									else
+									{
+										var $prevList = $div.find('[data-level="' + currentLevel + '"][data-list="' + currentList + '"]').last();
+
+										$prevList.append($li);
+									}
+
+									lastLevel = currentLevel;
+									lastList = currentList;
+
+									$(this).remove();
+								}
+							}
+						});
+
+						$div.find('[data-level][data-list]').removeAttr('data-level data-list');
+						html = $div.html();
+
 						// remove ms word's bullet
 						html = html.replace(/·/g, '');
 						html = html.replace(/<p class="Mso(.*?)"/gi, '<p');
@@ -2168,12 +2391,6 @@
 						html = html.replace(/<p>\n?<li>/gi, '<li>');
 					}
 
-					// remove nbsp
-					if (this.opts.cleanSpaces)
-					{
-						html = html.replace(/(\s|&nbsp;)+/g, ' ');
-					}
-
 					return html;
 				},
 				onPasteExtra: function(html)
@@ -2321,8 +2538,8 @@
 						if (!matchBlocks && (matchContainers === null || (matchContainers && matchContainers.length <= 1)))
 						{
 							var matchBR = html.match(/<br\s?\/?>/gi);
-							var matchIMG = html.match(/<img(.*?[^>])>/gi);
-							if (!matchBR && !matchIMG)
+							//var matchIMG = html.match(/<img(.*?[^>])>/gi);
+							if (!matchBR)
 							{
 								this.clean.singleLine = true;
 								html = html.replace(/<\/?(p|div)(.*?)>/gi, '');
@@ -2346,11 +2563,14 @@
 					html = this.clean.savePreFormatting(html);
 					html = this.clean.saveCodeFormatting(html);
 
+					html = this.clean.restoreSelectionMarker(html);
+
 					return html;
 				},
 				savePreFormatting: function(html)
 				{
 					var pre = html.match(/<pre(.*?)>([\w\W]*?)<\/pre>/gi);
+
 					if (pre !== null)
 					{
 						$.each(pre, $.proxy(function(i,s)
@@ -2379,26 +2599,30 @@
 				},
 				saveCodeFormatting: function(html)
 				{
-					var code = html.match(/<code(.*?[^>])>(.*?)<\/code>/gi);
+					var code = html.match(/<code(.*?)>([\w\W]*?)<\/code>/gi);
+
 					if (code !== null)
 					{
 						$.each(code, $.proxy(function(i,s)
 						{
-							var arr = s.match(/<code(.*?[^>])>(.*?)<\/code>/i);
+							var arr = s.match(/<code(.*?)>([\w\W]*?)<\/code>/i);
 
 							arr[2] = arr[2].replace(/&nbsp;/g, ' ');
 							arr[2] = this.clean.encodeEntities(arr[2]);
-
-							// $ fix
 							arr[2] = arr[2].replace(/\$/g, '&#36;');
 
 							html = html.replace(s, '<code' + arr[1] + '>' + arr[2] + '</code>');
-
 						}, this));
 					}
 
 					return html;
 				},
+				restoreSelectionMarker: function(html)
+				{
+					html = html.replace(/&lt;span id=&quot;selection-marker-([0-9])&quot; class=&quot;redactor-selection-marker&quot; data-verified=&quot;redactor&quot;&gt;​&lt;\/span&gt;/g, '<span id="selection-marker-$1" class="redactor-selection-marker" data-verified="redactor">​</span>');
+
+					return html;
+				},
 				getTextFromHtml: function(html)
 				{
 					html = html.replace(/<br\s?\/?>|<\/H[1-6]>|<\/p>|<\/div>|<\/li>|<\/td>/gi, '\n');
@@ -2412,6 +2636,8 @@
 				getPlainText: function(html, paragraphize)
 				{
 					html = this.clean.getTextFromHtml(html);
+					html = html.replace(/\n\s*\n/g, "\n");
+					html = html.replace(/\n\n/g, "\n");
 					html = html.replace(/\n/g, '<br />');
 
 					if (this.opts.paragraphize && typeof paragraphize == 'undefined' && !this.utils.browser('mozilla'))
@@ -2505,12 +2731,7 @@
 				},
 				cleanEmptyParagraph: function()
 				{
-					var p = this.$editor.find("p").first();
 
-					if (this.utils.isEmpty(p.html()))
-					{
-						p.remove();
-					}
 				},
 				setVerified: function(html)
 				{
@@ -2585,7 +2806,7 @@
 					html = html.replace(/[\s\n]*$/g, ' ');
 					html = html.replace( />\s{2,}</g, '> <'); // between inline tags can be only one space
 					html = html.replace(/\n\n/g, "\n");
-					html = html.replace(/[\u200B-\u200D\uFEFF]/g, '');
+					html = html.replace(/\u200B/g, '');
 
 					return html;
 				},
@@ -2643,6 +2864,12 @@
 					// clean
 					html = this.clean.onSet(html);
 
+
+					if (this.utils.browser('msie'))
+					{
+						html = html.replace(/<span(.*?)id="selection-marker-(1|2)"(.*?)><\/span>/gi, '');
+					}
+
 					this.$editor.html(html);
 					this.code.sync();
 
@@ -2656,6 +2883,9 @@
 				{
 					var code = this.$textarea.val();
 
+					if (this.opts.replaceDivs) code = this.clean.replaceDivs(code);
+					if (this.opts.linebreaks) code = this.clean.replaceParagraphsToBr(code);
+
 					// indent code
 					code = this.tabifier.get(code);
 
@@ -2670,7 +2900,7 @@
 					var html = this.$editor.html();
 
 					// is there a need to synchronize
-					if (this.code.syncCode && this.code.syncCode == html)
+					if (this.code.syncCode && this.code.syncCode == html || (this.start && html == '' ))
 					{
 						// do not sync
 						return;
@@ -2728,6 +2958,8 @@
 				},
 				showCode: function()
 				{
+					this.selection.save();
+
 					this.code.offset = this.caret.getOffset();
 					var scroll = $(window).scrollTop();
 
@@ -2737,11 +2969,34 @@
 					this.$editor.hide();
 
 					var html = this.$textarea.val();
+
 					this.modified = this.clean.removeSpaces(html);
 
 					// indent code
 					html = this.tabifier.get(html);
 
+					// caret position sync
+					var start = 0, end = 0;
+					var $editorDiv = $("<div/>").append($.parseHTML(this.clean.onSync(this.$editor.html()), document, true));
+					var $selectionMarkers = $editorDiv.find("span.redactor-selection-marker");
+
+					if ($selectionMarkers.length > 0)
+					{
+						var editorHtml = this.tabifier.get($editorDiv.html()).replace(/&amp;/g, '&');
+
+						if ($selectionMarkers.length == 1)
+						{
+							start = this.utils.strpos(editorHtml, $editorDiv.find("#selection-marker-1").prop("outerHTML"));
+							end   = start;
+						}
+						else if ($selectionMarkers.length == 2)
+						{
+							start = this.utils.strpos(editorHtml, $editorDiv.find("#selection-marker-1").prop("outerHTML"));
+							end	 = this.utils.strpos(editorHtml, $editorDiv.find("#selection-marker-2").prop("outerHTML")) - $editorDiv.find("#selection-marker-1").prop("outerHTML").toString().length;
+						}
+					}
+
+					this.selection.removeMarkers();
 					this.$textarea.val(html);
 
 					if (this.opts.codemirror)
@@ -2750,8 +3005,21 @@
 						{
 							$(el).show();
 							el.CodeMirror.setValue(html);
-							el.CodeMirror.setSize(width, height);
+							el.CodeMirror.setSize('100%', height);
 							el.CodeMirror.refresh();
+
+							if (start == end)
+							{
+								el.CodeMirror.setCursor(el.CodeMirror.posFromIndex(start).line, el.CodeMirror.posFromIndex(end).ch);
+							}
+							else
+							{
+								el.CodeMirror.setSelection({line: el.CodeMirror.posFromIndex(start).line,
+															ch: el.CodeMirror.posFromIndex(start).ch},
+														  {line: el.CodeMirror.posFromIndex(end).line,
+														   ch:  el.CodeMirror.posFromIndex(end).ch});
+							}
+
 							el.CodeMirror.focus();
 						});
 					}
@@ -2764,7 +3032,7 @@
 
 						if (this.$textarea[0].setSelectionRange)
 						{
-							this.$textarea[0].setSelectionRange(0, 0);
+							this.$textarea[0].setSelectionRange(start, end);
 						}
 
 						this.$textarea[0].scrollTop = 0;
@@ -2782,21 +3050,58 @@
 
 					if (this.opts.visual) return;
 
+					var start = 0, end = 0;
+
 					if (this.opts.codemirror)
 					{
+						var selection;
+
 						this.$textarea.next('.CodeMirror').each(function(i, el)
 						{
+							selection = el.CodeMirror.listSelections();
+
+							start = el.CodeMirror.indexFromPos(selection[0].anchor);
+							end = el.CodeMirror.indexFromPos(selection[0].head);
+
 							html = el.CodeMirror.getValue();
 						});
 					}
 					else
 					{
+						start = this.$textarea.get(0).selectionStart;
+						end = this.$textarea.get(0).selectionEnd;
+
 						html = this.$textarea.hide().val();
 					}
 
+					// if selection starts from end
+					if (start > end && end > 0)
+					{
+						var tempStart = end;
+						var tempEnd = start;
+
+						start = tempStart;
+						end = tempEnd;
+					}
+
+					start = this.code.enlargeOffset(html, start);
+					end = this.code.enlargeOffset(html, end);
+
+					html = html.substr(0, start) + this.selection.getMarkerAsHtml(1) + html.substr(start);
+
+					if (end > start)
+					{
+						var markerLength = this.selection.getMarkerAsHtml(1).toString().length;
+
+						html = html.substr(0, end + markerLength) + this.selection.getMarkerAsHtml(2) + html.substr(end + markerLength);
+					}
+
+
+
 					if (this.modified !== this.clean.removeSpaces(html))
 					{
 						this.code.set(html);
+
 					}
 
 					if (this.opts.codemirror)
@@ -2811,13 +3116,12 @@
 						this.placeholder.remove();
 					}
 
-					this.caret.setOffset(this.code.offset);
+					this.selection.restore();
 
 					this.$textarea.off('keydown.redactor-textarea-indenting');
 
 					this.button.setActiveInVisual();
 					this.button.setInactive('html');
-
 					this.observe.load();
 					this.opts.visual = true;
 					this.core.setCallback('visual', html);
@@ -2832,6 +3136,35 @@
 					$el.get(0).selectionStart = $el.get(0).selectionEnd = start + 1;
 
 					return false;
+				},
+				enlargeOffset: function(html, offset)
+				{
+					var htmlLength = html.length;
+					var c = 0;
+
+					if (html[offset] == '>')
+					{
+						c++;
+					}
+					else
+					{
+						for(var i = offset; i <= htmlLength; i++)
+						{
+							c++;
+
+							if (html[i] == '>')
+							{
+								break;
+							}
+							else if (html[i] == '<' || i == htmlLength)
+							{
+								c = 0;
+								break;
+							}
+						}
+					}
+
+					return offset + c;
 				}
 			};
 		},
@@ -2872,24 +3205,52 @@
 				},
 				setCallback: function(type, e, data)
 				{
-					var callback = this.opts[type + 'Callback'];
-					if ($.isFunction(callback))
-					{
-						return (typeof data == 'undefined') ? callback.call(this, e) : callback.call(this, e, data);
-					}
-					else
+					var eventName = type + 'Callback';
+					var eventNamespace = 'redactor';
+					var callback = this.opts[eventName];
+
+					if (this.$textarea)
 					{
-						return (typeof data == 'undefined') ? e : data;
-					}
-				},
-				destroy: function()
-				{
+						var returnValue = false;
+						var events = $._data(this.$textarea[0], 'events');
+
+						if (typeof events != 'undefined' && typeof events[eventName] != 'undefined')
+						{
+							$.each(events[eventName], $.proxy(function(key, value)
+							{
+								if (value['namespace'] == eventNamespace)
+								{
+									var data = (typeof data == 'undefined') ? [e] : [e, data];
+
+									returnValue = (typeof data == 'undefined') ? value.handler.call(this, e) : value.handler.call(this, e, data);
+								}
+							}, this));
+						}
+
+						if (returnValue) return returnValue;
+					}
+
+					if ($.isFunction(callback))
+					{
+						return (typeof data == 'undefined') ? callback.call(this, e) : callback.call(this, e, data);
+					}
+					else
+					{
+						return (typeof data == 'undefined') ? e : data;
+					}
+				},
+				destroy: function()
+				{
+					this.opts.destroyed = true;
+
 					this.core.setCallback('destroy');
 
 					// off events and remove data
 					this.$element.off('.redactor').removeData('redactor');
 					this.$editor.off('.redactor');
 
+					$(document).off('mousedown.redactor-blur.' + this.uuid);
+					$(document).off('mousedown.redactor.' + this.uuid);
 					$(document).off('click.redactor-image-delete.' + this.uuid);
 					$(document).off('click.redactor-image-resize-hide.' + this.uuid);
 					$(document).off('touchstart.redactor.' + this.uuid + ' click.redactor.' + this.uuid);
@@ -2902,17 +3263,19 @@
 
 					var html = this.code.get();
 
-					// dropdowns off
-					this.$toolbar.find('a').each(function()
+					if (this.opts.toolbar)
 					{
-						var $el = $(this);
-						if ($el.data('dropdown'))
+						// dropdowns off
+						this.$toolbar.find('a').each(function()
 						{
-							$el.data('dropdown').remove();
-							$el.data('dropdown', {});
-						}
-					});
-
+							var $el = $(this);
+							if ($el.data('dropdown'))
+							{
+								$el.data('dropdown').remove();
+								$el.data('dropdown', {});
+							}
+						});
+					}
 
 					if (this.build.isTextarea())
 					{
@@ -2935,11 +3298,10 @@
 					if (this.$modalOverlay) this.$modalOverlay.remove();
 
 					// buttons tooltip
-					$('.redactor-toolbar-tooltip').remove();
+					$('.redactor-toolbar-tooltip-' + this.uuid).remove();
 
 					// autosave
 					clearInterval(this.autosaveInterval);
-
 				}
 			};
 		},
@@ -2988,12 +3350,11 @@
 							};
 
 						}, this));
-
 					}
 
 					$.each(dropdownObject, $.proxy(function(btnName, btnObject)
 					{
-						var $item = $('<a href="#" class="redactor-dropdown-' + btnName + '">' + btnObject.title + '</a>');
+						var $item = $('<a href="#" class="redactor-dropdown-' + btnName + '" role="button">' + btnObject.title + '</a>');
 						if (name == 'formatting') $item.addClass('redactor-formatting-' + btnName);
 
 						$item.on('click', $.proxy(function(e)
@@ -3013,11 +3374,15 @@
 								callback = btnObject.dropdown;
 							}
 
+							if ($(e.target).hasClass('redactor-dropdown-link-inactive')) return;
+
 							this.button.onClick(e, btnName, type, callback);
 							this.dropdown.hideAll();
 
 						}, this));
 
+						this.observe.addDropdown($item, btnName, btnObject);
+
 						$dropdown.append($item);
 
 					}, this));
@@ -3035,10 +3400,9 @@
 					// Always re-append it to the end of <body> so it always has the highest sub-z-index.
 					var $dropdown = $button.data('dropdown').appendTo(document.body);
 
-					// ios keyboard hide
-					if (this.utils.isMobile() && !this.utils.browser('msie'))
+					if (this.opts.highContrast)
 					{
-						document.activeElement.blur();
+						$dropdown.addClass("redactor-dropdown-contrast");
 					}
 
 					if ($button.hasClass('dropact'))
@@ -3048,6 +3412,8 @@
 					else
 					{
 						this.dropdown.hideAll();
+						this.observe.dropdowns();
+
 						this.core.setCallback('dropdownShow', { dropdown: $dropdown, key: key, button: $button });
 
 						this.button.setActive(key);
@@ -3084,45 +3450,57 @@
 						}
 
 						this.core.setCallback('dropdownShown', { dropdown: $dropdown, key: key, button: $button });
-					}
-
-					$(document).one('click', $.proxy(this.dropdown.hide, this));
-					this.$editor.one('click', $.proxy(this.dropdown.hide, this));
-
-					// disable scroll whan dropdown scroll
-					var $body = $(document.body);
-					var width = $body.width();
 
-					$dropdown.on('mouseover', function() {
-
-						$body.addClass('body-redactor-hidden');
-						$body.css('margin-right', ($body.width() - width) + 'px');
-
-					 });
-
-					$dropdown.on('mouseout', function() {
+						this.$dropdown = $dropdown;
+					}
 
-						$body.removeClass('body-redactor-hidden').css('margin-right', 0);
 
-					});
+					$(document).one('click.redactor-dropdown', $.proxy(this.dropdown.hide, this));
+					this.$editor.one('click.redactor-dropdown', $.proxy(this.dropdown.hide, this));
+					$(document).one('keyup.redactor-dropdown', $.proxy(this.dropdown.closeHandler, this));
 
+					// disable scroll whan dropdown scroll
+					$dropdown.on('mouseover.redactor-dropdown', $.proxy(this.utils.disableBodyScroll, this)).on('mouseout.redactor-dropdown', $.proxy(this.utils.enableBodyScroll, this));
 
 					e.stopPropagation();
 				},
+				closeHandler: function(e)
+				{
+					if (e.which != this.keyCode.ESC) return;
+
+					this.dropdown.hideAll();
+					this.$editor.focus();
+				},
 				hideAll: function()
 				{
 					this.$toolbar.find('a.dropact').removeClass('redactor-act').removeClass('dropact');
 
-					$(document.body).removeClass('body-redactor-hidden').css('margin-right', 0);
+					this.utils.enableBodyScroll();
+
 					$('.redactor-dropdown-' + this.uuid).hide();
-					this.core.setCallback('dropdownHide');
+					$('.redactor-dropdown-link-selected').removeClass('redactor-dropdown-link-selected');
+
+
+					if (this.$dropdown)
+					{
+						this.$dropdown.off('.redactor-dropdown');
+						this.core.setCallback('dropdownHide', this.$dropdown);
+
+						this.$dropdown = false;
+					}
 				},
 				hide: function (e)
 				{
 					var $dropdown = $(e.target);
-					if (!$dropdown.hasClass('dropact'))
+
+					if (!$dropdown.hasClass('dropact') && !$dropdown.hasClass('redactor-dropdown-link-inactive'))
 					{
-						$dropdown.removeClass('dropact');
+						if ($dropdown.hasClass('redactor-dropdown'))
+						{
+							$dropdown.removeClass('dropact');
+							$dropdown.off('mouseover mouseout');
+						}
+
 						this.dropdown.hideAll();
 					}
 				}
@@ -3240,36 +3618,31 @@
 				},
 				setEnd: function()
 				{
-					if (this.utils.browser('mozilla') || this.utils.browser('msie'))
+					var last = this.$editor.children().last();
+					this.$editor.focus();
+
+					if (last.size() === 0) return;
+					if (this.utils.isEmpty(this.$editor.html()))
 					{
-						var last = this.$editor.children().last();
 
-						this.$editor.focus();
-						this.caret.setEnd(last);
+						this.selection.get();
+						this.range.collapse(true);
+						this.range.setStartAfter(last[0]);
+						this.range.setEnd(last[0], 0);
+						this.selection.addRange();
 					}
 					else
 					{
 						this.selection.get();
+						this.range.selectNodeContents(last[0]);
+						this.range.collapse(false);
+						this.selection.addRange();
 
-						try {
-							this.range.selectNodeContents(this.$editor[0]);
-							this.range.collapse(false);
-
-							this.selection.addRange();
-						}
-						catch (e) {}
 					}
-
 				},
 				isFocused: function()
 				{
-					var focusNode = document.getSelection().focusNode;
-					if (focusNode === null) return false;
-
-					if (this.opts.linebreaks && $(focusNode.parentNode).hasClass('redactor-linebreaks')) return true;
-					else if (!this.utils.isRedactorParent(focusNode.parentNode)) return false;
-
-					return this.$editor.is(':focus');
+					return this.$editor[0] === document.activeElement;
 				}
 			};
 		},
@@ -3307,6 +3680,9 @@
 
 					}, this));
 
+					// hide link's tooltip
+					$('.redactor-link-tooltip').remove();
+
 					$('#redactor-image-title').val($image.attr('alt'));
 
 					if (!this.opts.imageLink) $('.redactor-image-link-option').hide();
@@ -3330,6 +3706,7 @@
 					}
 
 					this.modal.show();
+					$('#redactor-image-title').focus();
 
 				},
 				setFloating: function($image)
@@ -3366,12 +3743,14 @@
 
 					var $link = $image.closest('a', this.$editor[0]);
 
-					$image.attr('alt', $('#redactor-image-title').val());
+					var title = $('#redactor-image-title').val().replace(/(<([^>]+)>)/ig,"");
+					$image.attr('alt', title);
 
 					this.image.setFloating($image);
 
 					// as link
 					var link = $.trim($('#redactor-image-link').val());
+					var link = link.replace(/(<([^>]+)>)/ig,"");
 					if (link !== '')
 					{
 						// test url (add protocol)
@@ -3425,17 +3804,14 @@
 						$image.on('dragstart', $.proxy(this.image.onDrag, this));
 					}
 
-					$image.on('mousedown', $.proxy(this.image.hideResize, this));
-					$image.on('click.redactor touchstart', $.proxy(function(e)
+					var handler = $.proxy(function(e)
 					{
-						this.observe.image = $image;
 
-						if (this.$editor.find('#redactor-image-box').length !== 0) return false;
+						this.observe.image = $image;
 
 						this.image.resizer = this.image.loadEditableControls($image);
 
-						$(document).on('click.redactor-image-resize-hide.' + this.uuid, $.proxy(this.image.hideResize, this));
-						this.$editor.on('click.redactor-image-resize-hide.' + this.uuid, $.proxy(this.image.hideResize, this));
+						$(document).on('mousedown.redactor-image-resize-hide.' + this.uuid, $.proxy(this.image.hideResize, this));
 
 						// resize
 						if (!this.opts.imageResizable) return;
@@ -3445,8 +3821,11 @@
 							this.image.setResizable(e, $image);
 						}, this));
 
+					}, this);
 
-					}, this));
+
+					$image.off('mousedown.redactor').on('mousedown.redactor', $.proxy(this.image.hideResize, this));
+					$image.off('click.redactor touchstart.redactor').on('click.redactor touchstart.redactor', handler);
 				},
 				setResizable: function(e, $image)
 				{
@@ -3550,12 +3929,8 @@
 					var imageBox = this.$editor.find('#redactor-image-box');
 					if (imageBox.length === 0) return;
 
-					if (this.opts.imageEditable)
-					{
-						this.image.editter.remove();
-					}
-
-					$(this.image.resizer).remove();
+					$('#redactor-image-editter').remove();
+					$('#redactor-image-resizer').remove();
 
 					imageBox.find('img').css({
 						marginTop: imageBox[0].style.marginTop,
@@ -3571,8 +3946,8 @@
 						return $(this).contents();
 					});
 
-					$(document).off('click.redactor-image-resize-hide.' + this.uuid);
-					this.$editor.off('click.redactor-image-resize-hide.' + this.uuid);
+					$(document).off('mousedown.redactor-image-resize-hide.' + this.uuid);
+
 
 					if (typeof this.image.resizeHandle !== 'undefined')
 					{
@@ -3748,7 +4123,12 @@
 					}
 					else if (this.opts.linebreaks)
 					{
-						$image.before('<br>').after('<br>');
+						if (!this.utils.isEmpty(this.code.get()))
+						{
+							$image.before('<br>');
+						}
+
+						$image.after('<br>');
 					}
 
 					if (typeof json == 'string') return;
@@ -3832,18 +4212,12 @@
 					this.selection.restore();
 					this.code.sync();
 				},
-				decreaseLists: function ()
+				decreaseLists: function()
 				{
 					document.execCommand('outdent');
 
 					var current = this.selection.getCurrent();
-
 					var $item = $(current).closest('li', this.$editor[0]);
-					var $parent = $item.parent();
-					if ($item.length !== 0 && $parent.length !== 0 && $parent[0].tagName == 'LI')
-					{
-						$parent.after($item);
-					}
 
 					this.indent.fixEmptyIndent();
 
@@ -3911,6 +4285,9 @@
 				},
 				format: function(tag, type, value)
 				{
+					var current = this.selection.getCurrent();
+					if (current && current.tagName === 'TR') return;
+
 					// Stop formatting pre and headers
 					if (this.utils.isCurrentOrParent('PRE') || this.utils.isCurrentOrParentHeader()) return;
 
@@ -3922,6 +4299,7 @@
 						if (tag == tags[i]) tag = replaced[i];
 					}
 
+
 					if (this.opts.allowedTags)
 					{
 						if ($.inArray(tag, this.opts.allowedTags) == -1) return;
@@ -3936,7 +4314,7 @@
 
 					this.buffer.set();
 
-					if (!this.utils.browser('msie'))
+					if (!this.utils.browser('msie') && !this.opts.linebreaks)
 					{
 						this.$editor.focus();
 					}
@@ -4012,11 +4390,17 @@
 						}
 
 						$el.replaceWith($span.html($el.contents()));
+						var $parent = $span.parent();
+
+						// remove U tag if selected link + node
+						if ($span[0].tagName === 'A' && $parent && $parent[0].tagName === 'U')
+						{
+							$span.parent().replaceWith($span);
+						}
 
 						if (tag == 'span')
 						{
-							var $parent = $span.parent();
-							if ($parent && $parent[0].tagName == 'SPAN' && this.inline.type == 'style')
+							if ($parent && $parent[0].tagName === 'SPAN' && this.inline.type === 'style')
 							{
 								var arr = this.inline.value.split(';');
 
@@ -4044,8 +4428,16 @@
 						this.$editor.find(this.opts.inlineTags.join(', ')).each($.proxy(function(i,s)
 						{
 							var $el = $(s);
+
+
+							if (s.tagName === 'U' && s.attributes.length === 0)
+							{
+								$el.replaceWith($el.contents());
+								return;
+							}
+
 							var property = $el.css('text-decoration');
-							if (property == 'line-through')
+							if (property === 'line-through')
 							{
 								$el.css('text-decoration', '');
 								this.utils.removeEmptyAttr($el, 'style');
@@ -4062,6 +4454,15 @@
 						});
 					}
 
+					if (tag != 'u')
+					{
+						var _this = this;
+						this.$editor.find('unline').each(function(i,s)
+						{
+							_this.utils.replaceToTag(s, 'u');
+						});
+					}
+
 					this.selection.restore();
 					this.code.sync();
 
@@ -4121,6 +4522,14 @@
 						});
 					}
 
+					if (tag != 'u')
+					{
+						this.$editor.find('u').each(function(i,s)
+						{
+							self.utils.replaceToTag(s, 'unline');
+						});
+					}
+
 					if (tag != 'span')
 					{
 						this.$editor.find(tag).each(function()
@@ -4360,7 +4769,10 @@
 
 					if (typeof clean == 'undefined') clean = true;
 
-					this.$editor.focus();
+					if (!this.opts.linebreaks)
+					{
+						this.$editor.focus();
+					}
 
 					html = this.clean.setVerified(html);
 
@@ -4455,6 +4867,7 @@
 				{
 					node = node[0] || node;
 
+					var offset = this.caret.getOffset();
 					var html = this.utils.getOuterHtml(node);
 					html = this.clean.setVerified(html);
 
@@ -4474,6 +4887,8 @@
 					this.range.collapse(false);
 					this.selection.addRange();
 
+					this.caret.setOffset(offset);
+
 					return node;
 				},
 				nodeToPoint: function(node, x, y)
@@ -4546,6 +4961,7 @@
 					var parHtml = $(parent).html();
 
 					parHtml = '<p>' + parHtml.replace(/<span class="redactor-ie-paste"><\/span>/gi, '</p>' + html + '<p>') + '</p>';
+					parHtml = parHtml.replace(/<p><\/p>/gi, '');
 					$(parent).replaceWith(parHtml);
 				},
 				ie11PasteFrag: function(html)
@@ -4591,8 +5007,12 @@
 					// shortcuts setup
 					this.shortcuts.init(e, key);
 
-					this.keydown.checkEvents(arrow, key);
-					this.keydown.setupBuffer(e, key);
+					if (this.utils.isDesktop())
+					{
+						this.keydown.checkEvents(arrow, key);
+						this.keydown.setupBuffer(e, key);
+					}
+
 					this.keydown.addArrowsEvent(arrow);
 					this.keydown.setupSelectAll(e, key);
 
@@ -4709,6 +5129,7 @@
 
 								return this.keydown.insertBreakLine(e);
 							}
+
 						}
 						else if (this.opts.linebreaks && this.keydown.block)
 						{
@@ -4717,11 +5138,9 @@
 						// paragraphs
 						else if (!this.opts.linebreaks && this.keydown.block)
 						{
-							if (this.keydown.block.tagName !== 'LI')
-							{
-								setTimeout($.proxy(this.keydown.replaceDivToParagraph, this), 1);
-							}
-							else
+							setTimeout($.proxy(this.keydown.replaceDivToParagraph, this), 1);
+
+							if (this.keydown.block.tagName === 'LI')
 							{
 								current = this.selection.getCurrent();
 								var $parent = $(current).closest('li', this.$editor[0]);
@@ -4761,13 +5180,8 @@
 					// image delete and backspace
 					if (key === this.keyCode.BACKSPACE || key === this.keyCode.DELETE)
 					{
-						if (this.utils.browser('mozilla') && this.keydown.current && this.keydown.current.tagName === 'TD')
-						{
-							e.preventDefault();
-							return false;
-						}
-
 						var nodes = this.selection.getNodes();
+
 						if (nodes)
 						{
 							var len = nodes.length;
@@ -4804,6 +5218,25 @@
 					// backspace
 					if (key === this.keyCode.BACKSPACE)
 					{
+						// backspace as outdent
+						var block = this.selection.getBlock();
+						var indented = ($(block).css('margin-left') !== '0px');
+						if (block && indented && this.range.collapsed && this.utils.isStartOfElement())
+						{
+							this.indent.decrease();
+							e.preventDefault();
+							return;
+						}
+
+						// remove hr in FF
+						if (this.utils.browser('mozilla'))
+						{
+							var prev = this.selection.getPrev();
+							var prev2 = $(prev).prev()[0];
+							if (prev && prev.tagName === 'HR') $(prev).remove();
+							if (prev2 && prev2.tagName === 'HR') $(prev2).remove();
+						}
+
 						this.keydown.removeInvisibleSpace();
 						this.keydown.removeEmptyListInTable(e);
 					}
@@ -4825,7 +5258,7 @@
 				checkKeyEvents: function(key)
 				{
 					var k = this.keyCode;
-					var keys = [k.BACKSPACE, k.DELETE, k.ENTER, k.SPACE, k.ESC, k.TAB, k.CTRL, k.META, k.ALT, k.SHIFT];
+					var keys = [k.BACKSPACE, k.DELETE, k.ENTER, k.ESC, k.TAB, k.CTRL, k.META, k.ALT, k.SHIFT];
 
 					return ($.inArray(key, keys) == -1) ? true : false;
 
@@ -4859,7 +5292,7 @@
 					}
 					else if (!this.keydown.ctrl)
 					{
-						if (key == this.keyCode.BACKSPACE || key == this.keyCode.DELETE || (key == this.keyCode.ENTER && !e.ctrlKey && !e.shiftKey) || key == this.keyCode.SPACE)
+						if (key == this.keyCode.BACKSPACE || key == this.keyCode.DELETE || (key == this.keyCode.ENTER && !e.ctrlKey && !e.shiftKey))
 						{
 							this.buffer.set();
 						}
@@ -4950,7 +5383,7 @@
 				{
 					var blockElem = this.selection.getBlock();
 					var blockHtml = blockElem.innerHTML.replace(/<br\s?\/?>/gi, '');
-					if (blockElem.tagName === 'DIV' && blockHtml === '' && !$(blockElem).hasClass('redactor-editor'))
+					if (blockElem.tagName === 'DIV' && this.utils.isEmpty(blockHtml) && !$(blockElem).hasClass('redactor-editor'))
 					{
 						var p = document.createElement('p');
 						p.innerHTML = this.opts.invisibleSpace;
@@ -5097,9 +5530,7 @@
 
 					if ($parentA.length > 0)
 					{
-						$parentA.find(br1)
-								.remove();
-
+						$parentA.find(br1).remove();
 						$parentA.after(br1);
 					}
 
@@ -5120,23 +5551,32 @@
 					}
 					else
 					{
-						this.keydown.insertBreakLineProcessingAfter(br1);
+						// caret does not move after the br visual
+						if (this.utils.browser('msie'))
+						{
+							var space = document.createElement('span');
+							space.innerHTML = '&#x200b;';
+
+							$(br1).after(space);
+
+							this.range.setStartAfter(space);
+							this.range.setEndAfter(space);
+							$(space).remove();
+						}
+						else
+						{
+							var range = document.createRange();
+							range.setStartAfter(br1);
+							range.collapse(true);
+							var selection = window.getSelection();
+							selection.removeAllRanges();
+							selection.addRange(range);
+						}
 					}
 
 					this.code.sync();
 					return false;
 				},
-				insertBreakLineProcessingAfter: function(node)
-				{
-					var space = this.utils.createSpaceElement();
-					$(node).after(space);
-					this.selection.selectElement(space);
-
-					$(space).replaceWith(function()
-					{
-						return $(this).contents();
-					});
-				},
 				removeInvisibleSpace: function()
 				{
 					var $current = $(this.keydown.current);
@@ -5170,6 +5610,7 @@
 			return {
 				init: function(e)
 				{
+
 					if (this.rtePaste) return;
 
 					var key = e.which;
@@ -5187,7 +5628,7 @@
 					}
 
 					// replace to p before / after the table or body
-					if (!this.opts.linebreaks && this.keyup.current.nodeType == 3 && this.keyup.current.length <= 1 && (this.keyup.parent === false || this.keyup.parent.tagName == 'BODY'))
+					if (!this.opts.linebreaks && this.keyup.current.nodeType === 3 && this.keyup.current.length <= 1 && (this.keyup.parent === false || this.keyup.parent.tagName == 'BODY'))
 					{
 						this.keyup.replaceToParagraph();
 					}
@@ -5206,11 +5647,20 @@
 					}
 
 					// linkify
-					if (this.linkify.isEnabled() && this.linkify.isKey(key))
-						this.linkify.format();
+					if (this.linkify.isEnabled() && this.linkify.isKey(key)) this.linkify.format();
 
 					if (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE)
 					{
+						if (this.utils.browser('mozilla'))
+						{
+							var td = $(this.keydown.current).closest('td', this.$editor[0]);
+							if (td.size() !== 0 && td.text() !== '')
+							{
+								e.preventDefault();
+								return false;
+							}
+						}
+
 						// clear unverified
 						this.clean.clearUnverified();
 
@@ -5241,6 +5691,8 @@
 							$(this.keyup.current).remove();
 						}
 
+						this.keyup.removeEmptyLists();
+
 						// if empty
 						return this.keyup.formatEmpty(e);
 					}
@@ -5268,6 +5720,20 @@
 
 					this.caret.setEnd(node);
 				},
+				removeEmptyLists: function()
+				{
+					var removeIt = function()
+					{
+						var html = $.trim(this.innerHTML).replace(/\/t\/n/g, '');
+						if (html === '')
+						{
+							$(this).remove();
+						}
+					};
+
+					this.$editor.find('li').each(removeIt);
+					this.$editor.find('ul, ol').each(removeIt);
+				},
 				formatEmpty: function(e)
 				{
 					var html = $.trim(this.$editor.html());
@@ -5283,9 +5749,7 @@
 					}
 					else
 					{
-						html = '<p><br /></p>';
-
-						this.$editor.html(html);
+						this.$editor.html(this.opts.emptyHtml);
 						this.focus.setStart();
 					}
 
@@ -5365,7 +5829,7 @@
 					var extra = '<p id="redactor-insert-line"><br /></p>';
 					if (this.opts.linebreaks) extra = '<br id="redactor-insert-line">';
 
-					document.execCommand('insertHTML', false, '<hr>' + extra);
+					document.execCommand('insertHtml', false, '<hr>' + extra);
 
 					this.line.setFocus();
 					this.code.sync();
@@ -5374,16 +5838,43 @@
 				{
 					var node = this.$editor.find('#redactor-insert-line');
 					var next = $(node).next()[0];
+					var target = next;
+					if (this.utils.browser('mozilla') && next && next.innerHTML === '')
+					{
+						target = $(next).next()[0];
+						$(next).remove();
+					}
 
-					if (next)
+					if (target)
 					{
-						this.caret.setAfter(node);
 						node.remove();
+
+						if (!this.opts.linebreaks)
+						{
+							this.$editor.focus();
+							this.line.setStart(target);
+						}
+
 					}
 					else
 					{
+
 						node.removeAttr('id');
+						this.line.setStart(node[0]);
 					}
+				},
+				setStart: function(node)
+				{
+					if (typeof node === 'undefined') return;
+
+					var textNode = document.createTextNode('\u200B');
+
+					this.selection.get();
+					this.range.setStart(node, 0);
+					this.range.insertNode(textNode);
+					this.range.collapse(true);
+					this.selection.addRange();
+
 				}
 			};
 		},
@@ -5394,10 +5885,20 @@
 				{
 					if (typeof e != 'undefined' && e.preventDefault) e.preventDefault();
 
-					this.modal.load('link', this.lang.get('link_insert'), 600);
+					if (!this.observe.isCurrent('a'))
+					{
+						this.modal.load('link', this.lang.get('link_insert'), 600);
+					}
+					else
+					{
+						this.modal.load('link', this.lang.get('link_edit'), 600);
+					}
 
 					this.modal.createCancelButton();
-					this.link.buttonInsert = this.modal.createActionButton(this.lang.get('insert'));
+
+					var buttonText = !this.observe.isCurrent('a') ? this.lang.get('insert') : this.lang.get('edit');
+
+					this.link.buttonInsert = this.modal.createActionButton(buttonText);
 
 					this.selection.get();
 
@@ -5467,7 +5968,7 @@
 
 					var target = '';
 					var link = this.link.$inputUrl.val();
-					var text = this.link.$inputText.val();
+					var text = this.link.$inputText.val().replace(/(<([^>]+)>)/ig,"");
 
 					if ($.trim(link) === '')
 					{
@@ -5484,6 +5985,7 @@
 					// mailto
 					if (link.search('@') != -1 && /(http|ftp|https):\/\//i.test(link) === false)
 					{
+						link = link.replace('mailto:', '');
 						link = 'mailto:' + link;
 					}
 					// url, not anchor
@@ -5513,6 +6015,7 @@
 					text = $.trim(text.replace(/<|>/g, ''));
 
 					this.selection.restore();
+					var blocks = this.selection.getBlocks();
 
 					if (text === '' && link === '') return;
 					if (text === '' && link !== '') text = link;
@@ -5561,7 +6064,13 @@
 							var $a = $('<a />').attr('href', link).text(text);
 							if (target !== '') $a.attr('target', target);
 
-							this.insert.node($a);
+							$a = $(this.insert.node($a));
+
+							if (this.opts.linebreaks)
+							{
+								$a.after('&nbsp;');
+							}
+
 							this.selection.selectElement($a);
 						}
 						else
@@ -5601,7 +6110,14 @@
 
 								if (this.link.text !== '' || this.link.text != text)
 								{
-									$a.text(text);
+									if (!this.opts.linebreaks && blocks && blocks.length <= 1)
+									{
+										$a.text(text);
+									}
+									else if (this.opts.linebreaks)
+									{
+										$a.text(text);
+									}
 
 									this.selection.selectElement($a);
 								}
@@ -5633,12 +6149,20 @@
 					this.buffer.set();
 
 					var len = nodes.length;
+					var links = [];
 					for (var i = 0; i < len; i++)
 					{
+						if (nodes[i].tagName === 'A')
+						{
+							links.push(nodes[i]);
+						}
+
 						var $node = $(nodes[i]).closest('a', this.$editor[0]);
 						$node.replaceWith($node.contents());
 					}
 
+					this.core.setCallback('deletedLink', links);
+
 					// hide link's tooltip
 					$('.redactor-link-tooltip').remove();
 
@@ -5669,13 +6193,171 @@
 				}
 			};
 		},
+		linkify: function()
+		{
+			return {
+				isKey: function(key)
+				{
+					return key == this.keyCode.ENTER || key == this.keyCode.SPACE;
+				},
+				isEnabled: function()
+				{
+					return this.opts.convertLinks && (this.opts.convertUrlLinks || this.opts.convertImageLinks || this.opts.convertVideoLinks) && !this.utils.isCurrentOrParent('PRE');
+				},
+				format: function()
+				{
+					var linkify = this.linkify,
+						opts    = this.opts;
+
+					this.$editor
+						.find(":not(iframe,img,a,pre)")
+						.addBack()
+						.contents()
+						.filter(function()
+						{
+							return this.nodeType === 3 && $.trim(this.nodeValue) != "" && !$(this).parent().is("pre") && (this.nodeValue.match(opts.linkify.regexps.youtube) || this.nodeValue.match(opts.linkify.regexps.vimeo) || this.nodeValue.match(opts.linkify.regexps.image) || this.nodeValue.match(opts.linkify.regexps.url));
+						})
+						.each(function()
+						{
+							var text = $(this).text(),
+								html = text;
+
+							if (opts.convertVideoLinks && (html.match(opts.linkify.regexps.youtube) || html.match(opts.linkify.regexps.vimeo)) )
+							{
+								html = linkify.convertVideoLinks(html);
+							}
+							else if (opts.convertImageLinks && html.match(opts.linkify.regexps.image))
+							{
+								html = linkify.convertImages(html);
+							}
+							else if (opts.convertUrlLinks)
+							{
+								html = linkify.convertLinks(html);
+							}
+
+							$(this).before(text.replace(text, html))
+								   .remove();
+						});
+
+
+					var objects = this.$editor.find('.redactor-linkify-object').each(function()
+					{
+						var $el = $(this);
+						$el.removeClass('redactor-linkify-object');
+						if ($el.attr('class') === '') $el.removeAttr('class');
+
+						return $el[0];
+
+					});
+
+					// callback
+					setTimeout($.proxy(function()
+					{
+						this.observe.load();
+						this.core.setCallback('linkify', objects);
+					}, this), 100);
+
+					// sync
+					this.code.sync();
+				},
+				convertVideoLinks: function(html)
+				{
+					var iframeStart = '<iframe class="redactor-linkify-object" width="500" height="281" src="',
+						iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
+
+					if (html.match(this.opts.linkify.regexps.youtube))
+					{
+						html = html.replace(this.opts.linkify.regexps.youtube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
+					}
+
+					if (html.match(this.opts.linkify.regexps.vimeo))
+					{
+						html = html.replace(this.opts.linkify.regexps.vimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
+					}
+
+					return html;
+				},
+				convertImages: function(html)
+				{
+					var matches = html.match(this.opts.linkify.regexps.image);
+
+					if (matches)
+					{
+						html = html.replace(html, '<img src="' + matches + '" class="redactor-linkify-object" />');
+
+						if (this.opts.linebreaks)
+						{
+							if (!this.utils.isEmpty(this.code.get()))
+							{
+								html = '<br>' + html;
+							}
+						}
+
+						html += '<br>';
+					}
+
+					return html;
+				},
+				convertLinks: function(html)
+				{
+					var matches = html.match(this.opts.linkify.regexps.url);
+
+					if (matches)
+					{
+						matches = $.grep(matches, function(v, k) { return $.inArray(v, matches) === k; });
+
+						var length = matches.length;
+
+						for (var i = 0; i < length; i++)
+						{
+							var href = matches[i],
+								text = href,
+								linkProtocol = this.opts.linkProtocol + '://';
+
+							if (href.match(/(https?|ftp):\/\//i) !== null)
+							{
+								linkProtocol = "";
+							}
+
+							if (text.length > this.opts.linkSize)
+							{
+								text = text.substring(0, this.opts.linkSize) + '...';
+							}
+
+							if (text.search('%') === -1)
+							{
+								text = decodeURIComponent(text);
+							}
+
+							var regexB = "\\b";
+
+							if ($.inArray(href.slice(-1), ["/", "&", "="]) != -1)
+							{
+								regexB = "";
+							}
+
+							// escaping url
+							var regexp = new RegExp('(' + href.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + regexB + ')', 'g');
+
+							html = html.replace(regexp, '<a href="' + linkProtocol + $.trim(href) + '" class="redactor-linkify-object">' + $.trim(text) + '</a>');
+						}
+					}
+
+					return html;
+				}
+			};
+		},
 		list: function()
 		{
 			return {
 				toggle: function(cmd)
 				{
 					this.placeholder.remove();
-					if (!this.utils.browser('msie')) this.$editor.focus();
+
+					if (!this.utils.browser('msie') && !this.opts.linebreaks)
+					{
+						this.$editor.focus();
+					}
 
 					this.buffer.set();
 					this.selection.save();
@@ -5711,7 +6393,7 @@
 					{
 						if (remove)
 						{
-							this.list.remove(cmd);
+							this.list.remove(cmd, $list);
 						}
 						else
 						{
@@ -5721,10 +6403,10 @@
 
 					this.selection.restore();
 					this.code.sync();
+
 				},
 				insert: function(cmd)
 				{
-					var parent = this.selection.getParent();
 					var current = this.selection.getCurrent();
 					var $td = $(current).closest('td, th', this.$editor[0]);
 
@@ -5737,30 +6419,25 @@
 						document.execCommand('insert' + cmd);
 					}
 
-					var $list = $(this.selection.getParent()).closest('ol, ul', this.$editor[0]);
-
+					var parent = this.selection.getParent();
+					var $list = $(parent).closest('ol, ul', this.$editor[0]);
 					if ($td.length !== 0)
 					{
-						var prev = $td.prev();
-						var html = $td.html();
-						$td.html('');
-						if (prev && prev.length === 1 && (prev[0].tagName === 'TD' || prev[0].tagName === 'TH'))
-						{
-							$(prev).after($td);
-						}
-						else
-						{
-							$(parent).prepend($td);
-						}
-
-						$td.html(html);
+						var newTd = $td.clone();
+						$td.after(newTd).remove('');
 					}
 
+
 					if (this.utils.isEmpty($list.find('li').text()))
 					{
 						var $children = $list.children('li');
 						$children.find('br').remove();
 						$children.append(this.selection.getMarkerAsHtml());
+
+						if (this.opts.linebreaks && this.utils.browser('mozilla') && $children.size() == 2 && this.utils.isEmpty($children.eq(1).text()))
+						{
+							$children.eq(1).remove();
+						}
 					}
 
 					if ($list.length)
@@ -5778,6 +6455,7 @@
 						this.$editor.focus();
 					}
 
+
 					this.clean.clearUnverified();
 				},
 				insertInIe: function(cmd)
@@ -5816,12 +6494,13 @@
 						$(wrapper).replaceWith(tmpList);
 					}
 				},
-				remove: function(cmd)
+				remove: function(cmd, $list)
 				{
+					if ($.inArray('ul', this.selection.getBlocks())) cmd = 'unorderedlist';
+
 					document.execCommand('insert' + cmd);
 
 					var $current = $(this.selection.getCurrent());
-
 					this.indent.fixEmptyIndent();
 
 					if (!this.opts.linebreaks && $current.closest('li, th, td', this.$editor[0]).length === 0)
@@ -5839,6 +6518,7 @@
 
 					this.clean.clearUnverified();
 
+
 				}
 			};
 		},
@@ -5854,10 +6534,10 @@
 							+ '<label>' + this.lang.get('title') + '</label>'
 							+ '<input type="text" id="redactor-image-title" />'
 							+ '<label class="redactor-image-link-option">' + this.lang.get('link') + '</label>'
-							+ '<input type="text" id="redactor-image-link" class="redactor-image-link-option" />'
-							+ '<label class="redactor-image-link-option"><input type="checkbox" id="redactor-image-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
+							+ '<input type="text" id="redactor-image-link" class="redactor-image-link-option" aria-label="' + this.lang.get('link') + '" />'
+							+ '<label class="redactor-image-link-option"><input type="checkbox" id="redactor-image-link-blank" aria-label="' + this.lang.get('link_new_tab') + '"> ' + this.lang.get('link_new_tab') + '</label>'
 							+ '<label class="redactor-image-position-option">' + this.lang.get('image_position') + '</label>'
-							+ '<select class="redactor-image-position-option" id="redactor-image-align">'
+							+ '<select class="redactor-image-position-option" id="redactor-image-align" aria-label="' + this.lang.get('image_position') + '">'
 								+ '<option value="none">' + this.lang.get('none') + '</option>'
 								+ '<option value="left">' + this.lang.get('left') + '</option>'
 								+ '<option value="center">' + this.lang.get('center') + '</option>'
@@ -5874,7 +6554,7 @@
 						+ '<section id="redactor-modal-file-insert">'
 							+ '<div id="redactor-modal-file-upload-box">'
 								+ '<label>' + this.lang.get('filename') + '</label>'
-								+ '<input type="text" id="redactor-filename" /><br><br>'
+								+ '<input type="text" id="redactor-filename" aria-label="' + this.lang.get('filename') + '" /><br><br>'
 								+ '<div id="redactor-modal-file-upload"></div>'
 							+ '</div>'
 						+ '</section>',
@@ -5882,9 +6562,9 @@
 						link: String()
 						+ '<section id="redactor-modal-link-insert">'
 							+ '<label>URL</label>'
-							+ '<input type="url" id="redactor-link-url" />'
+							+ '<input type="url" id="redactor-link-url" aria-label="URL" />'
 							+ '<label>' + this.lang.get('text') + '</label>'
-							+ '<input type="text" id="redactor-link-url-text" />'
+							+ '<input type="text" id="redactor-link-url-text" aria-label="' + this.lang.get('text') + '" />'
 							+ '<label><input type="checkbox" id="redactor-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
 						+ '</section>'
 					};
@@ -5957,15 +6637,7 @@
 				},
 				show: function()
 				{
-					// ios keyboard hide
-					if (this.utils.isMobile() && !this.utils.browser('msie'))
-					{
-						document.activeElement.blur();
-					}
-
-					$(document.body).removeClass('body-redactor-hidden');
-					this.modal.bodyOveflow = $(document.body).css('overflow');
-					$(document.body).css('overflow', 'hidden');
+					this.utils.disableBodyScroll();
 
 					if (this.utils.isMobile())
 					{
@@ -5976,9 +6648,17 @@
 						this.modal.showOnDesktop();
 					}
 
+					if (this.opts.highContrast)
+					{
+						this.$modalBox.addClass("redactor-modal-contrast");
+					}
+
 					this.$modalOverlay.show();
 					this.$modalBox.show();
 
+					this.$modal.attr('tabindex', '-1');
+					this.$modal.focus();
+
 					this.modal.setButtonsWidth();
 
 					this.utils.saveScroll();
@@ -6104,10 +6784,10 @@
 				{
 					this.modal.buildOverlay();
 
-					this.$modalBox = $('<div id="redactor-modal-box" />').hide();
-					this.$modal = $('<div id="redactor-modal" />');
-					this.$modalHeader = $('<header />');
-					this.$modalClose = $('<span id="redactor-modal-close" />').html('&times;');
+					this.$modalBox = $('<div id="redactor-modal-box"/>').hide();
+					this.$modal = $('<div id="redactor-modal" role="dialog" aria-labelledby="redactor-modal-header" />');
+					this.$modalHeader = $('<header id="redactor-modal-header"/>');
+					this.$modalClose = $('<button type="button" id="redactor-modal-close" tabindex="1" aria-label="Close" />').html('&times;');
 					this.$modalBody = $('<div id="redactor-modal-body" />');
 					this.$modalFooter = $('<footer />');
 
@@ -6159,6 +6839,7 @@
 					if (!this.$modalBox) return;
 
 					this.modal.disableEvents();
+					this.utils.enableBodyScroll();
 
 					this.$modalOverlay.remove();
 
@@ -6183,9 +6864,116 @@
 			return {
 				load: function()
 				{
+					if (typeof this.opts.destroyed != "undefined") return;
+
+					if (this.utils.browser('msie'))
+					{
+						var self = this;
+						this.$editor.find('pre, code').on('mouseover',function()
+						{
+							self.$editor.attr('contenteditable', fa