From 4a67fef8fd811f397ccf8aaec59dc39c0c9eb950 Mon Sep 17 00:00:00 2001
From: Peter Halloran <peter.halloran@careerbuilder.com>
Date: Fri, 23 Jun 2017 17:02:55 -0400
Subject: [PATCH 1/2] fix: update angular-redactor add inline styles plugin and
 add newer version of Redactor

---
 .../legacy/controllers/posts/edit.js          |    3 +-
 .../javascripts/legacy/vendor/inlinestyle.js  |   67 +
 .../javascripts/legacy/vendor/redactor.js     | 1819 ++++++++++++-----
 bower.json                                    |    2 +-
 4 files changed, 1390 insertions(+), 501 deletions(-)
 create mode 100755 app/assets/javascripts/legacy/vendor/inlinestyle.js

diff --git a/app/assets/javascripts/legacy/controllers/posts/edit.js b/app/assets/javascripts/legacy/controllers/posts/edit.js
index c73141c7e..f2d0c6b8e 100644
--- a/app/assets/javascripts/legacy/controllers/posts/edit.js
+++ b/app/assets/javascripts/legacy/controllers/posts/edit.js
@@ -55,8 +55,9 @@ angular.module('cortex.controllers.posts.edit', [
   ImageFitService.initRedactorImageFitPlugin();
 
   $scope.redactorOptions = {
-    plugins: ['media', 'imageFit'],
+    plugins: ['media', 'imageFit', 'inlinestyle'],
     minHeight: 800,
+    focus: true,
     buttonSource: true,
     deniedTags: ['html', 'head', 'link', 'body', 'applet'] // Allow script, style
   };
diff --git a/app/assets/javascripts/legacy/vendor/inlinestyle.js b/app/assets/javascripts/legacy/vendor/inlinestyle.js
new file mode 100755
index 000000000..993258e64
--- /dev/null
+++ b/app/assets/javascripts/legacy/vendor/inlinestyle.js
@@ -0,0 +1,67 @@
+(function($)
+{
+	$.Redactor.prototype.inlinestyle = function()
+	{
+		return {
+			langs: {
+				en: {
+					"style": "Style"
+				}
+			},
+			init: function()
+			{
+				var tags = {
+					"marked": {
+						title: "Marked",
+						args: ['mark']
+					},
+					"code": {
+						title: "Code",
+						args: ['code']
+					},
+					"sample": {
+						title: "Sample",
+						args: ['samp']
+					},
+					"variable": {
+						title: "Variable",
+						args: ['var']
+					},
+					"shortcut": {
+						title: "Shortcut",
+						args: ['kbd']
+					},
+					"cite": {
+						title: "Cite",
+						args: ['cite']
+					},
+					"sup": {
+						title: "Superscript",
+						args: ['sup']
+					},
+					"sub": {
+						title: "Subscript",
+						args: ['sub']
+					}
+				};
+
+
+				var that = this;
+				var dropdown = {};
+
+				$.each(tags, function(i, s)
+				{
+					dropdown[i] = { title: s.title, func: 'inline.format', args: s.args };
+				});
+
+
+				var button = this.button.addAfter('format', 'inline', this.lang.get('style'));
+				this.button.setIcon(button, '<i class="re-icon-inline"></i>');
+				this.button.addDropdown(button, dropdown);
+
+			}
+
+
+		};
+	};
+})(jQuery);
\ No newline at end of file
diff --git a/app/assets/javascripts/legacy/vendor/redactor.js b/app/assets/javascripts/legacy/vendor/redactor.js
index 2ac60a744..553e3248e 100644
--- a/app/assets/javascripts/legacy/vendor/redactor.js
+++ b/app/assets/javascripts/legacy/vendor/redactor.js
@@ -1,6 +1,6 @@
 /*
-	Redactor v10.0.6
-	Updated: January 7, 2015
+	Redactor v10.1.3
+	Updated: June 4, 2015
 
 	http://imperavi.com/redactor/
 
@@ -28,9 +28,6 @@
 
 	var uuid = 0;
 
-	var reUrlYoutube = /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.\-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig;
-	var reUrlVimeo = /https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/;
-
 	// Plugin
 	$.fn.redactor = function(options)
 	{
@@ -94,13 +91,13 @@
 
 	// Functionality
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '10.0.6';
+	$.Redactor.VERSION = '10.1.3';
 	$.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',
 						  'paste', 'placeholder', 'progress', 'selection', 'shortcuts',
-						  'tabifier', 'tidy',  'toolbar', 'upload', 'utils'];
+						  'tabifier', 'tidy',  'toolbar', 'upload', 'utils', 'linkify'];
 
 	$.Redactor.opts = {
 
@@ -135,6 +132,7 @@
 		autosaveName: false,
 		autosaveInterval: 60, // seconds
 		autosaveOnChange: false,
+		autosaveFields: false,
 
 		linkTooltip: true,
 		linkProtocol: 'http',
@@ -147,14 +145,14 @@
 		imageFloatMargin: '10px',
 		imageResizable: true,
 
-		imageUpload: false,
+		imageUpload: null,
 		imageUploadParam: 'file',
 
 		uploadImageField: false,
 
 		dragImageUpload: true,
 
-		fileUpload: false,
+		fileUpload: null,
 		fileUploadParam: 'file',
 
 		dragFileUpload: true,
@@ -179,7 +177,7 @@
 		toolbarExternal: false, // ID selector
 		toolbarOverflow: false,
 
-		buttonSource: false,
+		source: true,
 		buttons: ['html', 'formatting', 'bold', 'italic', 'deleted', 'unorderedlist', 'orderedlist',
 				  'outdent', 'indent', 'image', 'file', 'link', 'alignment', 'horizontalrule'], // + 'underline'
 
@@ -191,12 +189,17 @@
 
 		tabifier: true,
 
-		deniedTags: ['html', 'head', 'link', 'body', 'meta', 'script', 'style', 'applet'],
+		deniedTags: ['script', 'style'],
 		allowedTags: false, // or array
 
+		paragraphizeBlocks: ['table', 'div', 'pre', 'form', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'dl', 'blockquote', 'figcaption',
+							'address', 'section', 'header', 'footer', 'aside', 'article', 'object', 'style', 'script', 'iframe', 'select', 'input', 'textarea',
+							'button', 'option', 'map', 'area', 'math', 'hr', 'fieldset', 'legend', 'hgroup', 'nav', 'figure', 'details', 'menu', 'summary', 'p'],
+
 		removeComments: false,
 		replaceTags: [
-			['strike', 'del']
+			['strike', 'del'],
+			['b', 'strong']
 		],
 		replaceStyles: [
             ['font-weight:\\s?bold', "strong"],
@@ -323,9 +326,22 @@
 				underline: 'Underline',
 				alignment: 'Alignment',
 				filename: 'Name (optional)',
-				edit: 'Edit'
+				edit: 'Edit',
+				upload_label: 'Drop file here or '
+
 			}
-		}
+		},
+
+		linkify: {
+			regexps: {
+				youtube: /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.\-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig,
+				vimeo: /https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/,
+				image: /((https?|www)[^\s]+\.)(jpe?g|png|gif)(\?[^\s-]+)?/ig,
+				url: /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/ig,
+			}
+		},
+
+		codemirror: false
 	};
 
 	// Functionality
@@ -371,6 +387,16 @@
 			// setup allowed and denied tags
 			this.tidy.setupAllowed();
 
+			// setup denied tags
+			if (this.opts.deniedTags !== false)
+			{
+				var tags = ['html', 'head', 'link', 'body', 'meta', 'applet'];
+				for (var i = 0; i < tags.length; i++)
+				{
+					this.opts.deniedTags.push(tags[i]);
+				}
+			}
+
 			// load lang
 			this.lang.load();
 
@@ -447,92 +473,130 @@
 				},
 				set: function(type)
 				{
+					// focus
 					if (!this.utils.browser('msie')) this.$editor.focus();
 
 					this.buffer.set();
 					this.selection.save();
 
+					// get blocks
 					this.alignment.blocks = this.selection.getBlocks();
-					if (this.opts.linebreaks && this.alignment.blocks[0] === false)
+					this.alignment.type = type;
+
+					// set alignment
+					if (this.alignment.isLinebreaksOrNoBlocks())
 					{
-						this.alignment.setText(type);
+						this.alignment.setText();
 					}
 					else
 					{
-						this.alignment.setBlocks(type);
+						this.alignment.setBlocks();
 					}
 
+					// sync
 					this.selection.restore();
 					this.code.sync();
 				},
-				setText: function(type)
+				setText: function()
 				{
 					var wrapper = this.selection.wrap('div');
-					$(wrapper).attr('data-tagblock', 'redactor');
-					$(wrapper).css('text-align', type);
+					$(wrapper).attr('data-tagblock', 'redactor').css('text-align', this.alignment.type);
 				},
-				setBlocks: function(type)
+				setBlocks: function()
 				{
 					$.each(this.alignment.blocks, $.proxy(function(i, el)
 					{
 						var $el = this.utils.getAlignmentElement(el);
-
 						if (!$el) return;
 
-						if (type === '' && typeof($el.data('tagblock')) !== 'undefined')
+						if (this.alignment.isNeedReplaceElement($el))
 						{
-							$el.replaceWith($el.html());
+							this.alignment.replaceElement($el);
 						}
 						else
 						{
-							$el.css('text-align', type);
-							this.utils.removeEmptyAttr($el, 'style');
+							this.alignment.alignElement($el);
 						}
 
-
 					}, this));
+				},
+				isLinebreaksOrNoBlocks: function()
+				{
+					return (this.opts.linebreaks && this.alignment.blocks[0] === false);
+				},
+				isNeedReplaceElement: function($el)
+				{
+					return (this.alignment.type === '' && typeof($el.data('tagblock')) !== 'undefined');
+				},
+				replaceElement: function($el)
+				{
+					$el.replaceWith($el.html());
+				},
+				alignElement: function($el)
+				{
+					$el.css('text-align', this.alignment.type);
+					this.utils.removeEmptyAttr($el, 'style');
 				}
 			};
 		},
 		autosave: function()
 		{
 			return {
+				html: false,
 				enable: function()
 				{
 					if (!this.opts.autosave) return;
 
-					this.autosave.html = false;
 					this.autosave.name = (this.opts.autosaveName) ? this.opts.autosaveName : this.$textarea.attr('name');
 
-					if (!this.opts.autosaveOnChange)
-					{
-						this.autosaveInterval = setInterval($.proxy(this.autosave.load, this), this.opts.autosaveInterval * 1000);
-					}
+					if (this.opts.autosaveOnChange) return;
+					this.autosaveInterval = setInterval(this.autosave.load, this.opts.autosaveInterval * 1000);
 				},
 				onChange: function()
 				{
 					if (!this.opts.autosaveOnChange) return;
-
 					this.autosave.load();
 				},
 				load: function()
 				{
-					var html = this.code.get();
-					if (this.autosave.html === html) return;
-					if (this.utils.isEmpty(html)) return;
+					this.autosave.source = this.code.get();
+
+					if (this.autosave.html === this.autosave.source) return;
+					//if (this.utils.isEmpty(this.autosave.source)) return;
 
-					$.ajax({
+					// data
+					var data = {};
+					data['name'] = this.autosave.name;
+					data[this.autosave.name] = this.autosave.source;
+					data = this.autosave.getHiddenFields(data);
+
+					// ajax
+					var jsxhr = $.ajax({
 						url: this.opts.autosave,
 						type: 'post',
-						data: 'name=' + this.autosave.name + '&' + this.autosave.name + '=' + escape(encodeURIComponent(html)),
-						success: $.proxy(function(data)
-						{
-							this.autosave.success(data, html);
-
-						}, this)
+						data: data
 					});
+
+					jsxhr.done(this.autosave.success);
+				},
+				getHiddenFields: function(data)
+				{
+					if (this.opts.autosaveFields === false || typeof this.opts.autosaveFields !== 'object')
+					{
+						return data;
+					}
+
+					$.each(this.opts.autosaveFields, $.proxy(function(k, v)
+					{
+						if (v !== null && v.toString().indexOf('#') === 0) v = $(v).val();
+						data[k] = v;
+
+					}, this));
+
+					return data;
+
 				},
-				success: function(data, html)
+				success: function(data)
 				{
 					var json;
 					try
@@ -548,7 +612,7 @@
 					var callbackName = (typeof json.error == 'undefined') ? 'autosave' :  'autosaveError';
 
 					this.core.setCallback(callbackName, this.autosave.name, json);
-					this.autosave.html = html;
+					this.autosave.html = this.autosave.source;
 				},
 				disable: function()
 				{
@@ -566,7 +630,7 @@
 
 					if (typeof this.formatting[name].data != 'undefined') type = 'data';
 					else if (typeof this.formatting[name].attr != 'undefined') type = 'attr';
-					else if (typeof this.formatting[name].class != 'undefined') type = 'class';
+					else if (typeof this.formatting[name]['class'] != 'undefined') type = 'class';
 
 					if (typeof this.formatting[name].clear != 'undefined')
 					{
@@ -681,6 +745,11 @@
 						this.block.toggle($(block));
 					}
 
+					if (typeof this.block.type == 'undefined' && typeof this.block.value == 'undefined')
+					{
+						$(block).removeAttr('class').removeAttr('style');
+					}
+
 				},
 				setMultiple: function(tag)
 				{
@@ -756,14 +825,20 @@
 								{
 									$.each(this.block.blocks, $.proxy(function(i,s)
 									{
+										var $formatted = false;
 										if (this.opts.linebreaks)
 										{
 											$(s).prepend('<br>').append('<br>');
-											this.utils.replaceWithContents(s);
+											$formatted = this.utils.replaceWithContents(s);
 										}
 										else
 										{
-											this.utils.replaceToTag(s, 'p');
+											$formatted = this.utils.replaceToTag(s, 'p');
+										}
+
+										if ($formatted && typeof this.block.type == 'undefined' && typeof this.block.value == 'undefined')
+										{
+											$formatted.removeAttr('class').removeAttr('style');
 										}
 
 									}, this));
@@ -782,7 +857,7 @@
 							if (this.block.type == 'class')
 							{
 								toggleType = 'toggle';
-								classSize = $(this.block.blocks).filter('.' + this.block.value).size();
+								classSize = $(this.block.blocks).filter('.' + this.block.value).length;
 
 								if (this.block.blocksSize == classSize) toggleType = 'toggle';
 								else if (this.block.blocksSize > classSize) toggleType = 'set';
@@ -809,6 +884,11 @@
 								if (this.block.isRemoveInline) this.utils.removeInlineTags($formatted);
 								if (tag == 'p' || this.block.headTag) $formatted.find('p').contents().unwrap();
 
+								if (typeof this.block.type == 'undefined' && typeof this.block.value == 'undefined')
+								{
+									$formatted.removeAttr('class').removeAttr('style');
+								}
+
 
 							}, this));
 						}
@@ -871,7 +951,7 @@
 				},
 				formatListToBlockquote: function()
 				{
-					var block = $(this.block.blocks[0]).closest('ul, ol');
+					var block = $(this.block.blocks[0]).closest('ul, ol', this.$editor[0]);
 
 					$(block).find('ul, ol').contents().unwrap();
 					$(block).find('li').append($('<br>')).contents().unwrap();
@@ -964,10 +1044,10 @@
 				},
 				formatTableWrapping: function($formatted)
 				{
-					if ($formatted.closest('table').size() === 0) return;
+					if ($formatted.closest('table', this.$editor[0]).length === 0) return;
 
-					if ($formatted.closest('tr').size() === 0) $formatted.wrap('<tr>');
-					if ($formatted.closest('td').size() === 0 && $formatted.closest('th').size() === 0)
+					if ($formatted.closest('tr', this.$editor[0]).length === 0) $formatted.wrap('<tr>');
+					if ($formatted.closest('td', this.$editor[0]).length === 0 && $formatted.closest('th').length === 0)
 					{
 						$formatted.wrap('<td>');
 					}
@@ -1122,13 +1202,11 @@
 			return {
 				run: function()
 				{
-
 					this.build.createContainerBox();
 					this.build.loadContent();
 					this.build.loadEditor();
 					this.build.enableEditor();
 					this.build.setCodeAndCall();
-
 				},
 				isTextarea: function()
 				{
@@ -1144,13 +1222,7 @@
 				},
 				getTextareaName: function()
 				{
-					var name = this.$element.attr('id');
-					if (typeof(name) == 'undefined')
-					{
-						name = 'content-' + this.uuid;
-					}
-
-					return name;
+					return ((typeof(name) == 'undefined')) ? 'content-' + this.uuid : this.$element.attr('id');
 				},
 				loadContent: function()
 				{
@@ -1193,14 +1265,13 @@
 					this.build.callEditor();
 
 					// code mode
-					if (!this.opts.visual)
-					{
-						setTimeout($.proxy(this.code.showCode, this), 200);
-					}
+					if (this.opts.visual) return;
+					setTimeout($.proxy(this.code.showCode, this), 200);
 				},
 				callEditor: function()
 				{
 					this.build.disableMozillaEditing();
+					this.build.disableIeLinks();
 					this.build.setEvents();
 					this.build.setHelpers();
 
@@ -1236,6 +1307,21 @@
 					if (this.opts.maxHeight) this.$editor.css('maxHeight', this.opts.maxHeight);
 
 				},
+				setEventDropUpload: function(e)
+				{
+					e.preventDefault();
+
+					if (!this.opts.dragImageUpload || !this.opts.dragFileUpload) return;
+
+					var files = e.dataTransfer.files;
+					this.upload.directUpload(files[0], e);
+				},
+				setEventDrop: function(e)
+				{
+					this.code.sync();
+					setTimeout(this.clean.clearUnverified, 1);
+					this.core.setCallback('drop', e);
+				},
 				setEvents: function()
 				{
 					// drop
@@ -1245,28 +1331,16 @@
 
 						if (window.FormData === undefined || !e.dataTransfer) return true;
 
-						var length = e.dataTransfer.files.length;
-						if (length === 0)
+						if (e.dataTransfer.files.length === 0)
 						{
-							this.code.sync();
-							setTimeout($.proxy(this.clean.clearUnverified, this), 1);
-							this.core.setCallback('drop', e);
-
-							return true;
+							return this.build.setEventDrop(e);
 						}
 						else
 						{
-							e.preventDefault();
-
-							if (this.opts.dragImageUpload || this.opts.dragFileUpload)
-							{
-								var files = e.dataTransfer.files;
-								this.upload.directUpload(files[0], e);
-							}
+							this.build.setEventDropUpload(e);
 						}
 
-						setTimeout($.proxy(this.clean.clearUnverified, this), 1);
-
+						setTimeout(this.clean.clearUnverified, 1);
 						this.core.setCallback('drop', e);
 
 					}, this));
@@ -1275,11 +1349,8 @@
 					// click
 					this.$editor.on('click.redactor', $.proxy(function(e)
 					{
-						var type = 'click';
-						if ((this.core.getEvent() == 'click' || this.core.getEvent() == 'arrow'))
-						{
-							type = false;
-						}
+						var event = this.core.getEvent();
+						var type = (event == 'click' || event == 'arrow') ? false : 'click';
 
 						this.core.addEvent(type);
 						this.utils.disableSelectAll();
@@ -1290,6 +1361,9 @@
 					// paste
 					this.$editor.on('paste.redactor', $.proxy(this.paste.init, this));
 
+					// cut
+					this.$editor.on('cut.redactor', $.proxy(this.code.sync, this));
+
 					// keydown
 					this.$editor.on('keydown.redactor', $.proxy(this.keydown.init, this));
 
@@ -1315,34 +1389,39 @@
 					}
 
 					var clickedElement;
-					$(document).on('mousedown', function(e) {
-						clickedElement = $(e.target);
-					});
+					$(document).on('mousedown', function(e) { clickedElement = e.target; });
 
 					// blur
 					this.$editor.on('blur.redactor', $.proxy(function(e)
 					{
 						if (this.rtePaste) return;
+						if (!this.build.isBlured(clickedElement)) return;
+
+						this.utils.disableSelectAll();
+						if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
 
-						var $el = $(clickedElement);
-						if (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').size() === 0)
-						{
-							this.utils.disableSelectAll();
-							if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
-						}
 					}, 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()
 				{
-					// autosave
-					this.autosave.enable();
+					// linkify
+					if (this.linkify.isEnabled())
+					{
+						this.linkify.format();
+					}
 
 					// placeholder
 					this.placeholder.enable();
 
 					// focus
-					if (this.opts.focus) setTimeout($.proxy(this.focus.setStart, this), 100);
-					if (this.opts.focusEnd) setTimeout($.proxy(this.focus.setEnd, this), 100);
+					if (this.opts.focus) setTimeout(this.focus.setStart, 100);
+					if (this.opts.focusEnd) setTimeout(this.focus.setEnd, 100);
 
 				},
 				plugins: function()
@@ -1364,6 +1443,7 @@
 
 						this[s] = RedactorPlugins[s]();
 
+						// get methods
 						var methods = this.getModuleMethods(this[s]);
 						var len = methods.length;
 
@@ -1378,7 +1458,6 @@
 
 					}, this));
 
-
 				},
 				disableMozillaEditing: function()
 				{
@@ -1389,6 +1468,13 @@
 						document.execCommand('enableObjectResizing', false, false);
 						document.execCommand('enableInlineTableEditing', false, false);
 					} catch (e) {}
+				},
+				disableIeLinks: function()
+				{
+					if (!this.utils.browser('ie')) return;
+
+					// IE prevent converting links
+					document.execCommand("AutoUrlDetect", false, false);
 				}
 			};
 		},
@@ -1399,34 +1485,16 @@
 				{
 					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
 
+					// click
 					if (btnObject.func || btnObject.command || btnObject.dropdown)
 					{
-						$button.on('touchstart click', $.proxy(function(e)
-						{
-							if ($button.hasClass('redactor-button-disabled')) return false;
-
-							var type = 'func';
-							var callback = btnObject.func;
-							if (btnObject.command)
-							{
-								type = 'command';
-								callback = btnObject.command;
-							}
-							else if (btnObject.dropdown)
-							{
-								type = 'dropdown';
-								callback = false;
-							}
-
-							this.button.onClick(e, btnName, type, callback);
-
-						}, this));
+						this.button.setEvent($button, btnName, btnObject);
 					}
 
 					// dropdown
 					if (btnObject.dropdown)
 					{
-						var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-box-' + btnName + '" style="display: none;">');
+						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);
 					}
@@ -1439,9 +1507,33 @@
 
 					return $button;
 				},
+				setEvent: function($button, btnName, btnObject)
+				{
+					$button.on('touchstart click', $.proxy(function(e)
+					{
+						if ($button.hasClass('redactor-button-disabled')) return false;
+
+						var type = 'func';
+						var callback = btnObject.func;
+
+						if (btnObject.command)
+						{
+							type = 'command';
+							callback = btnObject.command;
+						}
+						else if (btnObject.dropdown)
+						{
+							type = 'dropdown';
+							callback = false;
+						}
+
+						this.button.onClick(e, btnName, type, callback);
+
+					}, this));
+				},
 				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()
@@ -1449,13 +1541,11 @@
 						if ($(this).hasClass('redactor-button-disabled')) return;
 
 						var pos = $button.offset();
-						var height = $button.innerHeight();
-						var width = $button.innerWidth();
 
 						$tooltip.show();
 						$tooltip.css({
-							top: (pos.top + height) + 'px',
-							left: (pos.left + width/2 - $tooltip.innerWidth()/2) + 'px'
+							top: (pos.top + $button.innerHeight()) + 'px',
+							left: (pos.left + $button.innerWidth()/2 - $tooltip.innerWidth()/2) + 'px'
 						});
 					});
 
@@ -1473,38 +1563,25 @@
 
 					if (this.utils.browser('msie')) e.returnValue = false;
 
-					if (type == 'command')
-					{
-						this.inline.format(callback);
-					}
-					else if (type == 'dropdown')
-					{
-						this.dropdown.show(e, btnName);
-					}
-					else
+					if (type == 'command') this.inline.format(callback);
+					else if (type == 'dropdown') this.dropdown.show(e, btnName);
+					else this.button.onClickCallback(e, callback, btnName);
+				},
+				onClickCallback: function(e, callback, btnName)
+				{
+					var func;
+
+					if ($.isFunction(callback)) callback.call(this, btnName);
+					else if (callback.search(/\./) != '-1')
 					{
-						var func;
+						func = callback.split('.');
+						if (typeof this[func[0]] == 'undefined') return;
 
-						if ($.isFunction(callback))
-						{
-							callback.call(this, btnName);
-							this.observe.buttons(e, btnName);
-						}
-						else if (callback.search(/\./) != '-1')
-						{
-							func = callback.split('.');
-							if (typeof this[func[0]] != 'undefined')
-							{
-								this[func[0]][func[1]](btnName);
-								this.observe.buttons(e, btnName);
-							}
-						}
-						else
-						{
-							this[callback](btnName);
-							this.observe.buttons(e, btnName);
-						}
+						this[func[0]][func[1]](btnName);
 					}
+					else this[callback](btnName);
+
+					this.observe.buttons(e, btnName);
 				},
 				get: function(key)
 				{
@@ -1520,7 +1597,7 @@
 				},
 				setInactiveAll: function(key)
 				{
-					if (typeof key == 'undefined')
+					if (typeof key === 'undefined')
 					{
 						this.$toolbar.find('a.re-icon').removeClass('redactor-act');
 					}
@@ -1553,6 +1630,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)
@@ -1567,13 +1646,11 @@
 					var key = $btn.attr('rel');
 					this.button.addCallback($btn, 'dropdown');
 
-					var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-box-' + key + '" style="display: none;">');
+					var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-' + this.uuid + ' redactor-dropdown-box-' + key + '" style="display: none;">');
 					$btn.data('dropdown', $dropdown);
 
-					if (dropdown)
-					{
-						this.dropdown.build(key, $dropdown, dropdown);
-					}
+					// build dropdown
+					if (dropdown) this.dropdown.build(key, $dropdown, dropdown);
 
 					return $dropdown;
 				},
@@ -1581,6 +1658,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');
 
@@ -1592,7 +1671,10 @@
 				{
 					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));
 
 					return btn;
@@ -1601,10 +1683,13 @@
 				{
 					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);
 
-					if ($btn.size() !== 0) $btn.parent().after($('<li>').append(btn));
+					if ($btn.length !== 0) $btn.parent().after($('<li>').append(btn));
 					else this.$toolbar.append($('<li>').append(btn));
 
 					return btn;
@@ -1613,10 +1698,13 @@
 				{
 					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);
 
-					if ($btn.size() !== 0) $btn.parent().before($('<li>').append(btn));
+					if ($btn.length !== 0) $btn.parent().before($('<li>').append(btn));
 					else this.$toolbar.append($('<li>').append(btn));
 
 					return btn;
@@ -1624,6 +1712,10 @@
 				remove: function(key)
 				{
 					this.button.get(key).remove();
+				},
+				isMobileUndoRedo: function(key)
+				{
+					return (key == "undo" || key == "redo") && !this.utils.isDesktop();
 				}
 			};
 		},
@@ -1652,7 +1744,8 @@
 				set: function(orgn, orgo, focn, foco)
 				{
 					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
+					// disabled in 10.0.7
+					// if (!this.utils.browser('msie')) this.$editor.focus();
 
 					orgn = orgn[0] || orgn;
 					focn = focn[0] || focn;
@@ -1664,15 +1757,16 @@
 
 					if (orgn.tagName == 'BR' && this.opts.linebreaks === false)
 					{
-						var par = $(this.opts.emptyHtml)[0];
-						$(orgn).replaceWith(par);
-						orgn = par;
+						var parent = $(this.opts.emptyHtml)[0];
+						$(orgn).replaceWith(parent);
+						orgn = parent;
 						focn = orgn;
 					}
 
 					this.selection.get();
 
-					try {
+					try
+					{
 						this.range.setStart(orgn, orgo);
 						this.range.setEnd(focn, foco);
 					}
@@ -1682,7 +1776,8 @@
 				},
 				setAfter: function(node)
 				{
-					try {
+					try
+					{
 						var tag = $(node)[0].tagName;
 
 						// inline tag
@@ -1705,7 +1800,8 @@
 							}
 						}
 					}
-					catch (e) {
+					catch (e)
+					{
 						var space = this.utils.createSpaceElement();
 						$(node).after(space);
 						this.caret.setEnd(space);
@@ -1810,6 +1906,7 @@
 					this.range.collapse(false);
 					this.selection.addRange();
 				},
+				// deprecated
 				setToPoint: function(start, end)
 				{
 					this.caret.setOffset(start, end);
@@ -1832,9 +1929,9 @@
 
 					// replace dollar sign to entity
 					html = html.replace(/\$/g, '&#36;');
-					html = html.replace(/”/g, '"');
-					html = html.replace(/‘/g, '\'');
-					html = html.replace(/’/g, '\'');
+
+					// 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.linebreaks)  html = this.clean.replaceParagraphsToBr(html);
@@ -1915,14 +2012,23 @@
 					// remove br in the of li
 					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(/(style|rel)="\s*?"/, '');
+
 					// remove verified
-					html = html.replace(new RegExp('<div(.*?[^>]) data-tagblock="redactor"(.*?[^>])>', 'gi'), '<div$1$2>');
-					html = html.replace(new RegExp('<(.*?) data-verified="redactor"(.*?[^>])>', 'gi'), '<$1$2>');
-					html = html.replace(new RegExp('<span(.*?[^>])\srel="(.*?[^>])"(.*?[^>])>', 'gi'), '<span$1$3>');
-					html = html.replace(new RegExp('<img(.*?[^>])\srel="(.*?[^>])"(.*?[^>])>', 'gi'), '<img$1$3>');
-					html = html.replace(new RegExp('<img(.*?[^>])\sstyle="" (.*?[^>])>', 'gi'), '<img$1 $2>');
-					html = html.replace(new RegExp('<img(.*?[^>])\sstyle (.*?[^>])>', 'gi'), '<img$1 $2>');
-					html = html.replace(new RegExp('<span class="redactor-invisible-space">(.*?)</span>', 'gi'), '$1');
+					html = html.replace(/<div(.*?[^>]) data-tagblock="redactor"(.*?[^>])>/gi, '<div$1$2>');
+					html = html.replace(/<(.*?) data-verified="redactor"(.*?[^>])>/gi, '<$1$2>');
+
+					var $div = $("<div/>").html($.parseHTML(html, document, true));
+					$div.find("span").removeAttr("rel");
+
+					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
@@ -1945,9 +2051,7 @@
 					}
 
 					// reconvert inline
-					html = html.replace(/<(.*?) data-redactor-tag="(.*?)"(.*?[^>])>/gi, '<$1$3>');
-					html = html.replace(/<(.*?) data-redactor-class="(.*?)"(.*?[^>])>/gi, '<$1$3>');
-					html = html.replace(/<(.*?) data-redactor-style="(.*?)"(.*?[^>])>/gi, '<$1$3>');
+					html = html.replace(/\sdata-redactor-(tag|class|style)="(.*?[^>])"/gi, '');
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor"(.*?[^>])>', 'gi'), '<$1$2>');
 					html = html.replace(new RegExp('<(.*?) data-verified="redactor">', 'gi'), '<$1>');
 
@@ -1958,12 +2062,9 @@
 					html = $.trim(html);
 
 					html = html.replace(/\$/g, '&#36;');
-					html = html.replace(/”/g, '"');
-					html = html.replace(/“/g, '"');
-					html = html.replace(/‘/g, '\'');
-					html = html.replace(/’/g, '\'');
 
 					// convert dirty spaces
+					html = html.replace(/<span class="s1">/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, ' ');
@@ -1982,6 +2083,11 @@
 
 						if (this.utils.isCurrentOrParent('PRE'))
 						{
+							html = html.replace(/”/g, '"');
+							html = html.replace(/“/g, '"');
+							html = html.replace(/‘/g, '\'');
+							html = html.replace(/’/g, '\'');
+
 							return this.clean.getPreCode(html);
 						}
 
@@ -2047,6 +2153,7 @@
 					html = this.clean.onPasteRemoveSpans(html);
 					html = this.clean.onPasteRemoveEmpty(html);
 
+
 					html = this.clean.convertInline(html);
 
 					return html;
@@ -2059,20 +2166,105 @@
 					// style
 					html = html.replace(/<style[^>]*>[\s\S]*?<\/style>/gi, '');
 
-					if (/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(html))
+					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');
@@ -2091,12 +2283,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)
@@ -2191,18 +2377,16 @@
 					}
 
 					var options = {
-						deniedTags: false,
-						allowedTags: tags,
+						deniedTags: (this.opts.deniedTags) ? this.opts.deniedTags : false,
+						allowedTags: (this.opts.allowedTags) ? this.opts.allowedTags : tags,
 						removeComments: true,
 						removePhp: true,
-						removeAttr: false,
-						allowedAttr: attrAllowed,
+						removeAttr: (this.opts.removeAttr) ? this.opts.removeAttr : false,
+						allowedAttr: (this.opts.allowedAttr) ? this.opts.allowedAttr : attrAllowed,
 						removeEmpty: tagsEmpty
 					};
 
-
 					return this.tidy.load(html, options);
-
 				},
 				onPasteRemoveEmpty: function(html)
 				{
@@ -2268,33 +2452,69 @@
 				},
 				savePreCode: function(html)
 				{
-					var pre = html.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/gi);
+					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)
 						{
-							var arr = s.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/i);
+							var arr = s.match(/<pre(.*?)>([\w\W]*?)<\/pre>/i);
 
-							arr[3] = arr[3].replace(/<br\s?\/?>/g, '\n');
-							arr[3] = arr[3].replace(/&nbsp;/g, ' ');
+							arr[2] = arr[2].replace(/<br\s?\/?>/g, '\n');
+							arr[2] = arr[2].replace(/&nbsp;/g, ' ');
 
 							if (this.opts.preSpaces)
 							{
-								arr[3] = arr[3].replace(/\t/g, Array(this.opts.preSpaces + 1).join(' '));
+								arr[2] = arr[2].replace(/\t/g, Array(this.opts.preSpaces + 1).join(' '));
 							}
 
-							arr[3] = this.clean.encodeEntities(arr[3]);
+							arr[2] = this.clean.encodeEntities(arr[2]);
 
 							// $ fix
-							arr[3] = arr[3].replace(/\$/g, '&#36;');
+							arr[2] = arr[2].replace(/\$/g, '&#36;');
 
-							html = html.replace(s, '<' + arr[1] + arr[2] + '>' + arr[3] + '</' + arr[1] + '>');
+							html = html.replace(s, '<pre' + arr[1] + '>' + arr[2] + '</pre>');
 
 						}, this));
 					}
 
 					return html;
 				},
+				saveCodeFormatting: function(html)
+				{
+					var code = html.match(/<code(.*?)>([\w\W]*?)<\/code>/gi);
+
+					if (code !== null)
+					{
+						$.each(code, $.proxy(function(i,s)
+						{
+							var arr = s.match(/<code(.*?)>([\w\W]*?)<\/code>/i);
+
+							arr[2] = arr[2].replace(/&nbsp;/g, ' ');
+							arr[2] = this.clean.encodeEntities(arr[2]);
+							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');
@@ -2310,7 +2530,7 @@
 					html = this.clean.getTextFromHtml(html);
 					html = html.replace(/\n/g, '<br />');
 
-					if (this.opts.paragraphize && typeof paragraphize == 'undefined')
+					if (this.opts.paragraphize && typeof paragraphize == 'undefined' && !this.utils.browser('mozilla'))
 					{
 						html = this.paragraphize.load(html);
 					}
@@ -2398,23 +2618,30 @@
 						$s.attr('style', $s.attr('rel'));
 					});
 
+				},
+				cleanEmptyParagraph: function()
+				{
+
 				},
 				setVerified: function(html)
 				{
 					if (this.utils.browser('msie')) return html;
 
 					html = html.replace(new RegExp('<img(.*?[^>])>', 'gi'), '<img$1 data-verified="redactor">');
-					html = html.replace(new RegExp('<span(.*?)>', 'gi'), '<span$1 data-verified="redactor">');
+					html = html.replace(new RegExp('<span(.*?[^>])>', 'gi'), '<span$1 data-verified="redactor">');
 
 					var matches = html.match(new RegExp('<(span|img)(.*?)style="(.*?)"(.*?[^>])>', 'gi'));
+
 					if (matches)
 					{
 						var len = matches.length;
 						for (var i = 0; i < len; i++)
 						{
 							try {
+
 								var newTag = matches[i].replace(/style="(.*?)"/i, 'style="$1" rel="$1"');
-								html = html.replace(new RegExp(matches[i], 'gi'), newTag);
+								html = html.replace(matches[i], newTag);
+
 							}
 							catch (e) {}
 						}
@@ -2485,6 +2712,9 @@
 						html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '<p$1>$2</p>');
 					}
 
+					html = html.replace(/<div(.*?[^>])>/gi, '');
+					html = html.replace(/<\/div>/gi, '');
+
 					return html;
 				},
 				replaceDivsToBr: function(html)
@@ -2527,6 +2757,8 @@
 					this.$editor.html(html);
 					this.code.sync();
 
+					if (html !== '') this.placeholder.remove();
+
 					setTimeout($.proxy(this.buffer.add, this), 15);
 					if (this.start === false) this.observe.load();
 
@@ -2577,8 +2809,22 @@
 
 					this.start = false;
 
-					// autosave on change
+					if (this.autosave.html == false)
+					{
+						this.autosave.html = this.code.get();
+					}
+
+					if (this.opts.codemirror)
+					{
+						this.$textarea.next('.CodeMirror').each(function(i, el)
+						{
+							el.CodeMirror.setValue(html);
+						});
+					}
+
+					//autosave
 					this.autosave.onChange();
+					this.autosave.enable();
 				},
 				toggle: function()
 				{
@@ -2593,30 +2839,89 @@
 				},
 				showCode: function()
 				{
+					this.selection.save();
+
 					this.code.offset = this.caret.getOffset();
 					var scroll = $(window).scrollTop();
 
-					var height = this.$editor.innerHeight();
+					var	width = this.$editor.innerWidth(),
+						height = this.$editor.innerHeight();
 
 					this.$editor.hide();
 
 					var html = this.$textarea.val();
+
 					this.modified = this.clean.removeSpaces(html);
 
 					// indent code
 					html = this.tabifier.get(html);
 
-					this.$textarea.val(html).height(height).show().focus();
-					this.$textarea.on('keydown.redactor-textarea-indenting', this.code.textareaIndenting);
+					// caret position sync
+					var start = 0,
+						end = 0;
 
-					$(window).scrollTop(scroll);
+					var $editorDiv = $("<div/>").append($.parseHTML(this.clean.onSync(this.$editor.html()), document, true));
 
-					if (this.$textarea[0].setSelectionRange)
+					var $selectionMarkers = $editorDiv.find("span.redactor-selection-marker");
+
+					if ($selectionMarkers.length > 0)
 					{
-						this.$textarea[0].setSelectionRange(0, 0);
+						var editorHtml = this.tabifier.get($editorDiv.html());
+
+						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.$textarea[0].scrollTop = 0;
+					this.selection.removeMarkers();
+
+					this.$textarea.val(html);
+
+					if (this.opts.codemirror)
+					{
+						this.$textarea.next('.CodeMirror').each(function(i, el)
+						{
+							$(el).show();
+							el.CodeMirror.setValue(html);
+							el.CodeMirror.setSize(width, 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();
+						});
+					}
+					else
+					{
+						this.$textarea.height(height).show().focus();
+						this.$textarea.on('keydown.redactor-textarea-indenting', this.code.textareaIndenting);
+
+						$(window).scrollTop(scroll);
+
+						if (this.$textarea[0].setSelectionRange)
+						{
+							this.$textarea[0].setSelectionRange(start, end);
+						}
+
+						this.$textarea[0].scrollTop = 0;
+					}
 
 					this.opts.visual = false;
 
@@ -2626,15 +2931,66 @@
 				},
 				showVisual: function()
 				{
+					var html;
+
 					if (this.opts.visual) return;
 
-					var html = this.$textarea.hide().val();
+					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)
+					{
+						this.$textarea.next('.CodeMirror').hide();
+					}
+
 					this.$editor.show();
 
 					if (!this.utils.isEmpty(html))
@@ -2642,15 +2998,15 @@
 						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);
 				},
 				textareaIndenting: function(e)
 				{
@@ -2662,6 +3018,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;
 				}
 			};
 		},
@@ -2702,7 +3087,31 @@
 				},
 				setCallback: function(type, e, data)
 				{
-					var callback = this.opts[type + 'Callback'];
+					var eventName = type + 'Callback';
+					var eventNamespace = 'redactor';
+					var callback = this.opts[eventName];
+
+					if (this.$textarea)
+					{
+						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);
@@ -2714,18 +3123,40 @@
 				},
 				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('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);
+					$("body").off('scroll.redactor.' + this.uuid);
+					$(this.opts.toolbarFixedTarget).off('scroll.redactor.' + this.uuid);
+
 					// common
 					this.$editor.removeClass('redactor-editor redactor-linebreaks redactor-placeholder');
 					this.$editor.removeAttr('contenteditable');
 
 					var html = this.code.get();
 
+					if (this.opts.toolbar)
+					{
+						// dropdowns off
+						this.$toolbar.find('a').each(function()
+						{
+							var $el = $(this);
+							if ($el.data('dropdown'))
+							{
+								$el.data('dropdown').remove();
+								$el.data('dropdown', {});
+							}
+						});
+					}
+
 					if (this.build.isTextarea())
 					{
 						this.$box.after(this.$element);
@@ -2747,11 +3178,10 @@
 					if (this.$modalOverlay) this.$modalOverlay.remove();
 
 					// buttons tooltip
-					$('.redactor-toolbar-tooltip').remove();
+					$('.redactor-toolbar-tooltip-' + this.uuid).remove();
 
 					// autosave
 					clearInterval(this.autosaveInterval);
-
 				}
 			};
 		},
@@ -2764,21 +3194,31 @@
 					{
 						$.each(this.opts.formattingAdd, $.proxy(function(i,s)
 						{
-							var name = s.tag;
-							if (typeof s.class != 'undefined')
+							var name = s.tag,
+								func;
+
+							if (typeof s['class'] != 'undefined')
 							{
-								name = name + '-' + s.class;
+								name = name + '-' + s['class'];
 							}
 
 							s.type = (this.utils.isBlockTag(s.tag)) ? 'block' : 'inline';
-							var func = (s.type == 'inline') ? 'inline.formatting' : 'block.formatting';
+
+							if (typeof s.func !== "undefined")
+							{
+								func = s.func;
+							}
+							else
+							{
+								func = (s.type == 'inline') ? 'inline.formatting' : 'block.formatting';
+							}
 
 							if (this.opts.linebreaks && s.type == 'block' && s.tag == 'p') return;
 
 							this.formatting[name] = {
 								tag: s.tag,
 								style: s.style,
-								'class': s.class,
+								'class': s['class'],
 								attr: s.attr,
 								data: s.data,
 								clear: s.clear
@@ -2800,6 +3240,8 @@
 
 						$item.on('click', $.proxy(function(e)
 						{
+							e.preventDefault();
+
 							var type = 'func';
 							var callback = btnObject.func;
 							if (btnObject.command)
@@ -2814,6 +3256,7 @@
 							}
 
 							this.button.onClick(e, btnName, type, callback);
+							this.dropdown.hideAll();
 
 						}, this));
 
@@ -2859,7 +3302,7 @@
 						var dropdownWidth = $dropdown.width();
 						if ((keyPosition.left + dropdownWidth) > $(document).width())
 						{
-							keyPosition.left -= dropdownWidth;
+							keyPosition.left = Math.max(0, keyPosition.left - dropdownWidth);
 						}
 
 						var left = keyPosition.left + 'px';
@@ -2882,7 +3325,6 @@
 							$dropdown.css({ position: 'absolute', left: left, top: top }).show();
 						}
 
-
 						this.core.setCallback('dropdownShown', { dropdown: $dropdown, key: key, button: $button });
 					}
 
@@ -2914,7 +3356,8 @@
 					this.$toolbar.find('a.dropact').removeClass('redactor-act').removeClass('dropact');
 
 					$(document.body).removeClass('body-redactor-hidden').css('margin-right', 0);
-					$('.redactor-dropdown').hide();
+
+					$('.redactor-dropdown-' + this.uuid).hide();
 					this.core.setCallback('dropdownHide');
 				},
 				hide: function (e)
@@ -2988,7 +3431,7 @@
 					if (typeof json == 'string') return;
 
 					var linkmarker = $(this.$editor.find('a#filelink-marker'));
-					if (linkmarker.size() !== 0)
+					if (linkmarker.length !== 0)
 					{
 						linkmarker.removeAttr('id').removeAttr('style');
 					}
@@ -3008,7 +3451,7 @@
 
 					var first = this.$editor.children().first();
 
-					if (first.size() === 0) return;
+					if (first.length === 0) return;
 					if (first[0].length === 0 || first[0].tagName == 'BR' || first[0].nodeType == 3)
 					{
 						return;
@@ -3016,8 +3459,7 @@
 
 					if (first[0].tagName == 'UL' || first[0].tagName == 'OL')
 					{
-						first = first.find('li').first();
-						var child = first.children().first();
+						var child = first.find('li').first();
 						if (!this.utils.isBlock(child) && child.text() === '')
 						{
 							// empty inline tag in li
@@ -3044,6 +3486,8 @@
 					if (this.utils.browser('mozilla') || this.utils.browser('msie'))
 					{
 						var last = this.$editor.children().last();
+
+						this.$editor.focus();
 						this.caret.setEnd(last);
 					}
 					else
@@ -3086,7 +3530,7 @@
 				},
 				showEdit: function($image)
 				{
-					var $link = $image.closest('a');
+					var $link = $image.closest('a', this.$editor[0]);
 
 					this.modal.load('imageEdit', this.lang.get('edit'), 705);
 
@@ -3106,6 +3550,8 @@
 
 					}, this));
 
+					// hide link's tooltip
+					$('.redactor-link-tooltip').remove();
 
 					$('#redactor-image-title').val($image.attr('alt'));
 
@@ -3115,7 +3561,7 @@
 						var $redactorImageLink = $('#redactor-image-link');
 
 						$redactorImageLink.attr('href', $image.attr('src'));
-						if ($link.size() !== 0)
+						if ($link.length !== 0)
 						{
 							$redactorImageLink.val($link.attr('href'));
 							if ($link.attr('target') == '_blank') $('#redactor-image-link-blank').prop('checked', true);
@@ -3164,7 +3610,7 @@
 					this.image.hideResize();
 					this.buffer.set();
 
-					var $link = $image.closest('a');
+					var $link = $image.closest('a', this.$editor[0]);
 
 					$image.attr('alt', $('#redactor-image-title').val());
 
@@ -3174,9 +3620,19 @@
 					var link = $.trim($('#redactor-image-link').val());
 					if (link !== '')
 					{
+						// test url (add protocol)
+						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
+						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
+						var re2 = new RegExp('^' + pattern, 'i');
+
+						if (link.search(re) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
+						{
+							link = this.opts.linkProtocol + '://' + link;
+						}
+
 						var target = ($('#redactor-image-link-blank').prop('checked')) ? true : false;
 
-						if ($link.size() === 0)
+						if ($link.length === 0)
 						{
 							var a = $('<a href="' + link + '">' + this.utils.getOuterHtml($image) + '</a>');
 							if (target) a.attr('target', '_blank');
@@ -3196,7 +3652,7 @@
 							}
 						}
 					}
-					else if ($link.size() !== 0)
+					else if ($link.length !== 0)
 					{
 						$link.replaceWith(this.utils.getOuterHtml($image));
 
@@ -3216,16 +3672,16 @@
 					}
 
 					$image.on('mousedown', $.proxy(this.image.hideResize, this));
-					$image.on('click touchstart', $.proxy(function(e)
+					$image.on('click.redactor touchstart', $.proxy(function(e)
 					{
 						this.observe.image = $image;
 
-						if (this.$editor.find('#redactor-image-box').size() !== 0) return false;
+						if (this.$editor.find('#redactor-image-box').length !== 0) return false;
 
 						this.image.resizer = this.image.loadEditableControls($image);
 
-						$(document).on('click.redactor-image-resize-hide', $.proxy(this.image.hideResize, this));
-						this.$editor.on('click.redactor-image-resize-hide', $.proxy(this.image.hideResize, this));
+						$(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));
 
 						// resize
 						if (!this.opts.imageResizable) return;
@@ -3282,8 +3738,11 @@
 
 					if (height < 50 || width < 100) return;
 
+					var height = Math.round(this.image.resizeHandle.el.width() / this.image.resizeHandle.ratio);
+
+					this.image.resizeHandle.el.attr({width: width, height: height});
 		            this.image.resizeHandle.el.width(width);
-		            this.image.resizeHandle.el.height(this.image.resizeHandle.el.width()/this.image.resizeHandle.ratio);
+		            this.image.resizeHandle.el.height(height);
 
 		            this.code.sync();
 				},
@@ -3296,7 +3755,7 @@
 				},
 				onDrag: function(e)
 				{
-					if (this.$editor.find('#redactor-image-box').size() !== 0)
+					if (this.$editor.find('#redactor-image-box').length !== 0)
 					{
 						e.preventDefault();
 						return false;
@@ -3327,7 +3786,7 @@
 				},
 				hideResize: function(e)
 				{
-					if (e && $(e.target).closest('#redactor-image-box').length !== 0) return;
+					if (e && $(e.target).closest('#redactor-image-box', this.$editor[0]).length !== 0) return;
 					if (e && e.target.tagName == 'IMG')
 					{
 						var $image = $(e.target);
@@ -3335,7 +3794,7 @@
 					}
 
 					var imageBox = this.$editor.find('#redactor-image-box');
-					if (imageBox.size() === 0) return;
+					if (imageBox.length === 0) return;
 
 					if (this.opts.imageEditable)
 					{
@@ -3358,8 +3817,8 @@
 						return $(this).contents();
 					});
 
-					$(document).off('click.redactor-image-resize-hide');
-					this.$editor.off('click.redactor-image-resize-hide');
+					$(document).off('click.redactor-image-resize-hide.' + this.uuid);
+					this.$editor.off('click.redactor-image-resize-hide.' + this.uuid);
 
 					if (typeof this.image.resizeHandle !== 'undefined')
 					{
@@ -3439,21 +3898,21 @@
 				remove: function(image)
 				{
 					var $image = $(image);
-					var $link = $image.closest('a');
-					var $figure = $image.closest('figure');
+					var $link = $image.closest('a', this.$editor[0]);
+					var $figure = $image.closest('figure', this.$editor[0]);
 					var $parent = $image.parent();
-					if ($('#redactor-image-box').size() !== 0)
+					if ($('#redactor-image-box').length !== 0)
 					{
 						$parent = $('#redactor-image-box').parent();
 					}
 
 					var $next;
-					if ($figure.size() !== 0)
+					if ($figure.length !== 0)
 					{
 						$next = $figure.next();
 						$figure.remove();
 					}
-					else if ($link.size() !== 0)
+					else if ($link.length !== 0)
 					{
 						$parent = $link.parent();
 						$link.remove();
@@ -3465,7 +3924,7 @@
 
 					$('#redactor-image-box').remove();
 
-					if ($figure.size() !== 0)
+					if ($figure.length !== 0)
 					{
 						this.caret.setStart($next);
 					}
@@ -3525,7 +3984,6 @@
 					this.selection.restore();
 					this.buffer.set();
 
-
 					this.insert.html(this.utils.getOuterHtml(node), false);
 
 					var $image = this.$editor.find('img[data-redactor-inserted-image=true]').removeAttr('data-redactor-inserted-image');
@@ -3536,7 +3994,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;
@@ -3626,16 +4089,16 @@
 
 					var current = this.selection.getCurrent();
 
-					var $item = $(current).closest('li');
+					var $item = $(current).closest('li', this.$editor[0]);
 					var $parent = $item.parent();
-					if ($item.size() !== 0 && $parent.size() !== 0 && $parent[0].tagName == 'LI')
+					if ($item.length !== 0 && $parent.length !== 0 && $parent[0].tagName == 'LI')
 					{
 						$parent.after($item);
 					}
 
 					this.indent.fixEmptyIndent();
 
-					if (!this.opts.linebreaks && $item.size() === 0)
+					if (!this.opts.linebreaks && $item.length === 0)
 					{
 						document.execCommand('formatblock', false, 'p');
 						this.$editor.find('ul, ol, blockquote, p').each($.proxy(this.utils.removeEmpty, this));
@@ -3690,7 +4153,7 @@
 					var type, value;
 
 					if (typeof this.formatting[name].style != 'undefined') type = 'style';
-					else if (typeof this.formatting[name].class != 'undefined') type = 'class';
+					else if (typeof this.formatting[name]['class'] != 'undefined') type = 'class';
 
 					if (type) value = this.formatting[name][type];
 
@@ -3710,11 +4173,24 @@
 						if (tag == tags[i]) tag = replaced[i];
 					}
 
+					if (this.opts.allowedTags)
+					{
+						if ($.inArray(tag, this.opts.allowedTags) == -1) return;
+					}
+					else
+					{
+						if ($.inArray(tag, this.opts.deniedTags) !== -1) return;
+					}
+
 					this.inline.type = type || false;
 					this.inline.value = value || false;
 
 					this.buffer.set();
-					this.$editor.focus();
+
+					if (!this.utils.browser('msie'))
+					{
+						this.$editor.focus();
+					}
 
 					this.selection.get();
 
@@ -3730,17 +4206,23 @@
 				formatCollapsed: function(tag)
 				{
 					var current = this.selection.getCurrent();
-					var $parent = $(current).closest(tag + '[data-redactor-tag=' + tag + ']');
+					var $parent = $(current).closest(tag + '[data-redactor-tag=' + tag + ']', this.$editor[0]);
 
 					// inline there is
-					if ($parent.size() !== 0)
+					if ($parent.length !== 0 && (this.inline.type != 'style' && $parent[0].tagName != 'SPAN'))
 					{
-						this.caret.setAfter($parent[0]);
-
 						// remove empty
-						if (this.utils.isEmpty($parent.text())) $parent.remove();
+						if (this.utils.isEmpty($parent.text()))
+						{
+							this.caret.setAfter($parent[0]);
 
-						this.code.sync();
+							$parent.remove();
+							this.code.sync();
+						}
+						else if (this.utils.isEndOfElement($parent))
+						{
+							this.caret.setAfter($parent[0]);
+						}
 
 						return;
 					}
@@ -3763,7 +4245,6 @@
 					this.selection.save();
 					document.execCommand('strikethrough');
 
-
 					this.$editor.find('strike').each($.proxy(function(i,s)
 					{
 						var $el = $(s);
@@ -3838,13 +4319,37 @@
 				},
 				formatRemoveSameChildren: function($el, tag)
 				{
+					var self = this;
 					$el.children(tag).each(function()
 					{
 						var $child = $(this);
+
 						if (!$child.hasClass('redactor-selection-marker'))
 						{
-							$child.contents().unwrap();
+							if (self.inline.type == 'style')
+							{
+								var arr = self.inline.value.split(';');
+
+								for (var z = 0; z < arr.length; z++)
+								{
+									if (arr[z] === '') return;
+
+									var style = arr[z].split(':');
+									$child.css(style[0], '');
+
+									if (self.utils.removeEmptyAttr($child , 'style'))
+									{
+										$child.replaceWith($child.contents());
+									}
+
+								}
+							}
+							else
+							{
+								$child.contents().unwrap();
+							}
 						}
+
 					});
 				},
 				formatConvert: function(tag)
@@ -3858,15 +4363,25 @@
 						find = '[data-redactor-style="' + this.inline.value + '"]';
 					}
 
+					var self = this;
 					if (tag != 'del')
 					{
-						var self = this;
 						this.$editor.find('del').each(function(i,s)
 						{
 							self.utils.replaceToTag(s, 'inline');
 						});
 					}
 
+					if (tag != 'span')
+					{
+						this.$editor.find(tag).each(function()
+						{
+							var $el = $(this);
+							$el.replaceWith($('<strike />').html($el.contents()));
+
+						});
+					}
+
 					this.$editor.find('[data-redactor-tag="' + tag + '"]' + find).each(function()
 					{
 						if (find === '' && tag == 'span' && this.tagName.toLowerCase() == tag) return;
@@ -4194,7 +4709,10 @@
 					var html = this.utils.getOuterHtml(node);
 					html = this.clean.setVerified(html);
 
-					node = $(html)[0];
+					if (html.match(/</g) !== null)
+					{
+						node = $(html)[0];
+					}
 
 					this.selection.get();
 
@@ -4296,6 +4814,8 @@
 					}
 
 					this.range.insertNode(frag);
+					this.range.collapse(false);
+					this.selection.addRange();
 				}
 			};
 		},
@@ -4322,8 +4842,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);
 
@@ -4342,7 +4866,7 @@
 						var $table = false;
 						if (this.keydown.block && this.keydown.block.tagName === 'TD')
 						{
-							$table = $(this.keydown.block).closest('table');
+							$table = $(this.keydown.block).closest('table', this.$editor[0]);
 						}
 
 						if ($table && $table.find('td').last()[0] === this.keydown.block)
@@ -4398,7 +4922,7 @@
 							current = this.selection.getCurrent();
 							$next = $(current).next();
 
-							if ($next.size() !== 0 && $next[0].tagName == 'BR')
+							if ($next.length !== 0 && $next[0].tagName == 'BR')
 							{
 								return this.keydown.insertBreakLine(e);
 							}
@@ -4416,17 +4940,27 @@
 							current = this.selection.getCurrent();
 							$next = $(this.keydown.current).next();
 
-							if (current !== false && $(current).hasClass('redactor-invisible-space'))
+							if ($next.length !== 0 && $next[0].tagName == 'BR')
 							{
-								$(current).remove();
+								return this.keydown.insertBreakLine(e);
+							}
+							else if (current !== false && $(current).hasClass('redactor-invisible-space'))
+							{
+								this.caret.setAfter(current);
+								$(current).contents().unwrap();
+
 								return this.keydown.insertDblBreakLine(e);
 							}
 							else
 							{
-								if ($next.length === 0 && current === false && typeof $next.context != 'undefined')
+								if (this.utils.isEndOfEditor())
 								{
 									return this.keydown.insertDblBreakLine(e);
 								}
+								else if ($next.length === 0 && current === false && typeof $next.context != 'undefined')
+								{
+									return this.keydown.insertBreakLine(e);
+								}
 
 								return this.keydown.insertBreakLine(e);
 							}
@@ -4436,19 +4970,36 @@
 							setTimeout($.proxy(this.keydown.replaceDivToBreakLine, this), 1);
 						}
 						// paragraphs
-						else if (!this.opts.linebreaks && this.keydown.block && this.keydown.block.tagName !== 'LI')
+						else if (!this.opts.linebreaks && this.keydown.block)
 						{
-							setTimeout($.proxy(this.keydown.replaceDivToParagraph, this), 1);
+							if (this.keydown.block.tagName !== 'LI')
+							{
+								setTimeout($.proxy(this.keydown.replaceDivToParagraph, this), 1);
+							}
+							else
+							{
+								current = this.selection.getCurrent();
+								var $parent = $(current).closest('li', this.$editor[0]);
+								var $list = $parent.closest('ul,ol', this.$editor[0]);
+
+								if ($parent.length !== 0 && this.utils.isEmpty($parent.html()) && $list.next().length === 0 && this.utils.isEmpty($list.find("li").last().html()))
+								{
+									$list.find("li").last().remove();
+
+									var node = $(this.opts.emptyHtml);
+									$list.after(node);
+									this.caret.setStart(node);
+
+									return false;
+								}
+							}
 						}
 						else if (!this.opts.linebreaks && !this.keydown.block)
 						{
 							return this.keydown.insertParagraph(e);
 						}
-
-
 					}
 
-
 					// Shift+Enter or Ctrl+Enter
 					if (key === this.keyCode.ENTER && (e.ctrlKey || e.shiftKey))
 					{
@@ -4462,11 +5013,17 @@
 						return this.keydown.onTab(e, key);
 					}
 
-
 					// 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;
@@ -4474,7 +5031,7 @@
 							for (var i = 0; i < len; i++)
 							{
 								var children = $(nodes[i]).children('img');
-								if (children.size() !== 0)
+								if (children.length !== 0)
 								{
 									var self = this;
 									$.each(children, function(z,s)
@@ -4776,26 +5333,66 @@
 					e.stopPropagation();
 
 					this.selection.get();
+
 					var br1 = document.createElement('br');
 
-					this.range.deleteContents();
+					if (this.utils.browser('msie'))
+					{
+						this.range.collapse(false);
+						this.range.setEnd(this.range.endContainer, this.range.endOffset);
+					}
+					else
+					{
+						this.range.deleteContents();
+					}
+
 					this.range.insertNode(br1);
 
-					if (dbl === true)
-					{
+					// move br outside A tag
+					var $parentA = $(br1).parent("a");
+
+					if ($parentA.length > 0)
+					{
+						$parentA.find(br1)
+								.remove();
+
+						$parentA.after(br1);
+					}
+
+					if (dbl === true)
+					{
+						var $next = $(br1).next();
+						if ($next.length !== 0 && $next[0].tagName === 'BR' && this.utils.isEndOfEditor())
+						{
+							this.caret.setAfter(br1);
+							this.code.sync();
+							return false;
+						}
+
 						var br2 = document.createElement('br');
+
 						this.range.insertNode(br2);
 						this.caret.setAfter(br2);
 					}
 					else
 					{
-						this.caret.setAfter(br1);
+						this.keydown.insertBreakLineProcessingAfter(br1);
 					}
 
 					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);
@@ -4808,9 +5405,9 @@
 				{
 					var $current = $(this.keydown.current);
 					var $parent = $(this.keydown.parent);
-					var td = $current.closest('td');
+					var td = $current.closest('td', this.$editor[0]);
 
-					if (td.size() !== 0 && $current.closest('li') && $parent.children('li').size() === 1)
+					if (td.length !== 0 && $current.closest('li', this.$editor[0]) && $parent.children('li').length === 1)
 					{
 						if (!this.utils.isEmpty($current.text())) return;
 
@@ -4837,7 +5434,6 @@
 					this.keyup.parent = this.selection.getParent();
 					var $parent = this.utils.isRedactorParent($(this.keyup.parent).parent());
 
-
 					// callback
 					var keyupStop = this.core.setCallback('keyup', e);
 					if (keyupStop === false)
@@ -4866,13 +5462,8 @@
 					}
 
 					// linkify
-					if (this.keyup.isLinkify(key))
-					{
-						this.formatLinkify(this.opts.linkProtocol, this.opts.convertLinks, this.opts.convertUrlLinks, this.opts.convertImageLinks, this.opts.convertVideoLinks, this.opts.linkSize);
-
-						this.observe.load();
-						this.code.sync();
-					}
+					if (this.linkify.isEnabled() && this.linkify.isKey(key))
+						this.linkify.format();
 
 					if (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE)
 					{
@@ -4893,27 +5484,23 @@
 						}
 
 						// remove empty paragraphs
-						this.$editor.find('p').each($.proxy(this.utils.removeEmpty, this));
+						this.$editor.find('p').each($.proxy(function(i, s)
+						{
+							this.utils.removeEmpty(i, $(s).html());
+						}, this));
 
 						// remove invisible space
-						if (this.keyup.current && this.keyup.current.tagName == 'DIV' && this.utils.isEmpty(this.keyup.current.innerHTML))
+						if (this.opts.linebreaks && this.keyup.current && this.keyup.current.tagName == 'DIV' && this.utils.isEmpty(this.keyup.current.innerHTML))
 						{
-							if (this.opts.linebreaks)
-							{
-								$(this.keyup.current).after(this.selection.getMarkerAsHtml());
-								this.selection.restore();
-								$(this.keyup.current).remove();
-							}
+							$(this.keyup.current).after(this.selection.getMarkerAsHtml());
+							this.selection.restore();
+							$(this.keyup.current).remove();
 						}
 
 						// if empty
 						return this.keyup.formatEmpty(e);
 					}
 				},
-				isLinkify: function(key)
-				{
-					return this.opts.convertLinks && (this.opts.convertUrlLinks || this.opts.convertImageLinks || this.opts.convertVideoLinks) && key === this.keyCode.ENTER && !this.utils.isCurrentOrParent('PRE');
-				},
 				replaceToParagraph: function(clone)
 				{
 					var $current = $(this.keyup.current);
@@ -5094,24 +5681,27 @@
 				cleanUrl: function()
 				{
 					var thref = self.location.href.replace(/\/$/i, '');
-					this.link.url = this.link.url.replace(thref, '');
-					this.link.url = this.link.url.replace(/^\/#/, '#');
-					this.link.url = this.link.url.replace('mailto:', '');
 
-					// remove host from href
-					if (!this.opts.linkProtocol)
+					if (typeof this.link.url !== "undefined")
 					{
-						var re = new RegExp('^(http|ftp|https)://' + self.location.host, 'i');
-						this.link.url = this.link.url.replace(re, '');
-					}
+						this.link.url = this.link.url.replace(thref, '');
+						this.link.url = this.link.url.replace(/^\/#/, '#');
+						this.link.url = this.link.url.replace('mailto:', '');
 
+						// remove host from href
+						if (!this.opts.linkProtocol)
+						{
+							var re = new RegExp('^(http|ftp|https)://' + self.location.host, 'i');
+							this.link.url = this.link.url.replace(re, '');
+						}
+					}
 				},
 				getData: function()
 				{
 					this.link.$node = false;
 
-					var $el = $(this.selection.getCurrent()).closest('a');
-					if ($el.size() !== 0 && $el[0].tagName === 'A')
+					var $el = $(this.selection.getCurrent()).closest('a', this.$editor[0]);
+					if ($el.length !== 0 && $el[0].tagName === 'A')
 					{
 						this.link.$node = $el;
 
@@ -5129,6 +5719,8 @@
 				},
 				insert: function()
 				{
+					this.placeholder.remove();
+
 					var target = '';
 					var link = this.link.$inputUrl.val();
 					var text = this.link.$inputText.val();
@@ -5162,8 +5754,8 @@
 						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
 						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
 						var re2 = new RegExp('^' + pattern, 'i');
-
-						if (link.search(re) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
+						var re3 = new RegExp('\.(html|php)$', 'i');
+						if (link.search(re) == -1 && link.search(re3) == -1 && link.search(re2) === 0 && this.opts.linkProtocol)
 						{
 							link = this.opts.linkProtocol + '://' + link;
 						}
@@ -5185,16 +5777,37 @@
 					{
 						this.buffer.set();
 
-						this.link.$node.text(text).attr('href', link);
+						var $link = this.link.$node,
+							$el   = $link.children();
+
+						if ($el.length > 0)
+						{
+							while ($el.length)
+							{
+								$el = $el.children();
+							}
+
+							$el = $el.end();
+						}
+						else
+						{
+							$el = $link;
+						}
+
+						$link.attr('href', link);
+						$el.text(text);
+
 						if (target !== '')
 						{
-							this.link.$node.attr('target', target);
+							$link.attr('target', target);
 						}
 						else
 						{
-							this.link.$node.removeAttr('target');
+							$link.removeAttr('target');
 						}
 
+						this.selection.selectElement($link);
+
 						this.code.sync();
 					}
 					else
@@ -5216,20 +5829,36 @@
 								if (target !== '') $a.attr('target', target);
 
 								$a = $(this.insert.node($a));
+
+								if (this.selection.getText().match(/\s$/))
+								{
+									$a.after(" ");
+								}
+
 								this.selection.selectElement($a);
 							}
 							else
 							{
 								document.execCommand('createLink', false, link);
 
-								$a = $(this.selection.getCurrent()).closest('a');
+								$a = $(this.selection.getCurrent()).closest('a', this.$editor[0]);
+								if (this.utils.browser('mozilla'))
+								{
+									$a = $('a[_moz_dirty=""]');
+								}
 
 								if (target !== '') $a.attr('target', target);
-								$a.removeAttr('style');
+								$a.removeAttr('style').removeAttr('_moz_dirty');
+
+								if (this.selection.getText().match(/\s$/))
+								{
+									$a.after(" ");
+								}
 
-								if (this.link.text === '')
+								if (this.link.text !== '' || this.link.text != text)
 								{
 									$a.text(text);
+
 									this.selection.selectElement($a);
 								}
 							}
@@ -5249,7 +5878,10 @@
 				},
 				unlink: function(e)
 				{
-					if (typeof e != 'undefined' && e.preventDefault) e.preventDefault();
+					if (typeof e != 'undefined' && e.preventDefault)
+					{
+						e.preventDefault();
+					}
 
 					var nodes = this.selection.getNodes();
 					if (!nodes) return;
@@ -5259,11 +5891,8 @@
 					var len = nodes.length;
 					for (var i = 0; i < len; i++)
 					{
-						if (nodes[i].tagName == 'A')
-						{
-							var $node = $(nodes[i]);
-							$node.replaceWith($node.contents());
-						}
+						var $node = $(nodes[i]).closest('a', this.$editor[0]);
+						$node.replaceWith($node.contents());
 					}
 
 					// hide link's tooltip
@@ -5271,6 +5900,28 @@
 
 					this.code.sync();
 
+				},
+				toggleClass: function(className)
+				{
+					this.link.setClass(className, 'toggleClass');
+				},
+				addClass: function(className)
+				{
+					this.link.setClass(className, 'addClass');
+				},
+				removeClass: function(className)
+				{
+					this.link.setClass(className, 'removeClass');
+				},
+				setClass: function(className, func)
+				{
+					var links = this.selection.getInlinesTags(['a']);
+					if (links === false) return;
+
+					$.each(links, function()
+					{
+						$(this)[func](className);
+					});
 				}
 			};
 		},
@@ -5286,9 +5937,9 @@
 					this.selection.save();
 
 					var parent = this.selection.getParent();
-					var $list = $(parent).closest('ol, ul');
+					var $list = $(parent).closest('ol, ul', this.$editor[0]);
 
-					if (!this.utils.isRedactorParent($list) && $list.size() !== 0)
+					if (!this.utils.isRedactorParent($list) && $list.length !== 0)
 					{
 						$list = false;
 					}
@@ -5324,7 +5975,6 @@
 						}
 					}
 
-
 					this.selection.restore();
 					this.code.sync();
 				},
@@ -5332,7 +5982,7 @@
 				{
 					var parent = this.selection.getParent();
 					var current = this.selection.getCurrent();
-					var $td = $(current).closest('td, th');
+					var $td = $(current).closest('td, th', this.$editor[0]);
 
 					if (this.utils.browser('msie') && this.opts.linebreaks)
 					{
@@ -5343,9 +5993,9 @@
 						document.execCommand('insert' + cmd);
 					}
 
-					var $list = $(this.selection.getParent()).closest('ol, ul');
+					var $list = $(this.selection.getParent()).closest('ol, ul', this.$editor[0]);
 
-					if ($td.size() !== 0)
+					if ($td.length !== 0)
 					{
 						var prev = $td.prev();
 						var html = $td.html();
@@ -5430,15 +6080,15 @@
 
 					this.indent.fixEmptyIndent();
 
-					if (!this.opts.linebreaks && $current.closest('li, th, td').size() === 0)
+					if (!this.opts.linebreaks && $current.closest('li, th, td', this.$editor[0]).length === 0)
 					{
 						document.execCommand('formatblock', false, 'p');
 						this.$editor.find('ul, ol, blockquote').each($.proxy(this.utils.removeEmpty, this));
 					}
 
-					var $table = $(this.selection.getCurrent()).closest('table');
+					var $table = $(this.selection.getCurrent()).closest('table', this.$editor[0]);
 					var $prev = $table.prev();
-					if (!this.opts.linebreaks && $table.size() !== 0 && $prev.size() !== 0 && $prev[0].tagName == 'BR')
+					if (!this.opts.linebreaks && $table.length !== 0 && $prev.length !== 0 && $prev[0].tagName == 'BR')
 					{
 						$prev.remove();
 					}
@@ -5603,8 +6253,7 @@
 					$(document).off('focusin.modal');
 
 					// enter
-					this.$modal.find('input[type=text]').on('keydown.redactor-modal', $.proxy(this.modal.setEnter, this));
-
+					this.$modal.find('input[type=text],input[type=url],input[type=email]').on('keydown.redactor-modal', $.proxy(this.modal.setEnter, this));
 				},
 				showOnDesktop: function()
 				{
@@ -5702,7 +6351,7 @@
 				setButtonsWidth: function()
 				{
 					var buttons = this.$modalFooter.find('button');
-					var buttonsSize = buttons.size();
+					var buttonsSize = buttons.length;
 					if (buttonsSize === 0) return;
 
 					buttons.css('width', (100/buttonsSize) + '%');
@@ -5790,6 +6439,8 @@
 			return {
 				load: function()
 				{
+					if (typeof this.opts.destroyed != "undefined") return;
+
 					this.observe.images();
 					this.observe.links();
 				},
@@ -5798,7 +6449,14 @@
 					var current = this.selection.getCurrent();
 					var parent = this.selection.getParent();
 
-					this.button.setInactiveAll(btnName);
+					if (e !== false)
+					{
+						this.button.setInactiveAll();
+					}
+					else
+					{
+						this.button.setInactiveAll(btnName);
+					}
 
 					if (e === false && btnName !== 'html')
 					{
@@ -5811,19 +6469,19 @@
 
 					$.each(this.opts.activeButtonsStates, $.proxy(function(key, value)
 					{
-						var parentEl = $(parent).closest(key);
-						var currentEl = $(current).closest(key);
+						var parentEl = $(parent).closest(key, this.$editor[0]);
+						var currentEl = $(current).closest(key, this.$editor[0]);
 
 						if (parentEl.length !== 0 && !this.utils.isRedactorParent(parentEl)) return;
 						if (!this.utils.isRedactorParent(currentEl)) return;
-						if (parentEl.length !== 0 || currentEl.closest(key).length !== 0)
+						if (parentEl.length !== 0 || currentEl.closest(key, this.$editor[0]).length !== 0)
 						{
 							this.button.setActive(value);
 						}
 
 					}, this));
 
-					var $parent = $(parent).closest(this.opts.alignmentTags.toString().toLowerCase());
+					var $parent = $(parent).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
 					if (this.utils.isRedactorParent(parent) && $parent.length)
 					{
 						var align = ($parent.css('text-align') === '') ? 'left' : $parent.css('text-align');
@@ -5842,7 +6500,7 @@
 						var $img = $(img);
 
 						// IE fix (when we clicked on an image and then press backspace IE does goes to image's url)
-						$img.closest('a').on('click', function(e) { e.preventDefault(); });
+						$img.closest('a', this.$editor[0]).on('click', function(e) { e.preventDefault(); });
 
 						if (this.utils.browser('msie')) $img.attr('unselectable', 'on');
 
@@ -5850,7 +6508,7 @@
 
 					}, this));
 
-					$(document).on('click.redactor-image-delete', $.proxy(function(e)
+					$(document).on('click.redactor-image-delete.' + this.uuid, $.proxy(function(e)
 					{
 						this.observe.image = false;
 						if (e.target.tagName == 'IMG' && this.utils.isRedactorParent(e.target))
@@ -5865,9 +6523,9 @@
 				{
 					if (!this.opts.linkTooltip) return;
 
-					this.$editor.find('a').on('touchstart click', $.proxy(this.observe.showTooltip, this));
-					this.$editor.on('touchstart click.redactor', $.proxy(this.observe.closeTooltip, this));
-					$(document).on('touchstart click.redactor', $.proxy(this.observe.closeTooltip, this));
+					this.$editor.find('a').on('touchstart.redactor.' + this.uuid + ' click.redactor.' + this.uuid, $.proxy(this.observe.showTooltip, this));
+					this.$editor.on('touchstart.redactor.' + this.uuid + ' click.redactor.' + this.uuid, $.proxy(this.observe.closeTooltip, this));
+					$(document).on('touchstart.redactor.' + this.uuid + ' click.redactor.' + this.uuid, $.proxy(this.observe.closeTooltip, this));
 				},
 				getTooltipPosition: function($link)
 				{
@@ -5875,20 +6533,18 @@
 				},
 				showTooltip: function(e)
 				{
-					var $link = $(e.target);
-					var $parent = $link.closest('a');
-					var tag = ($link.size() !== 0) ? $link[0].tagName : false;
+					var $el = $(e.target);
 
-					if ($parent[0].tagName === 'A')
-					{
-						if (tag === 'IMG') return;
-						else if (tag !== 'A') $link = $parent;
-					}
+					if ($el[0].tagName == 'IMG')
+						return;
 
-					if (tag !== 'A')
-					{
+					if ($el[0].tagName !== 'A')
+						$el = $el.closest('a', this.$editor[0]);
+
+					if ($el[0].tagName !== 'A')
 						return;
-					}
+
+					var $link = $el;
 
 					var pos = this.observe.getTooltipPosition($link);
 					var tooltip = $('<span class="redactor-link-tooltip"></span>');
@@ -5907,7 +6563,7 @@
 
 					tooltip.append(aLink).append(' | ').append(aEdit).append(' | ').append(aUnlink);
 					tooltip.css({
-						top: (pos.top + 20) + 'px',
+						top: (pos.top + parseInt($link.css('line-height'), 10)) + 'px',
 						left: pos.left + 'px'
 					});
 
@@ -5919,8 +6575,8 @@
 					e = e.originalEvent || e;
 
 					var target = e.target;
-					var $parent = $(target).closest('a');
-					if ($parent.size() !== 0 && $parent[0].tagName === 'A' && target.tagName !== 'A')
+					var $parent = $(target).closest('a', this.$editor[0]);
+					if ($parent.length !== 0 && $parent[0].tagName === 'A' && target.tagName !== 'A')
 					{
 						return;
 					}
@@ -5942,10 +6598,6 @@
 					if (this.opts.linebreaks) return html;
 					if (html === '' || html === '<p></p>') return this.opts.emptyHtml;
 
-					this.paragraphize.blocks = ['table', 'div', 'pre', 'form', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'dl', 'blockquote', 'figcaption',
-					'address', 'section', 'header', 'footer', 'aside', 'article', 'object', 'style', 'script', 'iframe', 'select', 'input', 'textarea',
-					'button', 'option', 'map', 'area', 'math', 'hr', 'fieldset', 'legend', 'hgroup', 'nav', 'figure', 'details', 'menu', 'summary', 'p'];
-
 					html = html + "\n";
 
 					this.paragraphize.safes = [];
@@ -5960,7 +6612,7 @@
 					html = this.paragraphize.clear(html);
 					html = this.paragraphize.restoreSafes(html);
 
-					html = html.replace(new RegExp('<br\\s?/?>\n?<(' + this.paragraphize.blocks.join('|') + ')(.*?[^>])>', 'gi'), '<p><br /></p>\n<$1$2>');
+					html = html.replace(new RegExp('<br\\s?/?>\n?<(' + this.opts.paragraphizeBlocks.join('|') + ')(.*?[^>])>', 'gi'), '<p><br /></p>\n<$1$2>');
 
 					return $.trim(html);
 				},
@@ -5976,7 +6628,7 @@
 
 					html = $div.html();
 
-					$div.find(this.paragraphize.blocks.join(', ')).each($.proxy(function(i,s)
+					$div.find(this.opts.paragraphizeBlocks.join(', ')).each($.proxy(function(i,s)
 					{
 						this.paragraphize.z++;
 						this.paragraphize.safes[this.paragraphize.z] = s.outerHTML;
@@ -6005,7 +6657,9 @@
 				{
 					$.each(this.paragraphize.safes, function(i,s)
 					{
+						s = (typeof s !== 'undefined') ? s.replace(/\$/g, '&#36;') : s;
 						html = html.replace('{replace' + i + '}', s);
+
 					});
 
 					return html;
@@ -6073,7 +6727,11 @@
 			return {
 				init: function(e)
 				{
-					if (!this.opts.cleanOnPaste) return;
+					if (!this.opts.cleanOnPaste)
+					{
+						setTimeout($.proxy(this.code.sync, this), 1);
+						return;
+					}
 
 					this.rtePaste = true;
 
@@ -6102,14 +6760,24 @@
 
 						$(window).off('scroll.redactor-freeze');
 
-					}, this), 1);
+						if (this.linkify.isEnabled())
+							this.linkify.format();
 
+					}, this), 1);
 				},
 				createPasteBox: function()
 				{
 					this.$pasteBox = $('<div>').html('').attr('contenteditable', 'true').css({ position: 'fixed', width: 0, top: 0, left: '-9999px' });
 
-					this.$box.parent().append(this.$pasteBox);
+					if (this.utils.browser('msie'))
+					{
+						this.$box.append(this.$pasteBox);
+					}
+					else
+					{
+						$('body').append(this.$pasteBox);
+					}
+
 					this.$pasteBox.focus();
 				},
 				insert: function(html)
@@ -6160,14 +6828,16 @@
 					this.$editor.attr('placeholder', this.$element.attr('placeholder'));
 
 					this.placeholder.toggle();
-					this.$editor.on('keyup.redactor-placeholder', $.proxy(this.placeholder.toggle, this));
-
+					this.$editor.on('keydown.redactor-placeholder', $.proxy(this.placeholder.toggle, this));
 				},
 				toggle: function()
 				{
-					var func = 'removeClass';
-					if (this.utils.isEmpty(this.$editor.html(), false)) func = 'addClass';
-					this.$editor[func]('redactor-placeholder');
+					setTimeout($.proxy(function()
+					{
+						var func = this.utils.isEmpty(this.$editor.html(), false) ? 'addClass' : 'removeClass';
+
+						this.$editor[func]('redactor-placeholder');
+					}, this), 5);
 				},
 				remove: function()
 				{
@@ -6266,7 +6936,7 @@
 
 					return false;
 				},
-				getInlines: function(nodes)
+				getInlines: function(nodes, tags)
 				{
 					this.selection.get();
 
@@ -6276,9 +6946,18 @@
 					}
 
 					var inlines = [];
-					nodes = (typeof nodes == 'undefined') ? this.selection.getNodes() : nodes;
+					nodes = (typeof nodes == 'undefined' || nodes === false) ? this.selection.getNodes() : nodes;
 					var inlineTags = this.opts.inlineTags;
 					inlineTags.push('span');
+
+					if (typeof tags !== 'undefined')
+					{
+						for (var i = 0; i < tags.length; i++)
+						{
+							inlineTags.push(tags[i]);
+						}
+					}
+
 					$.each(nodes, $.proxy(function(i,node)
 					{
 						if ($.inArray(node.tagName.toLowerCase(), inlineTags) != -1)
@@ -6290,6 +6969,28 @@
 
 					return (inlines.length === 0) ? false : inlines;
 				},
+				getInlinesTags: function(tags)
+				{
+					this.selection.get();
+
+					if (this.range && this.range.collapsed)
+					{
+						return false;
+					}
+
+					var inlines = [];
+					var nodes =  this.selection.getNodes();
+					$.each(nodes, $.proxy(function(i,node)
+					{
+						if ($.inArray(node.tagName.toLowerCase(), tags) != -1)
+						{
+							inlines.push(node);
+						}
+
+					}, this));
+
+					return (inlines.length === 0) ? false : inlines;
+				},
 				getBlocks: function(nodes)
 				{
 					this.selection.get();
@@ -6323,15 +7024,23 @@
 
 					var startNode = this.selection.getNodesMarker(1);
 					var endNode = this.selection.getNodesMarker(2);
-
-					this.selection.setNodesMarker(this.range, startNode, true);
+					var range = this.range.cloneRange();
 
 					if (this.range.collapsed === false)
 					{
-						this.selection.setNodesMarker(this.range, endNode, false);
+						var startContainer = range.startContainer;
+						var startOffset = range.startOffset;
+
+						// end marker
+						this.selection.setNodesMarker(range, endNode, false);
+
+						// start marker
+						range.setStart(startContainer, startOffset);
+						this.selection.setNodesMarker(range, startNode, true);
 					}
 					else
 					{
+						this.selection.setNodesMarker(range, startNode, true);
 						endNode = startNode;
 					}
 
@@ -6389,8 +7098,6 @@
 				},
 				setNodesMarker: function(range, node, type)
 				{
-					range = range.cloneRange();
-
 					try {
 						range.collapse(type);
 						range.insertNode(node);
@@ -6500,7 +7207,12 @@
 				},
 				removeMarkers: function()
 				{
-					this.$editor.find('span.redactor-selection-marker').remove();
+					this.$editor.find('span.redactor-selection-marker').each(function(i,s)
+					{
+						var text = $(s).text().replace(/[\u200B-\u200D\uFEFF]/g, '');
+						if (text === '') $(s).remove();
+						else $(s).replaceWith(function() { return $(this).contents(); });
+					});
 				},
 				getText: function()
 				{
@@ -6526,6 +7238,37 @@
 					}
 
 					return this.clean.onSync(html);
+				},
+				replaceSelection: function(html)
+				{
+					this.selection.get();
+					this.range.deleteContents();
+					var div = document.createElement("div");
+					div.innerHTML = html;
+					var frag = document.createDocumentFragment(), child;
+					while ((child = div.firstChild)) {
+						frag.appendChild(child);
+					}
+
+					this.range.insertNode(frag);
+				},
+				replaceWithHtml: function(html)
+				{
+					html = this.selection.getMarkerAsHtml(1) + html + this.selection.getMarkerAsHtml(2);
+
+					this.selection.get();
+
+					if (window.getSelection && window.getSelection().getRangeAt)
+					{
+						this.selection.replaceSelection(html);
+					}
+					else if (document.selection && document.selection.createRange)
+					{
+						this.range.pasteHTML(html);
+					}
+
+					this.selection.restore();
+					this.code.sync();
 				}
 			};
 		},
@@ -6643,7 +7386,7 @@
 					// clean setup
 					var ownLine = ['area', 'body', 'head', 'hr', 'i?frame', 'link', 'meta', 'noscript', 'style', 'script', 'table', 'tbody', 'thead', 'tfoot'];
 					var contOwnLine = ['li', 'dt', 'dt', 'h[1-6]', 'option', 'script'];
-					var newLevel = ['blockquote', 'div', 'dl', 'fieldset', 'form', 'frameset', 'map', 'ol', 'p', 'pre', 'select', 'td', 'th', 'tr', 'ul'];
+					var newLevel = ['p', 'blockquote', 'div', 'dl', 'fieldset', 'form', 'frameset', 'map', 'ol', 'pre', 'select', 'td', 'th', 'tr', 'ul'];
 
 					this.tabifier.lineBefore = new RegExp('^<(/?' + ownLine.join('|/?' ) + '|' + contOwnLine.join('|') + ')[ >]');
 					this.tabifier.lineAfter = new RegExp('^<(br|/?' + ownLine.join('|/?' ) + '|/' + contOwnLine.join('|/') + ')[ >]');
@@ -6808,6 +7551,7 @@
 				placeTag: function (tag, out)
 				{
 					var nl = tag.match(this.tabifier.newLevel);
+
 					if (tag.match(this.tabifier.lineBefore) || nl)
 					{
 						out = out.replace(/\s*$/, '');
@@ -6823,7 +7567,7 @@
 					if (tag.match(this.tabifier.lineAfter) || tag.match(this.tabifier.newLevel))
 					{
 						out = out.replace(/ *$/, '');
-						out += '\n';
+						//out += '\n';
 					}
 
 					return out;
@@ -6924,24 +7668,13 @@
 						replacement.push(this.tidy.settings.replaceTags[i][0]);
 					}
 
-					this.tidy.$div.find(replacement.join(',')).each($.proxy(function(n,s)
+					$.each(replacement, $.proxy(function(key, value)
 					{
-						var tag = rTags[n];
-						$(s).replaceWith(function()
+						this.tidy.$div.find(value).replaceWith(function()
 						{
-							var replaced = $('<' + tag + ' />').append($(this).contents());
-
-							for (var i = 0; i < this.attributes.length; i++)
-							{
-								replaced.attr(this.attributes[i].name, this.attributes[i].value);
-							}
-
-							return replaced;
+							return $("<" + rTags[key] + " />", {html: $(this).html()});
 						});
-
 					}, this));
-
-					return html;
 				},
 				replaceStyles: function()
 				{
@@ -7334,8 +8067,17 @@
 					{
 						if (!this.opts.toolbar[btnName]) return;
 
-						if (this.opts.fileUpload === false && btnName === 'file') return true;
-						if ((this.opts.imageUpload === false && this.opts.s3 === false) && btnName === 'image') return true;
+						if (btnName === 'file')
+						{
+							 if (this.opts.fileUpload === false) return;
+							 else if (!this.opts.fileUpload && this.opts.s3 === false) return;
+						}
+
+						if (btnName === 'image')
+						{
+							 if (this.opts.imageUpload === false) return;
+							 else if (!this.opts.imageUpload && this.opts.s3 === false) return;
+						}
 
 						var btnObject = this.opts.toolbar[btnName];
 						this.$toolbar.append($('<li>').append(this.button.build(btnName, btnObject)));
@@ -7361,7 +8103,7 @@
 					if (!this.opts.toolbarFixed) return;
 
 					this.toolbar.observeScroll();
-					$(this.opts.toolbarFixedTarget).on('scroll.redactor', $.proxy(this.toolbar.observeScroll, this));
+					$(this.opts.toolbarFixedTarget).on('scroll.redactor.' + this.uuid, $.proxy(this.toolbar.observeScroll, this));
 
 				},
 				setOverflow: function()
@@ -7373,7 +8115,7 @@
 				},
 				isButtonSourceNeeded: function()
 				{
-					if (this.opts.buttonSource) return;
+					if (this.opts.source) return;
 
 					var index = this.opts.buttons.indexOf('html');
 					if (index !== -1)
@@ -7426,7 +8168,7 @@
 				{
 					var top = this.opts.toolbarFixedTopOffset + scrollTop - boxTop;
 					var left = 0;
-					var end = boxTop + this.$box.height() + 30;
+					var end = boxTop + this.$box.height() - 32;
 					var width = this.$box.innerWidth();
 
 					this.$toolbar.addClass('toolbar-fixed-box');
@@ -7437,6 +8179,9 @@
 						left: left
 					});
 
+					if (scrollTop > end)
+						$('.redactor-dropdown-' + this.uuid + ':visible').hide();
+
 					this.toolbar.setDropdownsFixed();
 					this.$toolbar.css('visibility', (scrollTop < end) ? 'visible' : 'hidden');
 				},
@@ -7452,7 +8197,6 @@
 
 					this.toolbar.unsetDropdownsFixed();
 					this.$toolbar.removeClass('toolbar-fixed-box');
-
 				},
 				setDropdownsFixed: function()
 				{
@@ -7464,7 +8208,7 @@
 						position = 'absolute';
 					}
 
-					$('.redactor-dropdown').each(function()
+					$('.redactor-dropdown-' + this.uuid).each(function()
 					{
 						$(this).css({ position: position, top: top + 'px' });
 					});
@@ -7472,7 +8216,7 @@
 				unsetDropdownsFixed: function()
 				{
 					var top = (this.$toolbar.innerHeight() + this.$toolbar.offset().top);
-					$('.redactor-dropdown').each(function()
+					$('.redactor-dropdown-' + this.uuid).each(function()
 					{
 						$(this).css({ position: 'absolute', top: top + 'px' });
 					});
@@ -7490,7 +8234,7 @@
 					this.upload.$el = $(id);
 					this.upload.$droparea = $('<div id="redactor-droparea" />');
 
-					this.upload.$placeholdler = $('<div id="redactor-droparea-placeholder" />').text('Drop file here or ');
+					this.upload.$placeholdler = $('<div id="redactor-droparea-placeholder" />').text(this.lang.get('upload_label'));
 					this.upload.$input = $('<input type="file" name="file" />');
 
 					this.upload.$placeholdler.append(this.upload.$input);
@@ -7551,6 +8295,7 @@
 					}
 
 					this.progress.show();
+					this.core.setCallback('uploadStart', e, formData);
 					this.upload.sendData(formData, e);
 				},
 				setConfig: function(file)
@@ -7601,6 +8346,7 @@
 
 					var xhr = new XMLHttpRequest();
 					xhr.open('POST', this.upload.url);
+					xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
 
 					// complete
 					xhr.onreadystatechange = $.proxy(function()
@@ -7838,6 +8584,7 @@
 					html = html.replace(/\s/g, '');
 					html = html.replace(/^<p>[^\W\w\D\d]*?<\/p>$/i, '');
 					html = html.replace(/<iframe(.*?[^>])>$/i, 'iframe');
+					html = html.replace(/<source(.*?[^>])>$/i, 'source');
 
 					// remove empty tags
 					if (removeEmptyTags !== false)
@@ -7902,12 +8649,13 @@
 				},
 				removeEmpty: function(i, s)
 				{
-					var $s = $(s);
+					var $s = $($.parseHTML(s));
 
 					$s.find('.redactor-invisible-space').removeAttr('style').removeAttr('class');
 
-					if ($s.find('hr, br, img, iframe').length !== 0) return;
+					if ($s.find('hr, br, img, iframe, source').length !== 0) return;
 					var text = $.trim($s.text());
+
 					if (this.utils.isEmpty(text, false))
 					{
 						$s.remove();
@@ -7917,8 +8665,6 @@
 				// save and restore scroll
 				saveScroll: function()
 				{
-					if (this.utils.isSelectAll()) return;
-
 					this.saveEditorScroll = this.$editor.scrollTop();
 					this.saveBodyScroll = $(window).scrollTop();
 
@@ -7963,6 +8709,8 @@
 
 						return $(this).contents();
 					});
+
+					return $(node);
 				},
 				replaceToTag: function(node, tag, removeInlineTags)
 				{
@@ -7995,13 +8743,25 @@
 
 					return (offset === 0) ? true : false;
 				},
-				isEndOfElement: function()
+				isEndOfElement: function(element)
 				{
-					var block = this.selection.getBlock();
-					if (!block) return false;
+					if (typeof element == 'undefined')
+					{
+						var element = this.selection.getBlock();
+						if (!element) return false;
+					}
+
+					var offset = this.caret.getOffsetOfElement(element);
+					var text = $.trim($(element).text()).replace(/\n\r\n/g, '');
+
+					return (offset == text.length) ? true : false;
+				},
+				isEndOfEditor: function()
+				{
+					var block = this.$editor[0];
 
 					var offset = this.caret.getOffsetOfElement(block);
-					var text = $.trim($(block).text()).replace(/\n\r\n/g, '');
+					var text = $.trim($(block).html().replace(/(<([^>]+)>)/gi,''));
 
 					return (offset == text.length) ? true : false;
 				},
@@ -8023,8 +8783,8 @@
 				// tag detection
 				isTag: function(current, tag)
 				{
-					var element = $(current).closest(tag);
-					if (element.size() == 1)
+					var element = $(current).closest(tag, this.$editor[0]);
+					if (element.length == 1)
 					{
 						return element[0];
 					}
@@ -8122,100 +8882,161 @@
 		            ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
 		            [];
 
+					if (browser == 'safari') return (typeof match[3] != 'undefined') ? match[3] == 'safari' : false;
 					if (browser == 'version') return match[2];
-					if (browser == 'webkit') return (match[1] == 'chrome' || match[1] == 'webkit');
+					if (browser == 'webkit') return (match[1] == 'chrome' || match[1] == 'opr' || match[1] == 'webkit');
 					if (match[1] == 'rv') return browser == 'msie';
 					if (match[1] == 'opr') return browser == 'webkit';
 
 					return browser == match[1];
-				}
-			};
-		}
-	};
+				},
 
-	// constructor
-	Redactor.prototype.init.prototype = Redactor.prototype;
+				strpos: function(haystack, needle, offset)
+				{
+					var i = haystack.indexOf(needle, offset);
+					return i >= 0 ? i : false;
+				},
+			};
+		},
+		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;
 
-	// LINKIFY
-	$.Redactor.fn.formatLinkify = function(protocol, convertLinks, convertUrlLinks, convertImageLinks, convertVideoLinks, linkSize)
-	{
-		var urlCheck = '((?:http[s]?:\\/\\/(?:www\\.)?|www\\.){1}(?:[0-9A-Za-z\\-%_]+\\.)+[a-zA-Z]{2,}(?::[0-9]+)?(?:(?:/[0-9A-Za-z\\-#\\.%\+_]*)+)?(?:\\?(?:[0-9A-Za-z\\-\\.%_]+(?:=[0-9A-Za-z\\-\\.%_\\+]*)?)?(?:&(?:[0-9A-Za-z\\-\\.%_]+(?:=[0-9A-Za-z\\-\\.%_\\+]*)?)?)*)?(?:#[0-9A-Za-z\\-\\.%_\\+=\\?&;]*)?)';
-		var regex = new RegExp(urlCheck, 'gi');
-		var rProtocol = /(https?|ftp):\/\//i;
-		var urlImage = /(https?:\/\/.*\.(?:png|jpg|jpeg|gif))/gi;
+					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;
 
-		var childNodes = (this.$editor ? this.$editor[0] : this).childNodes, i = childNodes.length;
-		while (i--)
-		{
-			var n = childNodes[i];
+							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);
+							}
 
-			if (n.nodeType === 3 && n.parentNode !== 'PRE')
-			{
-				var html = n.nodeValue;
+							$(this).before(text.replace(text, html))
+								   .remove();
+						});
 
-				// youtube & vimeo
-				if (convertVideoLinks && html)
+					this.code.sync();
+				},
+				convertVideoLinks: function(html)
 				{
 					var iframeStart = '<iframe width="500" height="281" src="',
 						iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
 
-					if (html.match(reUrlYoutube))
+					if (html.match(this.opts.linkify.regexps.youtube))
 					{
-						html = html.replace(reUrlYoutube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
-						$(n).after(html).remove();
+						html = html.replace(this.opts.linkify.regexps.youtube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
 					}
-					else if (html.match(reUrlVimeo))
+
+					if (html.match(this.opts.linkify.regexps.vimeo))
 					{
-						html = html.replace(reUrlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
-						$(n).after(html).remove();
+						html = html.replace(this.opts.linkify.regexps.vimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
 					}
-				}
 
-				// image
-				if (convertImageLinks && html && html.match(urlImage))
+					return html;
+				},
+				convertImages: function(html)
 				{
-					html = html.replace(urlImage, '<img src="$1" />');
+					var matches = html.match(this.opts.linkify.regexps.image);
 
-					$(n).after(html).remove();
-					return;
-				}
+					if (matches)
+					{
+						html = html.replace(html, '<img src="' + matches + '" />');
+
+						if (this.opts.linebreaks)
+						{
+							if (!this.utils.isEmpty(this.code.get()))
+							{
+								html = '<br>' + html;
+							}
+						}
 
-				// link
-				if (html.search(/\$/g) != -1) html = html.replace(/\$/g, '&#36;');
+						html+= '<br>';
+					}
 
-				var matches = html.match(regex);
-				if (convertUrlLinks && html && matches)
+					return html;
+				},
+				convertLinks: function(html)
 				{
+					var matches = html.match(this.opts.linkify.regexps.url);
 
-					var len = matches.length;
-					for (var z = 0; z < len; z++)
+					if (matches)
 					{
-						// remove dot in the end
-						if (matches[z].match(/\.$/) !== null) matches[z] = matches[z].replace(/\.$/, '');
+						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 + '://';
 
-						var href = matches[z];
-						var text = href;
+							if (href.match(/(https?|ftp):\/\//i) !== null)
+							{
+								linkProtocol = "";
+							}
+
+							if (text.length > this.opts.linkSize)
+							{
+								text = text.substring(0, this.opts.linkSize) + '...';
+							}
+
+							text = decodeURIComponent(text);
 
-						var space = '';
-						if (href.match(/\s$/) !== null) space = ' ';
+							var regexB = "\\b";
 
-						var addProtocol = protocol + '://';
-						if (href.match(rProtocol) !== null) addProtocol = '';
+							if ($.inArray(href.slice(-1), ["/", "&", "="]) != -1)
+							{
+								regexB = "";
+							}
 
-						if (text.length > linkSize) text = text.substring(0, linkSize) + '...';
-						text = text.replace(/&#36;/g, '$').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+							// escaping url
+							var regexp = new RegExp('(' + href.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + regexB + ')', 'g');
 
-						html = html.replace(href, '<a href=\"' + addProtocol + $.trim(href) + '\">' + $.trim(text) + '</a>' + space);
+							html = html.replace(regexp, '<a href="' + linkProtocol + $.trim(href) + '">' + $.trim(text) + '</a>');
+						}
 					}
 
-					$(n).after(html).remove();
+					return html;
 				}
 			}
-			else if (n.nodeType === 1 && !/^(pre|a|button|textarea)$/i.test(n.tagName))
-			{
-				$.Redactor.fn.formatLinkify.call(n, protocol, convertLinks, convertUrlLinks, convertImageLinks, convertVideoLinks, linkSize);
-			}
 		}
 	};
 
-})(jQuery);
\ No newline at end of file
+	$(window).on('load.tools.redactor', function()
+	{
+		$('[data-tools="redactor"]').redactor();
+	});
+
+	// constructor
+	Redactor.prototype.init.prototype = Redactor.prototype;
+})(jQuery);
diff --git a/bower.json b/bower.json
index 537c6f573..ceb699d62 100644
--- a/bower.json
+++ b/bower.json
@@ -22,7 +22,7 @@
     "angular-bootstrap": "~> 0.12",
     "angular-flash": "~> 0.1.14",
     "angular-bootstrap-datetimepicker": "~> 0.3.8",
-    "angular-redactor": "~> 1.1.4",
+    "angular-redactor": "~> 1.1.6",
     "ng-file-upload": "~> 3.2.4",
     "ng-table": "~> 0.5.4",
     "bootstrap-sass-official": "~> 3.3.7",

From 0898b8574fdecd474ff7245954fb7293f869051e Mon Sep 17 00:00:00 2001
From: Peter Halloran <peter.halloran@careerbuilder.com>
Date: Tue, 27 Jun 2017 16:07:25 -0500
Subject: [PATCH 2/2] fix: add in branch with Chrome bug fix

---
 .../legacy/controllers/posts/edit.js          |    1 -
 .../javascripts/legacy/vendor/inlinestyle.js  |   67 -
 .../javascripts/legacy/vendor/redactor.js     | 1744 +++++++++++++----
 3 files changed, 1366 insertions(+), 446 deletions(-)
 delete mode 100755 app/assets/javascripts/legacy/vendor/inlinestyle.js

diff --git a/app/assets/javascripts/legacy/controllers/posts/edit.js b/app/assets/javascripts/legacy/controllers/posts/edit.js
index f2d0c6b8e..18cbaa1bf 100644
--- a/app/assets/javascripts/legacy/controllers/posts/edit.js
+++ b/app/assets/javascripts/legacy/controllers/posts/edit.js
@@ -57,7 +57,6 @@ angular.module('cortex.controllers.posts.edit', [
   $scope.redactorOptions = {
     plugins: ['media', 'imageFit', 'inlinestyle'],
     minHeight: 800,
-    focus: true,
     buttonSource: true,
     deniedTags: ['html', 'head', 'link', 'body', 'applet'] // Allow script, style
   };
diff --git a/app/assets/javascripts/legacy/vendor/inlinestyle.js b/app/assets/javascripts/legacy/vendor/inlinestyle.js
deleted file mode 100755
index 993258e64..000000000
--- a/app/assets/javascripts/legacy/vendor/inlinestyle.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function($)
-{
-	$.Redactor.prototype.inlinestyle = function()
-	{
-		return {
-			langs: {
-				en: {
-					"style": "Style"
-				}
-			},
-			init: function()
-			{
-				var tags = {
-					"marked": {
-						title: "Marked",
-						args: ['mark']
-					},
-					"code": {
-						title: "Code",
-						args: ['code']
-					},
-					"sample": {
-						title: "Sample",
-						args: ['samp']
-					},
-					"variable": {
-						title: "Variable",
-						args: ['var']
-					},
-					"shortcut": {
-						title: "Shortcut",
-						args: ['kbd']
-					},
-					"cite": {
-						title: "Cite",
-						args: ['cite']
-					},
-					"sup": {
-						title: "Superscript",
-						args: ['sup']
-					},
-					"sub": {
-						title: "Subscript",
-						args: ['sub']
-					}
-				};
-
-
-				var that = this;
-				var dropdown = {};
-
-				$.each(tags, function(i, s)
-				{
-					dropdown[i] = { title: s.title, func: 'inline.format', args: s.args };
-				});
-
-
-				var button = this.button.addAfter('format', 'inline', this.lang.get('style'));
-				this.button.setIcon(button, '<i class="re-icon-inline"></i>');
-				this.button.addDropdown(button, dropdown);
-
-			}
-
-
-		};
-	};
-})(jQuery);
\ No newline at end of file
diff --git a/app/assets/javascripts/legacy/vendor/redactor.js b/app/assets/javascripts/legacy/vendor/redactor.js
index 553e3248e..fe045dbe3 100644
--- a/app/assets/javascripts/legacy/vendor/redactor.js
+++ b/app/assets/javascripts/legacy/vendor/redactor.js
@@ -1,6 +1,6 @@
 /*
-	Redactor v10.1.3
-	Updated: June 4, 2015
+	Redactor 10.2.1
+	Updated: July 6, 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.3';
+	$.Redactor.VERSION = '10.2.2';
 	$.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 = {
 
@@ -171,7 +172,10 @@
 		scrollTarget: false,
 
 		toolbar: true,
-		toolbarFixed: true,
+		/* concrete5 */
+		/*toolbarFixed: true,*/
+		toolbarFixed: false,
+		/* end concrete5 */
 		toolbarFixedTarget: document,
 		toolbarFixedTopOffset: 0, // pixels
 		toolbarExternal: false, // ID selector
@@ -179,7 +183,7 @@
 
 		source: true,
 		buttons: ['html', 'formatting', 'bold', 'italic', 'deleted', 'unorderedlist', 'orderedlist',
-				  'outdent', 'indent', 'image', 'file', 'link', 'alignment', 'horizontalrule'], // + 'underline'
+				  'outdent', 'indent', 'image', /* concrete5 'file', */ 'link', 'alignment', 'horizontalrule'], // + 'underline'
 
 		buttonsHide: [],
 		buttonsHideOnMobile: [],
@@ -241,6 +245,12 @@
 		},
 		shortcutsAdd: false,
 
+		concrete5: {
+			filemanager: false,
+			sitemap: false,
+			lightbox: false
+		},
+
 		// private
 		buffer: [],
 		rebuffer: [],
@@ -252,7 +262,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: {
@@ -298,7 +311,7 @@
 				columns: 'Columns',
 				add_head: 'Add Head',
 				delete_head: 'Delete Head',
-				title: 'Title',
+				alt: 'Alt',
 				image_position: 'Position',
 				none: 'None',
 				left: 'Left',
@@ -323,12 +336,32 @@
 				deleted: 'Deleted',
 				anchor: 'Anchor',
 				link_new_tab: 'Open link in new tab',
+				/* concrete5 */
+				link_same_window: 'Open link in same window',
+				in_lightbox: 'Open link in Lightbox',
+				lightbox_link_type: 'Link Type',
+				lightbox_link_type_iframe: 'Web Page',
+				lightbox_link_type_image: 'Image',
+				lightbox_link_type_iframe_options: 'Frame Options',
+				lightbox_link_type_iframe_width: 'Width',
+				lightbox_link_type_iframe_height: 'Height',
+				customStyles: 'Custom Styles',
+				remove_font: 'Remove font',
+				change_font_family: 'Change font family',
+				remove_font_size: 'Remove font size',
+				change_font_size: 'Change font size',
+				remove_style: 'Remove Style',
+				insert_character: 'Insert Character',
+				undo: 'Undo',
+				redo: 'Redo',
+				remove_font_family: 'Remove Font Family',
+				// Remember to add new strings also in in /concrete/controllers/frontend/assets_localization.php, function getRedactorJavascript
+				/* end concrete5 */
 				underline: 'Underline',
 				alignment: 'Alignment',
 				filename: 'Name (optional)',
 				edit: 'Edit',
 				upload_label: 'Drop file here or '
-
 			}
 		},
 
@@ -350,6 +383,7 @@
 		keyCode: {
 			BACKSPACE: 8,
 			DELETE: 46,
+			UP: 38,
 			DOWN: 40,
 			ENTER: 13,
 			SPACE: 32,
@@ -451,7 +485,6 @@
 				this[module][methods[z]] = this[module][methods[z]].bind(this);
 			}
 		},
-
 		alignment: function()
 		{
 			return {
@@ -562,7 +595,6 @@
 					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 = {};
@@ -654,6 +686,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;
@@ -667,10 +716,12 @@
 
 					this.selection.restore();
 					this.code.sync();
+					this.observe.load();
 
 				},
 				set: function(tag)
 				{
+
 					this.selection.get();
 					this.block.containerTag = this.range.commonAncestorContainer.tagName;
 
@@ -685,6 +736,16 @@
 				},
 				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;
 
@@ -699,7 +760,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();
@@ -710,7 +770,7 @@
 					{
 						if (this.opts.linebreaks && tag == 'p')
 						{
-							$(block).prepend('<br>').append('<br>');
+							$(block).append('<br>');
 							this.utils.replaceWithContents(block);
 						}
 						else
@@ -731,7 +791,7 @@
 						// blockquote off
 						if (this.opts.linebreaks)
 						{
-							$(block).prepend('<br>').append('<br>');
+							$(block).append('<br>');
 							this.utils.replaceWithContents(block);
 						}
 						else
@@ -745,6 +805,8 @@
 						this.block.toggle($(block));
 					}
 
+
+
 					if (typeof this.block.type == 'undefined' && typeof this.block.value == 'undefined')
 					{
 						$(block).removeAttr('class').removeAttr('style');
@@ -763,7 +825,7 @@
 							// blockquote off
 							if (this.opts.linebreaks)
 							{
-								$(block).prepend('<br>').append('<br>');
+								$(block).append('<br>');
 								this.utils.replaceWithContents(block);
 							}
 							else
@@ -1010,11 +1072,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();
@@ -1041,6 +1098,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)
 				{
@@ -1214,7 +1282,7 @@
 				},
 				createContainerBox: function()
 				{
-					this.$box = $('<div class="redactor-box" />');
+					this.$box = $('<div class="redactor-box" role="application" />');
 				},
 				createTextarea: function()
 				{
@@ -1388,23 +1456,26 @@
 						this.$editor.on('focus.redactor', $.proxy(this.opts.focusCallback, this));
 					}
 
-					var clickedElement;
-					$(document).on('mousedown', function(e) { clickedElement = e.target; });
+					$(document).on('mousedown.redactor.' + this.uuid, $.proxy(function(e) { this.blurClickedElement = e.target; }, this));
+
 
 					// blur
 					this.$editor.on('blur.redactor', $.proxy(function(e)
 					{
+						if (this.start) return;
 						if (this.rtePaste) return;
-						if (!this.build.isBlured(clickedElement)) return;
+						if (!this.build.isBlured()) return;
 
 						this.utils.disableSelectAll();
 						if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
 
 					}, this));
 				},
-				isBlured: function(clickedElement)
+				isBlured: function()
 				{
-					var $el = $(clickedElement);
+					if (this.blurClickedElement === true) return true;
+
+					var $el = $(this.blurClickedElement);
 
 					return (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').length === 0);
 				},
@@ -1427,21 +1498,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 +1520,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));
@@ -1471,7 +1541,7 @@
 				},
 				disableIeLinks: function()
 				{
-					if (!this.utils.browser('ie')) return;
+					if (!this.utils.browser('msie')) return;
 
 					// IE prevent converting links
 					document.execCommand("AutoUrlDetect", false, false);
@@ -1481,9 +1551,57 @@
 		button: function()
 		{
 			return {
+				/* concrete5 */
+				getClass: function(btnName)
+				{
+					switch(btnName) {
+						case 'html':
+							return 'fa fa-code';
+						case 'formatting':
+						case 'formatting-concrete5':
+							return 'fa fa-paragraph';
+						case 'orderedlist':
+							return 'fa fa-list-ol';
+						case 'unorderedlist':
+							return 'fa fa-list-ul';
+						case 'video':
+							return 'fa fa-file-video-o';
+						case 'alignment':
+							return 'fa fa-align-left';
+						case 'horizontalrule':
+							return 'fa fa-minus';
+						case 'deleted':
+							return 'fa fa-strikethrough';
+						case 'fontfamily':
+							return 'fa fa-font';
+						case 'fontsize':
+							return 'fa fa-text-height';
+						case 'fontcolor':
+							return 'fa fa-tint';
+						case 'backcolor':
+							return 'fa fa-tint';
+						case 'bold':
+							return 'fa fa-bold';
+						case 'italic':
+							return 'fa fa-italic';
+						case 'outdent':
+							return 'fa fa-outdent';
+						case 'indent':
+							return 'fa fa-indent';
+						case 'image':
+							return 'fa fa-image';
+						case 'link':
+							return 'fa fa-link';
+					}
+				},
+
+				/* end concrete5 */
 				build: function(btnName, btnObject)
 				{
-					var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
+					/* concrete5 */
+					//var $button = $('<a href="#" class="re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
+					var $button = $('<a href="#" class="' + this.button.getClass(btnName) + ' re-icon re-' + btnName + '" rel="' + btnName + '" />').attr('tabindex', '-1');
+					/* end concrete5 */
 
 					// click
 					if (btnObject.func || btnObject.command || btnObject.dropdown)
@@ -1494,7 +1612,11 @@
 					// dropdown
 					if (btnObject.dropdown)
 					{
-						var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-' + this.uuid + ' redactor-dropdown-box-' + btnName + '" style="display: none;">');
+						/* concrete5 */
+						//var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-' +  + this.uuid + ' redactor-dropdown-box-' + btnName + '" style="display: none;">');
+						var $dropdown = $('<ul class="dropdown-menu redactor-dropdown redactor-dropdown-' +  + this.uuid + ' redactor-dropdown-box-' + btnName + '" style="display: none;">');
+						/* end concrete5 */
+
 						$button.data('dropdown', $dropdown);
 						this.dropdown.build(btnName, $dropdown, btnObject.dropdown);
 					}
@@ -1571,6 +1693,9 @@
 				{
 					var func;
 
+					// blur
+					this.blurClickedElement = true;
+
 					if ($.isFunction(callback)) callback.call(this, btnName);
 					else if (callback.search(/\./) != '-1')
 					{
@@ -1608,11 +1733,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)
 				{
@@ -1625,8 +1750,11 @@
 				setAwesome: function(key, name)
 				{
 					var $button = this.button.get(key);
-					$button.removeClass('redactor-btn-image').addClass('fa-redactor-btn');
-					$button.html('<i class="fa ' + name + '"></i>');
+					/* concrete5 */
+					//$button.removeClass('redactor-btn-image').addClass('fa-redactor-btn');
+					//$button.html('<i class="fa ' + name + '"></i>');
+					$button.removeClass('redactor-btn-image').addClass('fa ' + name);
+					/* end concrete5 */
 				},
 				addCallback: function($btn, callback)
 				{
@@ -1643,10 +1771,16 @@
 				},
 				addDropdown: function($btn, dropdown)
 				{
+					$btn.addClass('redactor-toolbar-link-dropdown').attr('aria-haspopup', true);
+
 					var key = $btn.attr('rel');
 					this.button.addCallback($btn, 'dropdown');
 
-					var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-' + this.uuid + ' redactor-dropdown-box-' + key + '" style="display: none;">');
+					/* concrete5 */
+					//var $dropdown = $('<div class="redactor-dropdown redactor-dropdown-' +  + this.uuid + ' redactor-dropdown-box-' + key + '" style="display: none;">');
+					var $dropdown = $('<ul class="dropdown-menu redactor-dropdown redactor-dropdown-' +  + this.uuid + ' redactor-dropdown-box-' + key + '" style="display: none;">');
+					/* end concrete5 */
+
 					$btn.data('dropdown', $dropdown);
 
 					// build dropdown
@@ -1711,7 +1845,10 @@
 				},
 				remove: function(key)
 				{
-					this.button.get(key).remove();
+					/* concrete5 */
+					//this.button.get(key).remove();
+					this.button.get(key).parent().remove();
+					/* end concrete5 */
 				},
 				isMobileUndoRedo: function(key)
 				{
@@ -1739,7 +1876,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)
 				{
@@ -1887,7 +2031,7 @@
 					var node, offset = 0;
 					var walker = document.createTreeWalker(this.$editor[0], NodeFilter.SHOW_TEXT, null, null);
 
-					while (node = walker.nextNode())
+					while (node == walker.nextNode())
 					{
 						offset += node.nodeValue.length;
 						if (offset > start)
@@ -1954,6 +2098,7 @@
 
 						html = $div.html();
 					}
+
 					$div.remove();
 
 					// remove font tag
@@ -1972,12 +2117,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)
@@ -2009,12 +2156,32 @@
 						html = html.replace(new RegExp(i, 'g'), s);
 					});
 
+					// remove last br in FF
+					if (this.utils.browser('mozilla'))
+					{
+						html = html.replace(/<br\s?\/?>$/gi, '');
+					}
+
 					// remove br in the of li
 					html = html.replace(new RegExp('<br\\s?/?></li>', 'gi'), '</li>');
 					html = html.replace(new RegExp('</li><br\\s?/?>', 'gi'), '</li>');
 
+
+					/**
+					 * concrete5 start
+					 * This is commented out because it adds strange `"=""` strings to image tags in some cases.
+					 */
+					/*
 					// remove empty attributes
-					html = html.replace(/(style|rel)="\s*?"/, '');
+					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, '">');
+					*/
+					/**
+					 * concrete5 end
+					 */
 
 					// remove verified
 					html = html.replace(/<div(.*?[^>]) data-tagblock="redactor"(.*?[^>])>/gi, '<div$1$2>');
@@ -2023,12 +2190,17 @@
 					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
@@ -2055,16 +2227,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, ' ');
@@ -2166,6 +2339,9 @@
 					// style
 					html = html.replace(/<style[^>]*>[\s\S]*?<\/style>/gi, '');
 
+					// op
+					html = html.replace(/<o\:p[^>]*>[\s\S]*?<\/o\:p>/gi, '');
+
 					if (html.match(/class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i))
 					{
 						// comments
@@ -2211,7 +2387,7 @@
 
 								var $li = $("<li/>").html($(this).html());
 
-								$li.html($li.html().replace(/^([\w\.]+)\</, '<'));
+								$li.html($li.html().replace(/^([\w\.]+)</, '<'));
 								$li.find("span:first").remove();
 
 								if (currentLevel == 1 && $.inArray(currentList, listsIds) == -1)
@@ -2430,8 +2606,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, '');
@@ -2696,7 +2872,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;
 				},
@@ -2754,6 +2930,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();
 
@@ -2767,6 +2949,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);
 
@@ -2857,16 +3042,13 @@
 					html = this.tabifier.get(html);
 
 					// caret position sync
-					var start = 0,
-						end = 0;
-
+					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());
+						var editorHtml = this.tabifier.get($editorDiv.html()).replace(/&amp;/g, '&');
 
 						if ($selectionMarkers.length == 1)
 						{
@@ -2881,7 +3063,6 @@
 					}
 
 					this.selection.removeMarkers();
-
 					this.$textarea.val(html);
 
 					if (this.opts.codemirror)
@@ -2890,7 +3071,7 @@
 						{
 							$(el).show();
 							el.CodeMirror.setValue(html);
-							el.CodeMirror.setSize(width, height);
+							el.CodeMirror.setSize('100%', height);
 							el.CodeMirror.refresh();
 
 							if (start == end)
@@ -3131,6 +3312,7 @@
 					this.$element.off('.redactor').removeData('redactor');
 					this.$editor.off('.redactor');
 
+					$(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);
@@ -3230,12 +3412,19 @@
 							};
 
 						}, this));
-
 					}
 
 					$.each(dropdownObject, $.proxy(function(btnName, btnObject)
 					{
-						var $item = $('<a href="#" class="redactor-dropdown-' + btnName + '">' + btnObject.title + '</a>');
+						/* concrete5 */
+						//var $item = $('<a href="#" class="redactor-dropdown-' + btnName + '">' + btnObject.title + '</a>');
+						var className = '';
+						if (btnObject.className) {
+							className = btnObject.className;
+						}
+						var $item = $('<li><a href="#" class="' + className + ' redactor-dropdown-' + btnName + '">' + btnObject.title + '</a></li>');
+						/* end concrete5 */
+
 						if (name == 'formatting') $item.addClass('redactor-formatting-' + btnName);
 
 						$item.on('click', $.proxy(function(e)
@@ -3255,11 +3444,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));
@@ -3275,12 +3468,18 @@
 					var $button = this.button.get(key);
 
 					// 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);
+					/* concrete5 */
+					//var $dropdown = $button.data('dropdown').appendTo(document.body);
+					if ($('#redactor-dropdown-holder').length == 0) {
+						$(document.body).append('<div id="redactor-dropdown-holder" class="ccm-ui" />')
+					}
+					var ccmUI = $('#redactor-dropdown-holder');
+					var $dropdown= $button.data('dropdown').appendTo(ccmUI);
+					/* end concrete5 */
 
-					// 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'))
@@ -3290,6 +3489,8 @@
 					else
 					{
 						this.dropdown.hideAll();
+						this.observe.dropdowns();
+
 						this.core.setCallback('dropdownShow', { dropdown: $dropdown, key: key, button: $button });
 
 						this.button.setActive(key);
@@ -3326,46 +3527,55 @@
 						}
 
 						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');
-
-					 });
+						this.$dropdown = $dropdown;
+					}
 
-					$dropdown.on('mouseout', function() {
 
-						$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');
+						$dropdown.off('mouseover mouseout');
+
 						this.dropdown.hideAll();
 					}
 				}
@@ -3377,7 +3587,43 @@
 				show: function()
 				{
 					this.modal.load('file', this.lang.get('file'), 700);
-					this.upload.init('#redactor-modal-file-upload', this.opts.fileUpload, this.file.insert);
+					/* concrete5 */
+					//this.upload.init('#redactor-modal-file-upload', this.opts.fileUpload, this.file.insert);
+					this.modal.createCancelButton();
+					this.file.buttonSave = this.modal.createActionButton(this.lang.get('save'));
+
+					if (this.opts.concrete5.filemanager) {
+						$('a[data-action=choose-image-from-file-manager]').on('click', function(e) {
+							e.preventDefault();
+							ConcreteFileManager.launchDialog(function(data) {
+								jQuery.fn.dialog.showLoader();
+								ConcreteFileManager.getFileDetails(data.fID, function(r) {
+									jQuery.fn.dialog.hideLoader();
+									var file = r.files[0];
+									$('#redactor-file-link').val(file.urlDownload);
+								});
+							});
+						});
+					} else {
+						$('a[data-action=choose-image-from-file-manager]').remove();
+					}
+					this.file.buttonSave.on('click', $.proxy(function()
+					{
+						var val = $('#redactor-file-link').val();
+
+						if (val !== '')
+						{
+							var text = $('#redactor-filename').val();
+							var data  = '<a href="' + val + '" id="filelink-marker">' + text + '</a>';
+
+							this.file.insert(data, false);
+
+						}
+						else this.modal.close();
+
+					}, this));
+
+					/* end concrete5 */
 
 					this.selection.save();
 
@@ -3483,26 +3729,27 @@
 				},
 				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()
 				{
@@ -3522,7 +3769,44 @@
 				show: function()
 				{
 					this.modal.load('image', this.lang.get('image'), 700);
-					this.upload.init('#redactor-modal-image-droparea', this.opts.imageUpload, this.image.insert);
+					/* concrete5 */
+					//this.upload.init('#redactor-modal-image-droparea', this.opts.imageUpload, this.image.insert);
+					this.modal.createCancelButton();
+					this.image.buttonSave = this.modal.createActionButton(this.lang.get('save'));
+
+					if (this.opts.concrete5.filemanager) {
+						$('a[data-action=choose-image-from-file-manager]').on('click', function(e) {
+							e.preventDefault();
+							ConcreteFileManager.launchDialog(function(data) {
+								jQuery.fn.dialog.showLoader();
+								ConcreteFileManager.getFileDetails(data.fID, function(r) {
+									jQuery.fn.dialog.hideLoader();
+									var file = r.files[0];
+									$('#redactor-image-link').val(file.urlInline);
+								});
+							});
+						});
+					} else {
+						$('a[data-action=choose-image-from-file-manager]').remove();
+					}
+					this.image.buttonSave.on('click', $.proxy(function()
+					{
+						var val = $('#redactor-image-link').val();
+
+						if (val !== '')
+						{
+							var data = '<img id="image-marker" src="' + val + '" />';
+							if (this.opts.linebreaks === false) data = '<p>' + data + '</p>';
+
+							this.image.insert(data, false);
+
+						}
+						else this.modal.close();
+
+					}, this));
+
+					/* end concrete5 */
+
 
 					this.selection.save();
 					this.modal.show();
@@ -3534,6 +3818,95 @@
 
 					this.modal.load('imageEdit', this.lang.get('edit'), 705);
 
+					/* concrete5 */
+					this.image.linkLightboxType = 'image'; // not used unless link type is lightbox
+					this.image.linkLightboxIframeWidth = '600'; // not used unless link type is lightbox
+					this.image.linkLightboxIframeHeight = '400'; // not used unless link type is lightbox
+					var lightboxType = $link.attr('data-concrete5-link-lightbox');
+					if ($link.attr('target') == '_blank') {
+						this.image.linkType = 'blank';
+					} else if (lightboxType == 'image' || lightboxType == 'iframe') {
+						this.image.linkType = 'lightbox';
+						this.image.linkLightboxType = lightboxType;
+						this.image.linkLightboxIframeWidth = $link.attr('data-concrete5-link-lightbox-width');
+						this.image.linkLightboxIframeHeight = $link.attr('data-concrete5-link-lightbox-height');
+					} else {
+						this.image.linkType = 'same';
+					}
+					this.image.$selectUrlOpen = $('#redactor-link-url-open');
+					if (!this.opts.concrete5.lightbox) {
+						this.image.$selectUrlOpen.find('option[value=lightbox]').remove();
+					}
+					this.image.$selectUrlLightboxFieldGroup = $('div[data-field-group=lightbox]');
+					this.image.$selectUrlLightboxIframeFieldGroup = $('div[data-field-group=lightbox-iframe]');
+					this.image.$selectUrlLightboxFieldGroupSelect = $('div[data-field-group=lightbox] select');
+					this.image.$selectUrlLightboxIframeWidth = $('#redactor-link-lightbox-iframe-width');
+					this.image.$selectUrlLightboxIframeHeight = $('#redactor-link-lightbox-iframe-height');
+					this.image.$selectUrlOpen.val(this.image.linkType);
+					this.image.$selectUrlLightboxIframeWidth.val(this.image.linkLightboxIframeWidth);
+					this.image.$selectUrlLightboxIframeHeight.val(this.image.linkLightboxIframeHeight);
+					var _link = this.image;
+					this.image.$selectUrlOpen.on('change', function() {
+						if ($(this).val() == 'lightbox') {
+							_link.$selectUrlLightboxFieldGroup.show();
+						} else {
+							_link.$selectUrlLightboxFieldGroup.hide();
+							_link.$selectUrlLightboxFieldGroupSelect.val('image').trigger('change');
+						}
+					}).trigger('change');
+					this.image.$selectUrlLightboxFieldGroupSelect.val(this.image.linkLightboxType);
+					this.image.$selectUrlLightboxFieldGroupSelect.on('change', function() {
+						if ($(this).val() == 'iframe') {
+							_link.$selectUrlLightboxIframeFieldGroup.show();
+						} else {
+							_link.$selectUrlLightboxIframeFieldGroup.hide();
+						}
+					}).trigger('change');
+
+					if (this.opts.concrete5.filemanager) {
+						$('a[data-action=choose-file-from-file-manager]').on('click', function(e) {
+							e.preventDefault();
+							ConcreteFileManager.launchDialog(function(data) {
+								jQuery.fn.dialog.showLoader();
+								ConcreteFileManager.getFileDetails(data.fID, function(r) {
+									jQuery.fn.dialog.hideLoader();
+									var file = r.files[0];
+									$('#redactor-image-link').val(file.urlInline);
+								});
+							});
+						});
+					} else {
+						$('a[data-action=choose-file-from-file-manager]').remove();
+					}
+
+					if (this.opts.concrete5.sitemap) {
+						$('a[data-action=choose-link-from-sitemap]').on('click', function(e) {
+							e.preventDefault();
+							jQuery.fn.dialog.open({
+								width: '90%',
+								height: '70%',
+								modal: false,
+								title: ccmi18n_sitemap.choosePage,
+								href: CCM_TOOLS_PATH + '/sitemap_search_selector'
+							});
+							ConcreteEvent.unsubscribe('SitemapSelectPage');
+							ConcreteEvent.subscribe('SitemapSelectPage', function(e, data) {
+								jQuery.fn.dialog.closeTop();
+								var url = CCM_APPLICATION_URL + '/index.php?cID=' + data.cID;
+								$('#redactor-image-link').val(url);
+								this.link.$inputUrl.val(url);
+								this.link.$inputText.val(url);
+							});
+						});
+					} else {
+						$('a[data-action=choose-link-from-sitemap]').remove();
+					}
+
+					if (!this.opts.concrete5.sitemap && !this.opts.concrete5.filemanager) {
+						$('#redactor-image-link').parent().removeClass(); // remove the input group
+					}
+					/* end concrete5 */
+
 					this.modal.createCancelButton();
 					this.image.buttonDelete = this.modal.createDeleteButton(this.lang.get('_delete'));
 					this.image.buttonSave = this.modal.createActionButton(this.lang.get('save'));
@@ -3553,7 +3926,7 @@
 					// hide link's tooltip
 					$('.redactor-link-tooltip').remove();
 
-					$('#redactor-image-title').val($image.attr('alt'));
+					$('#redactor-image-alt').val($image.attr('alt'));
 
 					if (!this.opts.imageLink) $('.redactor-image-link-option').hide();
 					else
@@ -3576,6 +3949,7 @@
 					}
 
 					this.modal.show();
+					$('#redactor-image-alt').focus();
 
 				},
 				setFloating: function($image)
@@ -3612,12 +3986,14 @@
 
 					var $link = $image.closest('a', this.$editor[0]);
 
-					$image.attr('alt', $('#redactor-image-title').val());
+					var alt = $('#redactor-image-alt').val().replace(/(<([^>]+)>)/ig,"");
+					$image.attr('alt', alt);
 
 					this.image.setFloating($image);
 
 					// as link
 					var link = $.trim($('#redactor-image-link').val());
+					var link = link.replace(/(<([^>]+)>)/ig,"");
 					if (link !== '')
 					{
 						// test url (add protocol)
@@ -3630,17 +4006,49 @@
 							link = this.opts.linkProtocol + '://' + link;
 						}
 
-						var target = ($('#redactor-image-link-blank').prop('checked')) ? true : false;
+
+						/* concrete5 */
+						var target = false,
+							lightbox,
+							width,
+							height;
+
+						if ($('#redactor-link-url-open').val() == 'blank')
+						/* end concrete5 */
+						{
+							target = true;
+						}
+
+						/* concrete5 */
+						if ($('#redactor-link-url-open').val() == 'lightbox')
+						{
+							lightbox = $('#redactor-link-lightbox-type').val();
+							if (lightbox == 'iframe') {
+								width = $('#redactor-link-lightbox-iframe-width').val();
+								height = $('#redactor-link-lightbox-iframe-height').val();
+							}
+						}
 
 						if ($link.length === 0)
 						{
 							var a = $('<a href="' + link + '">' + this.utils.getOuterHtml($image) + '</a>');
 							if (target) a.attr('target', '_blank');
 
+							if (lightbox) {
+								a.attr('data-concrete5-link-lightbox', lightbox);
+								if (lightbox == 'iframe' && width && height) {
+									a.attr('data-concrete5-link-lightbox-width', width);
+									a.attr('data-concrete5-link-lightbox-height', height);
+								}
+							}
+
 							$image.replaceWith(a);
 						}
 						else
 						{
+							$link.removeAttr('data-concrete5-link-lightbox');
+							$link.removeAttr('data-concrete5-link-lightbox-width');
+							$link.removeAttr('data-concrete5-link-lightbox-height');
 							$link.attr('href', link);
 							if (target)
 							{
@@ -3650,6 +4058,13 @@
 							{
 								$link.removeAttr('target');
 							}
+							if (lightbox) {
+								$link.attr('data-concrete5-link-lightbox', lightbox);
+								if (lightbox == 'iframe' && width && height) {
+									$link.attr('data-concrete5-link-lightbox-width', width);
+									$link.attr('data-concrete5-link-lightbox-height', height);
+								}
+							}
 						}
 					}
 					else if ($link.length !== 0)
@@ -3671,17 +4086,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;
@@ -3691,8 +4103,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)
 				{
@@ -3796,12 +4211,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,
@@ -3817,8 +4228,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')
 					{
@@ -4083,18 +4494,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();
 
@@ -4162,6 +4567,12 @@
 				},
 				format: function(tag, type, value)
 				{
+					var current = this.selection.getCurrent();
+					if (current && current.tagName === 'TR') return;
+
+					// blur
+					this.blurClickedElement = true;
+
 					// Stop formatting pre and headers
 					if (this.utils.isCurrentOrParent('PRE') || this.utils.isCurrentOrParentHeader()) return;
 
@@ -4263,11 +4674,17 @@
 						}
 
 						$el.replaceWith($span.html($el.contents()));
+						var $parent = $span.parent();
+
+						// remove U tag if selected link + node
+						if ($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(';');
 
@@ -4295,8 +4712,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');
@@ -4357,7 +4782,10 @@
 					this.selection.save();
 
 					var find = '';
-					if (this.inline.type == 'class') find = '[data-redactor-class=' + this.inline.value + ']';
+					/*concrete5 */
+					//if (this.inline.type == 'class') find = '[data-redactor-class=' + this.inline.value + ']';
+					if (this.inline.type == 'class') find = '[data-redactor-class="' + this.inline.value + '"]';
+					/*end concrete5 */
 					else if (this.inline.type == 'style')
 					{
 						find = '[data-redactor-style="' + this.inline.value + '"]';
@@ -4797,6 +5225,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)
@@ -4964,6 +5393,7 @@
 
 								return this.keydown.insertBreakLine(e);
 							}
+
 						}
 						else if (this.opts.linebreaks && this.keydown.block)
 						{
@@ -4972,11 +5402,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]);
@@ -5016,12 +5444,6 @@
 					// 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)
@@ -5060,6 +5482,26 @@
 					// 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);
 					}
@@ -5206,7 +5648,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;
@@ -5353,9 +5795,7 @@
 
 					if ($parentA.length > 0)
 					{
-						$parentA.find(br1)
-								.remove();
-
+						$parentA.find(br1).remove();
 						$parentA.after(br1);
 					}
 
@@ -5376,23 +5816,31 @@
 					}
 					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.caret.setAfter(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);
@@ -5462,11 +5910,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();
 
@@ -5539,9 +5996,7 @@
 					}
 					else
 					{
-						html = '<p><br /></p>';
-
-						this.$editor.html(html);
+						this.$editor.html(this.opts.emptyHtml);
 						this.focus.setStart();
 					}
 
@@ -5621,7 +6076,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();
@@ -5630,16 +6085,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();
+
 				}
 			};
 		},
@@ -5650,17 +6132,58 @@
 				{
 					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();
 
 					this.link.getData();
 					this.link.cleanUrl();
 
-					if (this.link.target == '_blank') $('#redactor-link-blank').prop('checked', true);
+					/* concrete5 */
+					//if (this.link.target == '_blank') $('#redactor-link-blank').prop('checked', true);
+					this.link.$selectUrlOpen = $('#redactor-link-url-open');
+					if (!this.opts.concrete5.lightbox) {
+						this.link.$selectUrlOpen.find('option[value=lightbox]').remove();
+					}
+					this.link.$selectUrlLightboxFieldGroup = $('div[data-field-group=lightbox]');
+					this.link.$selectUrlLightboxIframeFieldGroup = $('div[data-field-group=lightbox-iframe]');
+					this.link.$selectUrlLightboxFieldGroupSelect = $('div[data-field-group=lightbox] select');
+					this.link.$selectUrlLightboxIframeWidth = $('#redactor-link-lightbox-iframe-width');
+					this.link.$selectUrlLightboxIframeHeight = $('#redactor-link-lightbox-iframe-height');
+					this.link.$selectUrlOpen.val(this.link.linkType);
+					this.link.$selectUrlLightboxIframeWidth.val(this.link.linkLightboxIframeWidth);
+					this.link.$selectUrlLightboxIframeHeight.val(this.link.linkLightboxIframeHeight);
+					var _link = this.link;
+					this.link.$selectUrlOpen.on('change', function() {
+						if ($(this).val() == 'lightbox') {
+							_link.$selectUrlLightboxFieldGroup.show();
+						} else {
+							_link.$selectUrlLightboxFieldGroup.hide();
+							_link.$selectUrlLightboxFieldGroupSelect.val('image').trigger('change');
+						}
+					}).trigger('change');
+					this.link.$selectUrlLightboxFieldGroupSelect.val(this.link.linkLightboxType);
+					this.link.$selectUrlLightboxFieldGroupSelect.on('change', function() {
+						if ($(this).val() == 'iframe') {
+							_link.$selectUrlLightboxIframeFieldGroup.show();
+						} else {
+							_link.$selectUrlLightboxIframeFieldGroup.hide();
+						}
+					}).trigger('change');
+					/* end concrete5 */
 
 					this.link.$inputUrl = $('#redactor-link-url');
 					this.link.$inputText = $('#redactor-link-url-text');
@@ -5673,6 +6196,50 @@
 					// hide link's tooltip
 					$('.redactor-link-tooltip').remove();
 
+                    /* concrete5 */
+					if (this.opts.concrete5.filemanager) {
+						$('a[data-action=choose-file-from-file-manager]').on('click', function(e) {
+							e.preventDefault();
+							ConcreteFileManager.launchDialog(function(data) {
+								jQuery.fn.dialog.showLoader();
+								ConcreteFileManager.getFileDetails(data.fID, function(r) {
+									jQuery.fn.dialog.hideLoader();
+									var file = r.files[0];
+									$('#redactor-link-url').val(file.urlDownload);
+								});
+							});
+						});
+					} else {
+						$('a[data-action=choose-file-from-file-manager]').remove();
+					}
+
+					if (this.opts.concrete5.sitemap) {
+                        $('a[data-action=choose-link-from-sitemap]').on('click', function(e) {
+                            e.preventDefault();
+                            jQuery.fn.dialog.open({
+                                width: '90%',
+                                height: '70%',
+                                modal: false,
+                                title: ccmi18n_sitemap.choosePage,
+                                href: CCM_TOOLS_PATH + '/sitemap_search_selector'
+                            });
+                            ConcreteEvent.unsubscribe('SitemapSelectPage');
+                            ConcreteEvent.subscribe('SitemapSelectPage', function(e, data) {
+                                jQuery.fn.dialog.closeTop();
+                                var url = CCM_APPLICATION_URL + '/index.php?cID=' + data.cID;
+                                $('#redactor-link-url').val(url);
+								this.link.$inputUrl.val(url);
+								this.link.$inputText.val(url);
+                            });
+                        });
+                    } else {
+                        $('a[data-action=choose-link-from-sitemap]').remove();
+                    }
+					if (!this.opts.concrete5.sitemap && !this.opts.concrete5.filemanager) {
+						$('#redactor-link-url').parent().removeClass(); // remove the input group
+					}
+					/* end concrete5 */
+
 					// show modal
 					this.selection.save();
 					this.modal.show();
@@ -5708,12 +6275,34 @@
 						this.link.url = $el.attr('href');
 						this.link.text = $el.text();
 						this.link.target = $el.attr('target');
+						/* concrete5 */
+						var lightboxType = $el.attr('data-concrete5-link-lightbox');
+						this.link.linkLightboxType = 'image'; // not used unless link type is lightbox
+						this.link.linkLightboxIframeWidth = '600'; // not used unless link type is lightbox
+						this.link.linkLightboxIframeHeight = '400'; // not used unless link type is lightbox
+						if (this.link.target == '_blank') {
+							this.link.linkType = 'blank';
+						} else if (lightboxType == 'image' || lightboxType == 'iframe') {
+							this.link.linkType = 'lightbox';
+							this.link.linkLightboxType = lightboxType;
+							this.link.linkLightboxIframeWidth = $el.attr('data-concrete5-link-lightbox-width');
+							this.link.linkLightboxIframeHeight = $el.attr('data-concrete5-link-lightbox-height');
+						} else {
+							this.link.linkType = 'same';
+						}
+						/* end concrete5 */
 					}
 					else
 					{
 						this.link.text = this.sel.toString();
 						this.link.url = '';
 						this.link.target = '';
+						/* concrete5 */
+						this.link.linkType = 'same';
+						this.link.linkLightboxType = 'image'; // not used unless link type is lightbox
+						this.link.linkLightboxIframeWidth = '600'; // not used unless link type is lightbox
+						this.link.linkLightboxIframeHeight = '400'; // not used unless link type is lightbox
+						/* end concrete5 */
 					}
 
 				},
@@ -5723,7 +6312,10 @@
 
 					var target = '';
 					var link = this.link.$inputUrl.val();
-					var text = this.link.$inputText.val();
+					var text = this.link.$inputText.val().replace(/(<([^>]+)>)/ig,"");
+					/* concrete5 */
+					var lightbox = null, width = null, height = null;
+					/* end concrete5 */
 
 					if ($.trim(link) === '')
 					{
@@ -5745,11 +6337,25 @@
 					// url, not anchor
 					else if (link.search('#') !== 0)
 					{
-						if ($('#redactor-link-blank').prop('checked'))
+
+						/* concrete5 */
+						//if ($('#redactor-link-blank').prop('checked'))
+						if ($('#redactor-link-url-open').val() == 'blank')
+						/* end concrete5 */
 						{
 							target = '_blank';
 						}
 
+						/* concrete5 */
+						if ($('#redactor-link-url-open').val() == 'lightbox')
+						{
+							lightbox = $('#redactor-link-lightbox-type').val();
+							if (lightbox == 'iframe') {
+								width = $('#redactor-link-lightbox-iframe-width').val();
+								height = $('#redactor-link-lightbox-iframe-height').val();
+							}
+						}
+
 						// test url (add protocol)
 						var pattern = '((xn--)?[a-z0-9]+(-[a-z0-9]+)*\\.)+[a-z]{2,}';
 						var re = new RegExp('^(http|ftp|https)://' + pattern, 'i');
@@ -5761,14 +6367,20 @@
 						}
 					}
 
-					this.link.set(text, link, target);
+					/* concrete5 */
+					//this.link.set(text, link, target);
+					this.link.set(text, link, target, lightbox, width, height);
+					/* end concrete5 */
 					this.modal.close();
 				},
-				set: function(text, link, target)
+				/* concrete5 */
+				//set: function(text, link, target)
+				set: function(text, link, target, lightbox, width, height)
 				{
 					text = $.trim(text.replace(/<|>/g, ''));
 
 					this.selection.restore();
+					var blocks = this.selection.getBlocks();
 
 					if (text === '' && link === '') return;
 					if (text === '' && link !== '') text = link;
@@ -5797,6 +6409,12 @@
 						$link.attr('href', link);
 						$el.text(text);
 
+						/* concrete5 */
+						$link.removeAttr('data-concrete5-link-lightbox');
+						$link.removeAttr('data-concrete5-link-lightbox-width');
+						$link.removeAttr('data-concrete5-link-lightbox-height');
+						/* end concrete5  */
+
 						if (target !== '')
 						{
 							$link.attr('target', target);
@@ -5804,6 +6422,15 @@
 						else
 						{
 							$link.removeAttr('target');
+							/* concrete5 */
+							if (lightbox) {
+								$link.attr('data-concrete5-link-lightbox', lightbox);
+								if (lightbox == 'iframe' && width && height) {
+									$link.attr('data-concrete5-link-lightbox-width', width);
+									$link.attr('data-concrete5-link-lightbox-height', height);
+								}
+							}
+							/* end concrete5  */
 						}
 
 						this.selection.selectElement($link);
@@ -5857,13 +6484,26 @@
 
 								if (this.link.text !== '' || this.link.text != text)
 								{
-									$a.text(text);
+									if (!this.opts.linebreaks && blocks && blocks.length <= 1)
+									{
+										$a.text(text);
+									}
 
 									this.selection.selectElement($a);
 								}
 							}
 						}
 
+						/* concrete5 */
+						if (lightbox) {
+							$a.attr('data-concrete5-link-lightbox', lightbox);
+							if (lightbox == 'iframe' && width && height) {
+								$a.attr('data-concrete5-link-lightbox-width', width);
+								$a.attr('data-concrete5-link-lightbox-height', height);
+							}
+						}
+						/* end concrete5  */
+
 						this.code.sync();
 						this.core.setCallback('insertedLink', $a);
 
@@ -5889,12 +6529,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();
 
@@ -5925,6 +6573,153 @@
 				}
 			};
 		},
+		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
+					this.core.setCallback('linkify', objects);
+
+					// 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) + '...';
+							}
+
+							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 {
@@ -5967,7 +6762,7 @@
 					{
 						if (remove)
 						{
-							this.list.remove(cmd);
+							this.list.remove(cmd, $list);
 						}
 						else
 						{
@@ -5980,7 +6775,6 @@
 				},
 				insert: function(cmd)
 				{
-					var parent = this.selection.getParent();
 					var current = this.selection.getCurrent();
 					var $td = $(current).closest('td, th', this.$editor[0]);
 
@@ -5993,23 +6787,12 @@
 						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()))
@@ -6017,6 +6800,11 @@
 						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)
@@ -6072,8 +6860,11 @@
 						$(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());
@@ -6102,46 +6893,105 @@
 		{
 			return {
 				callbacks: {},
+				/* concrete5 */
+				getLinkFields: function() {
+					var fields = String()
+					+ '<div class="form-group">'
+					+ '<label class="control-label">' + this.lang.get('open_link') + '</label>'
+					+ '<select class="form-control" id="redactor-link-url-open">'
+					+ '<option value="same">' + this.lang.get('link_same_window') + '</option>'
+					+ '<option value="blank">' + this.lang.get('link_new_tab') + '</option>'
+					+ '<option value="lightbox">' + this.lang.get('in_lightbox') + '</option>'
+					+ '</select>'
+					+ '</div>'
+					+ '<div data-field-group="lightbox" style="display: none" class="form-group">'
+					+ '<label class="control-label">' + this.lang.get('lightbox_link_type') + '</label>'
+					+ '<select class="form-control" id="redactor-link-lightbox-type">'
+					+ '<option value="image">' + this.lang.get('lightbox_link_type_image') + '</option>'
+					+ '<option value="iframe">' + this.lang.get('lightbox_link_type_iframe') + '</option>'
+					+ '</select>'
+					+ '</div>'
+					+ '<div data-field-group="lightbox-iframe" style="display: none">'
+					+ '<div class="form-group">'
+					+ '<label class="control-label">' + this.lang.get('lightbox_link_type_iframe_width') + '</label>'
+					+ '<input class="form-control" type="text" id="redactor-link-lightbox-iframe-width" />'
+					+ '</div>'
+					+ '<div class="form-group">'
+					+ '<label class="control-label">' + this.lang.get('lightbox_link_type_iframe_height') + '</label>'
+					+ '<input class="form-control" type="text" id="redactor-link-lightbox-iframe-height" />'
+					+ '</div>'
+					+ '</div>'
+					return fields;
+				},
+				/* end concrete5 */
 				loadTemplates: function()
 				{
 					this.opts.modal = {
 						imageEdit: String()
 						+ '<section id="redactor-modal-image-edit">'
-							+ '<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>'
-							+ '<label class="redactor-image-position-option">' + this.lang.get('image_position') + '</label>'
-							+ '<select class="redactor-image-position-option" id="redactor-image-align">'
-								+ '<option value="none">' + this.lang.get('none') + '</option>'
-								+ '<option value="left">' + this.lang.get('left') + '</option>'
-								+ '<option value="center">' + this.lang.get('center') + '</option>'
-								+ '<option value="right">' + this.lang.get('right') + '</option>'
+    						+ '<div class="form-group">'
+							+ '<label class="control-label">' + this.lang.get('alt') + '</label>'
+ 							+ '<input type="text" class="form-control" id="redactor-image-alt" />'
+						    + '</div>'
+							+ '<div class="form-group">'
+						    + '<label class="control-label redactor-image-link-option">' + this.lang.get('link') + '</label>'
+							+ '<div class="input-group">'
+							+ '<input type="text" class="form-control" id="redactor-image-link" />'
+							+ '<a href="#" data-action="choose-link-from-sitemap" class="btn btn-default input-group-addon"><i class="fa fa-sitemap"></i></a>'
+							+ '<a href="#" data-action="choose-file-from-file-manager" class="btn btn-default input-group-addon"><i class="fa fa-file"></i></a>'
+							+ '</div>'
+							+ '</div>'
+    						+ this.modal.getLinkFields()
+							+ '<div class="form-group">'
+						    + '<label class="control-label redactor-image-position-option">' + this.lang.get('image_position') + '</label>'
+							+ '<select class="form-control redactor-image-position-option" id="redactor-image-align">'
+							+ '<option value="none">' + this.lang.get('none') + '</option>'
+							+ '<option value="left">' + this.lang.get('left') + '</option>'
+							+ '<option value="center">' + this.lang.get('center') + '</option>'
+							+ '<option value="right">' + this.lang.get('right') + '</option>'
 							+ '</select>'
+							+ '</div>'
 						+ '</section>',
 
 						image: String()
 						+ '<section id="redactor-modal-image-insert">'
-							+ '<div id="redactor-modal-image-droparea"></div>'
- 						+ '</section>',
+						+ '<div class="form-group">'
+						+ '<label class="control-label">' + this.lang.get('image_web_link') + '</label>'
+						+ '<div class="input-group">'
+						+ '<input type="text" name="redactor-image-link" id="redactor-image-link" class="form-control"  />'
+						+ '<a href="#" data-action="choose-image-from-file-manager" class="btn btn-default input-group-addon"><i class="fa fa-search"></i></a>'
+						+ '</div></div>'
+						+ '</section>',
 
 						file: String()
 						+ '<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>'
-								+ '<div id="redactor-modal-file-upload"></div>'
-							+ '</div>'
+						+ '<div class="form-group">'
+						+ '<label class="control-label">' + this.lang.get('file') + '</label>'
+						+ '<div class="input-group">'
+						+ '<input type="text" name="redactor-file-link" id="redactor-file-link" class="form-control"  />'
+						+ '<a href="#" data-action="choose-image-from-file-manager" class="btn btn-default input-group-addon"><i class="fa fa-search"></i></a>'
+						+ '</div></div>'
+						+ '<div class="form-group">'
+						+ '<label class="control-label">' + this.lang.get('text') + '</label>'
+						+ '<input class="form-control" type="text" id="redactor-filename" />'
+						+ '</div>'
 						+ '</section>',
 
 						link: String()
 						+ '<section id="redactor-modal-link-insert">'
-							+ '<label>URL</label>'
-							+ '<input type="url" id="redactor-link-url" />'
-							+ '<label>' + this.lang.get('text') + '</label>'
-							+ '<input type="text" id="redactor-link-url-text" />'
-							+ '<label><input type="checkbox" id="redactor-link-blank"> ' + this.lang.get('link_new_tab') + '</label>'
+                            + '<div class="form-group">'
+                            + '<label class="control-label">' + this.lang.get('web') + '</label>'
+                            + '<div class="input-group">'
+                            + '<input type="text" class="form-control" id="redactor-link-url" />'
+                            + '<a href="#" data-action="choose-link-from-sitemap" class="btn btn-default input-group-addon"><i class="fa fa-sitemap"></i></a>'
+                            + '<a href="#" data-action="choose-file-from-file-manager" class="btn btn-default input-group-addon"><i class="fa fa-file"></i></a>'
+                            + '</div>'
+                            + '</div>'
+							+ '<div class="form-group">'
+							+ '<label class="control-label">' + this.lang.get('text') + '</label>'
+							+ '<input class="form-control" type="text" id="redactor-link-url-text" />'
+							+ '</div>'
+							+ this.modal.getLinkFields()
 						+ '</section>'
 					};
 
@@ -6213,15 +7063,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())
 					{
@@ -6232,9 +7074,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();
@@ -6328,22 +7178,36 @@
 				},
 				createCancelButton: function()
 				{
-					var button = $('<button>').addClass('redactor-modal-btn redactor-modal-close-btn').html(this.lang.get('cancel'));
+					/* concrete5 */
+					// var button = $('<button>').addClass('redactor-modal-btn redactor-modal-close-btn').html(this.lang.get('cancel'));
+					var button = $('<button>').addClass('btn btn-default redactor-modal-close-btn').html(this.lang.get('cancel'));
+					/* end concrete5 */
+
 					button.on('click', $.proxy(this.modal.close, this));
 
 					this.$modalFooter.append(button);
 				},
 				createDeleteButton: function(label)
 				{
-					return this.modal.createButton(label, 'delete');
+					/* concrete5 */
+					//return this.modal.createButton(label, 'delete');
+					return this.modal.createButton(label, 'danger');
+					/* end concrete5 */
 				},
 				createActionButton: function(label)
 				{
-					return this.modal.createButton(label, 'action');
+					/* concrete5 */
+					//return this.modal.createButton(label, 'action');
+					return this.modal.createButton(label, 'primary');
+					/* end concrete5 */
 				},
 				createButton: function(label, className)
 				{
-					var button = $('<button>').addClass('redactor-modal-btn').addClass('redactor-modal-' + className + '-btn').html(label);
+					/* concrete5 */
+					//var button = $('<button>').addClass('redactor-modal-btn').addClass('redactor-modal-' + className + '-btn').html(label);
+					var button = $('<button>').addClass('btn pull-right').addClass('btn-' + className).html(label);
+					/* end concrete5 */
+
 					this.$modalFooter.append(button);
 
 					return button;
@@ -6354,7 +7218,14 @@
 					var buttonsSize = buttons.length;
 					if (buttonsSize === 0) return;
 
-					buttons.css('width', (100/buttonsSize) + '%');
+					/* concrete5 */
+					//if (buttonsSize === 0) return;
+					//buttons.css('width', (100/buttonsSize) + '%');
+					if (buttonsSize === 0) {
+						this.$modalFooter.remove();
+					}
+					/* end concrete5 */
+
 				},
 				build: function()
 				{
@@ -6363,12 +7234,23 @@
 					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;');
+					/* concrete5 */
+					//this.$modalClose = $('<span id="redactor-modal-close" />').html('&times;');
+					this.$modalBox.addClass('ccm-ui');
+					this.$modalClose = $('<span class="ui-button-icon-primary ui-icon ui-icon-closethick" />');
+					this.$modalCloseWrapper = $('<span id="redactor-modal-close"><button class="ui-button ui-widget ui-state-default ui-corner-all ui-button-icon-only ui-dialog-titlebar-close" role="button"><span class="ui-button-text">close</span></button></span>');
+					this.$modalClose.appendTo(this.$modalCloseWrapper.find('button.ui-button'));
+					/* end concrete5 */
 					this.$modalBody = $('<div id="redactor-modal-body" />');
 					this.$modalFooter = $('<footer />');
 
+					/* concrete5 */
+					// Add class so that jquery-ui doesn't disable focus.
+					this.$modal.addClass('ccm-interaction-dialog');
+					/* end concrete5 */
+
 					this.$modal.append(this.$modalHeader);
-					this.$modal.append(this.$modalClose);
+					this.$modal.append(this.$modalCloseWrapper);
 					this.$modal.append(this.$modalBody);
 					this.$modal.append(this.$modalFooter);
 					this.$modalBox.append(this.$modal);
@@ -6381,14 +7263,21 @@
 				},
 				enableEvents: function()
 				{
-					this.$modalClose.on('click.redactor-modal', $.proxy(this.modal.close, this));
+					/* concrete5 */
+					//this.$modalClose.on('click.redactor-modal', $.proxy(this.modal.close, this));
+					this.$modalClose.find('button').on('click.redactor-modal', $.proxy(this.modal.close, this));
+					/* end concrete5 */
 					$(document).on('keyup.redactor-modal', $.proxy(this.modal.closeHandler, this));
 					this.$editor.on('keyup.redactor-modal', $.proxy(this.modal.closeHandler, this));
 					this.$modalBox.on('click.redactor-modal', $.proxy(this.modal.close, this));
 				},
 				disableEvents: function()
 				{
-					this.$modalClose.off('click.redactor-modal');
+					/* concrete5 */
+					//this.$modalClose.off('click.redactor-modal');
+					this.$modalClose.find('button').off('click.redactor-modal');
+					/* end concrete5 */
+
 					$(document).off('keyup.redactor-modal');
 					this.$editor.off('keyup.redactor-modal');
 					this.$modalBox.off('click.redactor-modal');
@@ -6415,6 +7304,7 @@
 					if (!this.$modalBox) return;
 
 					this.modal.disableEvents();
+					this.utils.enableBodyScroll();
 
 					this.$modalOverlay.remove();
 
@@ -6441,9 +7331,122 @@
 				{
 					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', false);
+							$(this).attr('contenteditable', true);
+
+						}).on('mouseout',function()
+						{
+							self.$editor.attr('contenteditable', true);
+							$(this).removeAttr('contenteditable');
+
+						});
+					}
+
 					this.observe.images();
 					this.observe.links();
 				},
+				toolbar: function(e, btnName)
+				{
+					this.observe.buttons(e, btnName);
+					this.observe.dropdowns();
+				},
+				isCurrent: function($el, $current)
+				{
+					if (typeof $current == 'undefined')
+					{
+						var $current = $(this.selection.getCurrent());
+					}
+
+					return $current.is($el) || $current.parents($el).length > 0;
+				},
+				dropdowns: function()
+				{
+					var $current = $(this.selection.getCurrent());
+
+					$.each(this.opts.observe.dropdowns, $.proxy(function(key, value)
+					{
+						var observe = value.observe,
+							element = observe.element,
+							$item   = value.item,
+							inValues = typeof observe['in'] != 'undefined' ? observe['in'] : false,
+							outValues = typeof observe['out'] != 'undefined' ? observe['out'] : false;
+
+						if ($current.closest(element).size() > 0)
+						{
+							this.observe.setDropdownProperties($item, inValues, outValues);
+						}
+						else
+						{
+							this.observe.setDropdownProperties($item, outValues, inValues);
+						}
+					}, this));
+				},
+				setDropdownProperties: function($item, addProperties, deleteProperties)
+				{
+					if (deleteProperties && typeof deleteProperties['attr'] != 'undefined')
+					{
+						this.observe.setDropdownAttr($item, deleteProperties.attr, true);
+					}
+
+					if (typeof addProperties['attr'] != 'undefined')
+					{
+						this.observe.setDropdownAttr($item, addProperties.attr);
+					}
+
+					if (typeof addProperties['title'] != 'undefined')
+					{
+                        /* concrete5 */
+                        // $item.text(addProperties['title']); // Original functionality
+                        var elem = $item;
+                        while (elem.children().length) {
+                            elem = elem.children().first()
+                        }
+
+                        elem.text(addProperties['title']);
+                        /* end concrete5 */
+					}
+				},
+				setDropdownAttr: function($item, properties, isDelete)
+				{
+					$.each(properties, function(key, value)
+					{
+						if (key == 'class')
+						{
+							if (!isDelete)
+							{
+								$item.addClass(value);
+							}
+							else
+							{
+								$item.removeClass(value);
+							}
+						}
+						else
+						{
+							if (!isDelete)
+							{
+								$item.attr(key, value);
+							}
+							else
+							{
+								$item.removeAttr(key);
+							}
+						}
+					});
+				},
+				addDropdown: function($item, btnName, btnObject)
+				{
+					if (typeof btnObject.observe == "undefined") return;
+
+					btnObject.item = $item;
+
+					this.opts.observe.dropdowns.push(btnObject);
+				},
 				buttons: function(e, btnName)
 				{
 					var current = this.selection.getCurrent();
@@ -6775,7 +7778,16 @@
 					}
 					else
 					{
-						$('body').append(this.$pasteBox);
+						// bootstrap modal
+						if ($('.modal-body').length > 0)
+						{
+							$('.modal-body').append(this.$pasteBox);
+						}
+						else
+						{
+							$('body').append(this.$pasteBox);
+						}
+
 					}
 
 					this.$pasteBox.focus();
@@ -6809,7 +7821,7 @@
 						var spans = this.$editor.find('span');
 						$.each(spans, function(i,s)
 						{
-							var html = s.innerHTML.replace(/[\u200B-\u200D\uFEFF]/, '');
+							var html = s.innerHTML.replace(/\u200B/, '');
 							if (html === '' && s.attributes.length === 0) $(s).remove();
 
 						});
@@ -6835,8 +7847,8 @@
 					setTimeout($.proxy(function()
 					{
 						var func = this.utils.isEmpty(this.$editor.html(), false) ? 'addClass' : 'removeClass';
-
 						this.$editor[func]('redactor-placeholder');
+
 					}, this), 5);
 				},
 				remove: function()
@@ -6901,6 +7913,7 @@
 				getCurrent: function()
 				{
 					var el = false;
+
 					this.selection.get();
 
 					if (this.sel && this.sel.rangeCount > 0)
@@ -6920,6 +7933,14 @@
 
 					return false;
 				},
+				getPrev: function()
+				{
+					return  window.getSelection().anchorNode.previousSibling;
+				},
+				getNext: function()
+				{
+					return window.getSelection().anchorNode.nextSibling;
+				},
 				getBlock: function(node)
 				{
 					node = node || this.selection.getCurrent();
@@ -7024,23 +8045,34 @@
 
 					var startNode = this.selection.getNodesMarker(1);
 					var endNode = this.selection.getNodesMarker(2);
-					var range = this.range.cloneRange();
 
 					if (this.range.collapsed === false)
 					{
-						var startContainer = range.startContainer;
-						var startOffset = range.startOffset;
-
-						// end marker
-						this.selection.setNodesMarker(range, endNode, false);
-
-						// start marker
-						range.setStart(startContainer, startOffset);
-						this.selection.setNodesMarker(range, startNode, true);
+					   if (window.getSelection) {
+					        var sel = window.getSelection();
+					        if (sel.rangeCount > 0) {
+
+					            var range = sel.getRangeAt(0);
+					            var startPointNode = range.startContainer, startOffset = range.startOffset;
+
+					            var boundaryRange = range.cloneRange();
+					            boundaryRange.collapse(false);
+					            boundaryRange.insertNode(endNode);
+					            boundaryRange.setStart(startPointNode, startOffset);
+					            boundaryRange.collapse(true);
+					            boundaryRange.insertNode(startNode);
+
+					            // Reselect the original text
+					            range.setStartAfter(startNode);
+					            range.setEndBefore(endNode);
+					            sel.removeAllRanges();
+					            sel.addRange(range);
+					        }
+					    }
 					}
 					else
 					{
-						this.selection.setNodesMarker(range, startNode, true);
+						this.selection.setNodesMarker(this.range, startNode, true);
 						endNode = startNode;
 					}
 
@@ -7098,6 +8130,8 @@
 				},
 				setNodesMarker: function(range, node, type)
 				{
+					var range = range.cloneRange();
+
 					try {
 						range.collapse(type);
 						range.insertNode(node);
@@ -7127,7 +8161,17 @@
 				},
 				selectElement: function(node)
 				{
-					this.caret.set(node, 0, node, 1);
+					if (this.utils.browser('mozilla'))
+					{
+						node = node[0] || node;
+
+						var range = document.createRange();
+						range.selectNodeContents(node);
+					}
+					else
+					{
+						this.caret.set(node, 0, node, 1);
+					}
 				},
 				selectAll: function()
 				{
@@ -7148,14 +8192,20 @@
 				{
 					this.selection.get();
 
+
 					var node1 = this.selection.getMarker(1);
 
 					this.selection.setMarker(this.range, node1, true);
-
 					if (this.range.collapsed === false)
 					{
 						var node2 = this.selection.getMarker(2);
 						this.selection.setMarker(this.range, node2, false);
+						// concrete5 start - https://github.com/concrete5/concrete5/issues/5406
+						if (this.utils.browser('chrome'))
+						{
+						    this.caret.set(node1, 0, node2, 0);
+						}
+						// concrete5 end
 					}
 
 					this.savedSel = this.$editor.html();
@@ -7177,17 +8227,24 @@
 					try {
 						range.collapse(type);
 						range.insertNode(node);
+
 					}
 					catch (e)
 					{
 						this.focus.setStart();
 					}
+
 				},
 				restore: function()
 				{
 					var node1 = this.$editor.find('span#selection-marker-1');
 					var node2 = this.$editor.find('span#selection-marker-2');
 
+					if (this.utils.browser('mozilla'))
+					{
+						this.$editor.focus();
+					}
+
 					if (node1.length !== 0 && node2.length !== 0)
 					{
 						this.caret.set(node1, 0, node2, 0);
@@ -7209,7 +8266,7 @@
 				{
 					this.$editor.find('span.redactor-selection-marker').each(function(i,s)
 					{
-						var text = $(s).text().replace(/[\u200B-\u200D\uFEFF]/g, '');
+						var text = $(s).text().replace(/\u200B/g, '');
 						if (text === '') $(s).remove();
 						else $(s).replaceWith(function() { return $(this).contents(); });
 					});
@@ -7716,6 +8773,8 @@
 					{
 						this.tidy.$div.find(this.tidy.settings.deniedTags.join(',')).each(function(i, s)
 						{
+							if ($(s).hasClass('redactor-script-tag') || $(s).hasClass('redactor-selection-marker')) return;
+
 							if (s.innerHTML === '') $(s).remove();
 							else $(s).contents().unwrap();
 						});
@@ -7829,7 +8888,7 @@
 					{
 						var $el = $(this);
 						var text = $el.text();
-						text = text.replace(/[\u200B-\u200D\uFEFF]/g, '');
+						text = text.replace(/\u200B/g, '');
 						text = text.replace(/&nbsp;/gi, '');
 						text = text.replace(/\s/g, '');
 
@@ -7922,6 +8981,11 @@
 								{
 									title: this.lang.get('header5'),
 									func: 'block.format'
+								},
+								h6: /* concrete5 */
+								{
+									title: this.lang.get('header6'),
+									func: 'block.format'
 								}
 							}
 						},
@@ -7983,12 +9047,30 @@
 								link:
 								{
 									title: this.lang.get('link_insert'),
-									func: 'link.show'
+									func: 'link.show',
+									observe: {
+										element: 'a',
+										in: {
+											title: this.lang.get('link_edit'),
+										},
+										out: {
+											title: this.lang.get('link_insert')
+										}
+									}
 								},
 								unlink:
 								{
 									title: this.lang.get('unlink'),
-									func: 'link.unlink'
+									func: 'link.unlink',
+									observe: {
+										element: 'a',
+										out: {
+											attr: {
+												'class': 'redactor-dropdown-link-inactive',
+												'aria-disabled': true
+											}
+										}
+									}
 								}
 							}
 						},
@@ -8045,13 +9127,13 @@
 					// buttons response
 					if (this.opts.activeButtons)
 					{
-						this.$editor.on('mouseup.redactor keyup.redactor focus.redactor', $.proxy(this.observe.buttons, this));
+						this.$editor.on('mouseup.redactor keyup.redactor focus.redactor', $.proxy(this.observe.toolbar, this));
 					}
 
 				},
 				createContainer: function()
 				{
-					return $('<ul>').addClass('redactor-toolbar').attr('id', 'redactor-toolbar-' + this.uuid);
+					return $('<ul>').addClass('redactor-toolbar').attr({'id': 'redactor-toolbar-' + this.uuid, 'role': 'toolbar'});
 				},
 				setFormattingTags: function()
 				{
@@ -8066,7 +9148,8 @@
 					$.each(this.opts.buttons, $.proxy(function(i, btnName)
 					{
 						if (!this.opts.toolbar[btnName]) return;
-
+						/* concrete5 */
+						/*
 						if (btnName === 'file')
 						{
 							 if (this.opts.fileUpload === false) return;
@@ -8078,6 +9161,8 @@
 							 if (this.opts.imageUpload === false) return;
 							 else if (!this.opts.imageUpload && this.opts.s3 === false) return;
 						}
+						*/
+						/* end concrete5 */
 
 						var btnObject = this.opts.toolbar[btnName];
 						this.$toolbar.append($('<li>').append(this.button.build(btnName, btnObject)));
@@ -8155,7 +9240,7 @@
 						boxTop = this.$box.offset().top;
 					}
 
-					if (scrollTop > boxTop)
+					if ((scrollTop + this.opts.toolbarFixedTopOffset) > boxTop)
 					{
 						this.toolbar.observeScrollEnable(scrollTop, boxTop);
 					}
@@ -8890,145 +9975,47 @@
 
 					return browser == match[1];
 				},
-
 				strpos: function(haystack, needle, offset)
 				{
 					var i = haystack.indexOf(needle, offset);
 					return i >= 0 ? i : false;
 				},
-			};
-		},
-		linkify: function()
-		{
-			return {
-				isKey: function(key)
+				disableBodyScroll: function()
 				{
-					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();
-						});
-
-					this.code.sync();
-				},
-				convertVideoLinks: function(html)
-				{
-					var iframeStart = '<iframe width="500" height="281" src="',
-						iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
-
-					if (html.match(this.opts.linkify.regexps.youtube))
+					var $body = $('html');
+					var windowWidth = window.innerWidth;
+					if (!windowWidth)
 					{
-						html = html.replace(this.opts.linkify.regexps.youtube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
+						var documentElementRect = document.documentElement.getBoundingClientRect();
+						windowWidth = documentElementRect.right - Math.abs(documentElementRect.left);
 					}
 
-					if (html.match(this.opts.linkify.regexps.vimeo))
-					{
-						html = html.replace(this.opts.linkify.regexps.vimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
-					}
+					var isOverflowing = document.body.clientWidth < windowWidth;
+					var scrollbarWidth = this.utils.measureScrollbar();
 
-					return html;
-				},
-				convertImages: function(html)
-				{
-					var matches = html.match(this.opts.linkify.regexps.image);
+					$body.css('overflow', 'hidden');
+					if (isOverflowing) $body.css('padding-right', scrollbarWidth);
 
-					if (matches)
-					{
-						html = html.replace(html, '<img src="' + matches + '" />');
 
-						if (this.opts.linebreaks)
-						{
-							if (!this.utils.isEmpty(this.code.get()))
-							{
-								html = '<br>' + html;
-							}
-						}
-
-						html+= '<br>';
-					}
-
-					return html;
 				},
-				convertLinks: function(html)
+				measureScrollbar: function()
 				{
-					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) + '...';
-							}
-
-							text = decodeURIComponent(text);
-
-							var regexB = "\\b";
+					var $body = $('body');
+					var scrollDiv = document.createElement('div');
+					scrollDiv.className = 'redactor-scrollbar-measure';
 
-							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) + '">' + $.trim(text) + '</a>');
-						}
-					}
-
-					return html;
+					$body.append(scrollDiv);
+					var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth;
+					$body[0].removeChild(scrollDiv);
+					return scrollbarWidth;
+				},
+				enableBodyScroll: function()
+				{
+					$('html').css({ 'overflow': '', 'padding-right': '' });
+					$('body').remove('redactor-scrollbar-measure');
 				}
-			}
+			};
 		}
 	};
 
@@ -9039,4 +10026,5 @@
 
 	// constructor
 	Redactor.prototype.init.prototype = Redactor.prototype;
+
 })(jQuery);