redactor-rails 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 506f5e8fa3b8fe0a6672f9d9ca82821a2aff9456
-  data.tar.gz: 12de7a67928f900a30f98897427fd5dbb94e046f
+  metadata.gz: e3e2f3ecba694ba0ea434016294fd47dc17188db
+  data.tar.gz: 22863da6e0eb0d51b48ec7d203325dba2f91bf6a
 SHA512:
-  metadata.gz: 1c0d3c1116125b1c3ea044f7e8ba7c598a3135bbf25a4f5ea2a35c9165bfe3469ef1173a6b09dcaec9f0c522a080783b4947a8225f2fc2198359cd2f3334a9ec
-  data.tar.gz: accce111a0a66f1fc943bc1df95c11d7175d43a5f7413b68bb0e27fe6a4701ae371e2982806934e6423a5bcd5cf4edc691f916860f8843e0e2fdb41925f6b2ee
+  metadata.gz: 650e89fd3bf046e8cb2838cfbd4c6b22ea1d5b1e38487cd50398e02d51ad1eb1e6416d383783e9315ff919577831ca8eb21ecf2447d109ccf482b99a6411757f
+  data.tar.gz: f1666d988dc35800541d2ec947bf88ea647dd62c208a4cb5e2f9c173964bb3892ea186c59bfcc4aa185da7bea8148ba4e1b020f588ccd0a2ed83053bab9d01cf

data/app/controller/redactor_rails/documents_controller.rb

@@ -20,7 +20,7 @@ class RedactorRails::DocumentsController < ApplicationController
     if @document.save
       render :text => { :filelink => @document.url, :filename => @document.filename }.to_json
     else
-      render :nothing => true
+      render json: { error: @document.errors }
     end
   end
 

data/app/controller/redactor_rails/pictures_controller.rb

@@ -1,5 +1,5 @@
 class RedactorRails::PicturesController < ApplicationController
-  before_filter :redactor_authenticate_user!
+  #before_filter :redactor_authenticate_user!
 
   def index
     @pictures = RedactorRails.picture_model.where(
@@ -20,7 +20,7 @@ class RedactorRails::PicturesController < ApplicationController
     if @picture.save
       render :text => { :filelink => @picture.url }.to_json
     else
-      render :nothing => true
+      render json: { error: @picture.errors }
     end
   end
 

data/lib/generators/redactor/install_generator.rb

@@ -38,7 +38,7 @@ module Redactor
   end
       end
 
-      def create_migration
+      def create_redactor_migration
         if orm.to_s == "active_record"
           if ARGV.include?('--devise')
             migration_template "#{generator_dir}/devise_migration.rb", File.join('db/migrate', "create_redactor_assets.rb")

data/lib/redactor-rails/version.rb

@@ -1,3 +1,3 @@
 module RedactorRails
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/vendor/assets/javascripts/redactor-rails/plugins/fontcolor.js

@@ -3,7 +3,15 @@ if (!RedactorPlugins) var RedactorPlugins = {};
 RedactorPlugins.fontcolor = {
 	init: function()
 	{
-		var colors = ['#ffffff', '#000000', '#eeece1', '#1f497d', '#4f81bd', '#c0504d', '#9bbb59', '#8064a2', '#4bacc6', '#f79646', '#ffff00', '#f2f2f2', '#7f7f7f', '#ddd9c3', '#c6d9f0', '#dbe5f1', '#f2dcdb', '#ebf1dd', '#e5e0ec', '#dbeef3', '#fdeada', '#fff2ca', '#d8d8d8', '#595959', '#c4bd97', '#8db3e2', '#b8cce4', '#e5b9b7', '#d7e3bc', '#ccc1d9', '#b7dde8', '#fbd5b5', '#ffe694', '#bfbfbf', '#3f3f3f', '#938953', '#548dd4', '#95b3d7', '#d99694', '#c3d69b', '#b2a2c7', '#b7dde8', '#fac08f', '#f2c314', '#a5a5a5', '#262626', '#494429', '#17365d', '#366092', '#953734', '#76923c', '#5f497a', '#92cddc', '#e36c09', '#c09100', '#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b', '#974806', '#7f6000'];
+		var colors = [
+			'#ffffff', '#000000', '#eeece1', '#1f497d', '#4f81bd', '#c0504d', '#9bbb59', '#8064a2', '#4bacc6', '#f79646', '#ffff00',
+			'#f2f2f2', '#7f7f7f', '#ddd9c3', '#c6d9f0', '#dbe5f1', '#f2dcdb', '#ebf1dd', '#e5e0ec', '#dbeef3', '#fdeada', '#fff2ca',
+			'#d8d8d8', '#595959', '#c4bd97', '#8db3e2', '#b8cce4', '#e5b9b7', '#d7e3bc', '#ccc1d9', '#b7dde8', '#fbd5b5', '#ffe694',
+			'#bfbfbf', '#3f3f3f', '#938953', '#548dd4', '#95b3d7', '#d99694', '#c3d69b', '#b2a2c7', '#b7dde8', '#fac08f', '#f2c314',
+			'#a5a5a5', '#262626', '#494429', '#17365d', '#366092', '#953734', '#76923c', '#5f497a', '#92cddc', '#e36c09', '#c09100',
+			'#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b',  '#974806', '#7f6000'
+		];
+
 		var buttons = ['fontcolor', 'backcolor'];
 
 		this.buttonAddSeparator();
@@ -12,7 +20,7 @@ RedactorPlugins.fontcolor = {
 		{
 			var name = buttons[i];
 
-			var $dropdown = $('<div class="redactor_dropdown redactor_dropdown_box_' + name + '" style="display: none; width: 210px;">');
+			var $dropdown = $('<div class="redactor_dropdown redactor_dropdown_box_' + name + '" style="display: none; width: 243px;">');
 
 			this.pickerBuild($dropdown, name, colors);
 			$(this.$toolbar).append($dropdown);
@@ -44,7 +52,7 @@ RedactorPlugins.fontcolor = {
 		{
 			var color = colors[z];
 
-			var $swatch = $('<a rel="' + color + '" data-rule="' + rule +'" href="#" style="float: left; font-size: 0; border: 2px solid #fff; padding: 0; margin: 0; width: 15px; height: 15px;"></a>');
+			var $swatch = $('<a rel="' + color + '" data-rule="' + rule +'" href="#" style="float: left; font-size: 0; border: 2px solid #fff; padding: 0; margin: 0; width: 20px; height: 20px;"></a>');
 			$swatch.css('background-color', color);
 			$dropdown.append($swatch);
 			$swatch.on('click', onSwatch);

data/vendor/assets/javascripts/redactor-rails/plugins/fullscreen.js

@@ -32,13 +32,11 @@ RedactorPlugins.fullscreen = {
 
 			this.fsheight = this.$editor.height();
 
+			if (this.opts.maxHeight) this.$editor.css('max-height', '');
 			if (this.opts.iframe) html = this.get();
 
-			this.tmpspan = $('<span></span>');
-			this.$box.addClass('redactor_box_fullscreen').after(this.tmpspan);
-
+			this.$box.addClass('redactor_box_fullscreen');
 			$('body, html').css('overflow', 'hidden');
-			$('body').prepend(this.$box);
 
 			if (this.opts.iframe) this.fullscreenIframe(html);
 
@@ -62,13 +60,13 @@ RedactorPlugins.fullscreen = {
 			this.$box.removeClass('redactor_box_fullscreen').css({ width: 'auto', height: 'auto' });
 
 			if (this.opts.iframe) html = this.$editor.html();
-			this.tmpspan.after(this.$box).remove();
 
 			if (this.opts.iframe) this.fullscreenIframe(html);
 			else this.sync();
 
 			var height = this.fsheight;
 			if (this.opts.autoresize) height = 'auto';
+			if (this.opts.maxHeight) this.$editor.css('max-height', this.opts.maxHeight);
 
 			if (this.opts.toolbarExternal)
 			{
@@ -90,10 +88,8 @@ RedactorPlugins.fullscreen = {
 	},
 	fullscreenIframe: function(html)
 	{
-		this.$editor = this.$frame.contents().find('body').attr({
-			'contenteditable': true,
-			'dir': this.opts.direction
-		});
+		this.$editor = this.$frame.contents().find('body');
+		this.$editor.attr({ 'contenteditable': true, 'dir': this.opts.direction });
 
 		// set document & window
 		if (this.$editor[0])

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

@@ -1,6 +1,6 @@
 /*
-	Redactor v9.1.4
-	Updated: Sep 10, 2013
+	Redactor v9.1.9
+	Updated: Dec 12, 2013
 
 	http://imperavi.com/redactor/
 
@@ -13,7 +13,6 @@
 (function($)
 {
 	var uuid = 0;
-	var rtePaste = false;
 
 	"use strict";
 
@@ -72,7 +71,7 @@
 	}
 
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '9.1.4';
+	$.Redactor.VERSION = '9.1.9';
 	$.Redactor.opts = {
 
 			// settings
@@ -94,29 +93,35 @@
 			pastePlainText: false,
 			removeEmptyTags: true,
 			templateVars: false,
+			xhtml: false,
 
 			visual: true,
 			focus: false,
 			tabindex: false,
 			autoresize: true,
 			minHeight: false,
+			maxHeight: false,
 			shortcuts: true,
 
 			autosave: false, // false or url
 			autosaveInterval: 60, // seconds
+            autosaveFormdata: true,
 
 			plugins: false, // array
 
-			linkAnchor: false,
-			linkEmail: false,
+			linkAnchor: true,
+			linkEmail: true,
 			linkProtocol: 'http://',
 			linkNofollow: false,
+			linkSize: 50,
 
 			imageFloatMargin: '10px',
 			imageGetJson: false, // url (ex. /folder/images.json ) or false
 
 			imageUpload: false, // url
+			imageUploadParam: 'file', // input name
 			fileUpload: false, // url
+			fileUploadParam: 'file', // input name
 			clipboardUpload: true, // or false
 			clipboardUploadUrl: false, // url
 			dragUpload: true, // false
@@ -297,7 +302,7 @@
 		// Initialization
 		init: function(el, options)
 		{
-
+			this.rtePaste = false;
 			this.$element = this.$source = $(el);
 			this.uuid = uuid++;
 
@@ -343,7 +348,18 @@
 			// setup formatting permissions
 			if (this.opts.linebreaks === false)
 			{
-				if (this.opts.allowedTags !== false && $.inArray('p', this.opts.allowedTags) === '-1') this.opts.allowedTags.push('p');
+				if (this.opts.allowedTags !== false)
+				{
+					var arrSearch = ['strong', 'em', 'del'];
+					var arrAdd = ['b', 'i', 'strike'];
+
+					if ($.inArray('p', this.opts.allowedTags) === '-1') this.opts.allowedTags.push('p');
+
+					for (i in arrSearch)
+					{
+						if ($.inArray(arrSearch[i], this.opts.allowedTags) != '-1') this.opts.allowedTags.push(arrAdd[i]);
+					}
+				}
 
 				if (this.opts.deniedTags !== false)
 				{
@@ -365,7 +381,7 @@
 			this.buildStart();
 
 		},
-		initToolbar: function(lang)
+		toolbarInit: function(lang)
 		{
 			return {
 				html:
@@ -680,7 +696,7 @@
 
 			if (this.opts.air)
 			{
-				$('.redactor_air').remove();
+				$('#redactor_air_' + this.uuid).remove();
 			}
 		},
 
@@ -703,10 +719,9 @@
 		},
 		getToolbar: function()
 		{
-			return this.$toolbar;
+			return (this.$toolbar) ? this.$toolbar : false;
 		},
 
-
 		// CODE GET & SET
 		get: function()
 		{
@@ -723,28 +738,39 @@
 		set: function(html, strip, placeholderRemove)
 		{
 			html = html.toString();
+			html = html.replace(/\$/g, '$');
 
 			if (this.opts.fullpage) this.setCodeIframe(html);
 			else this.setEditor(html, strip);
 
+			if (html == '') placeholderRemove = false;
 			if (placeholderRemove !== false) this.placeholderRemove();
 		},
 		setEditor: function(html, strip)
 		{
+
 			if (strip !== false)
 			{
 				html = this.cleanSavePreCode(html);
+
 				html = this.cleanStripTags(html);
 				html = this.cleanConvertProtected(html);
-				html = this.cleanConvertInlineTags(html);
+				html = this.cleanConvertInlineTags(html, true);
 
-				if (this.opts.linebreaks === false) html = this.cleanConverters(html);
+				if (this.opts.linebreaks === false)	html = this.cleanConverters(html);
 				else html = html.replace(/<p(.*?)>([\w\W]*?)<\/p>/gi, '$2<br>');
 			}
 
+			// $ fix
+			html = html.replace(/&amp;#36;/g, '$');
+
 			html = this.cleanEmpty(html);
 
 			this.$editor.html(html);
+
+			// set no editable
+			this.setNonEditable();
+			this.setSpansVerified();
 			this.sync();
 		},
 		setCodeIframe: function(html)
@@ -766,6 +792,9 @@
 				this.$editor = this.$frame.contents().find('body').attr({ 'contenteditable': true, 'dir': this.opts.direction });
 			}
 
+			// set no editable
+			this.setNonEditable();
+			this.setSpansVerified();
 			this.sync();
 
 		},
@@ -777,8 +806,41 @@
 
 			// set code
 			this.$editor.html(html);
+
+			// set no editable
+			this.setNonEditable();
+			this.setSpansVerified();
 			this.sync();
 		},
+		setSpansVerified: function()
+		{
+			var spans = this.$editor.find('span');
+			var replacementTag = 'inline';
+
+			$.each(spans, function() {
+				var outer = this.outerHTML;
+
+				// Replace opening tag
+				var regex = new RegExp('<' + this.tagName, 'gi');
+				var newTag = outer.replace(regex, '<' + replacementTag);
+
+				// Replace closing tag
+				regex = new RegExp('</' + this.tagName, 'gi');
+				newTag = newTag.replace(regex, '</' + replacementTag);
+
+				$(this).replaceWith(newTag);
+			});
+
+		},
+		setSpansVerifiedHtml: function(html)
+		{
+			html = html.replace(/<span(.*?)>/, '<inline$1>');
+			return html.replace(/<\/span>/, '</inline>');
+		},
+		setNonEditable: function()
+		{
+			this.$editor.find('.noneditable').attr('contenteditable', false);
+		},
 
 		// SYNC
 		sync: function()
@@ -791,7 +853,7 @@
 			else html = this.$editor.html();
 
 			html = this.syncClean(html);
-			html = this.cleanRemoveSpaces(html);
+			//html = this.cleanRemoveSpaces(html);
 			html = this.cleanRemoveEmptyTags(html);
 
 			// fix second level up ul, ol
@@ -799,8 +861,16 @@
 
 			if ($.trim(html) === '<br>') html = '';
 
-			if (html !== '' && this.opts.tidyHtml) html = this.cleanHtml(html);
-			html = html.replace(/<br>/gi, '<br />');
+			// xhtml
+			if (this.opts.xhtml)
+			{
+				var xhtmlTags = ['br', 'hr', 'img', 'link', 'input', 'meta'];
+				$.each(xhtmlTags, function(i,s)
+				{
+					html = html.replace(new RegExp('<' + s + '(.*?[^\/$]?)>', 'gi'), '<' + s + '$1 />');
+				});
+
+			}
 
 			// before callback
 			html = this.callback('syncBefore', false, html);
@@ -828,7 +898,7 @@
 			// remove space
 			html = html.replace(/&#x200b;/gi, '');
 			html = html.replace(/&#8203;/gi, '');
-			html = html.replace(/&nbsp;/gi, ' ');
+			html = html.replace(/<\/a>&nbsp;/gi, '<\/a> ');
 
 			// link nofollow
 			if (this.opts.linkNofollow)
@@ -841,6 +911,9 @@
 			html = html.replace('<!--?php', '<?php');
 			html = html.replace('?-->', '?>');
 
+			// revert no editable
+			html = html.replace(/<(.*?)class="noeditable"(.*?) contenteditable="false"(.*?)>/gi, '<$1class="noeditable"$2$3>');
+
 			html = html.replace(/ data-tagblock=""/gi, '');
 			html = html.replace(/<br\s?\/?>\n?<\/(P|H[1-6]|LI|ADDRESS|SECTION|HEADER|FOOTER|ASIDE|ARTICLE)>/gi, '</$1>');
 
@@ -849,19 +922,21 @@
 			html = html.replace(/<span(.*?)id="redactor-image-resizer"(.*?)>(.*?)<\/span>/i, '');
 			html = html.replace(/<span(.*?)id="redactor-image-editter"(.*?)>(.*?)<\/span>/i, '');
 
+			// remove font
+			html = html.replace(/<font(.*?)>([\w\W]*?)<\/font>/gi, '$2');
+
 			// remove spans
-			html = html.replace(/<span\s*?>([\w\W]*?)<\/span>/gi, '$1');
-			html = html.replace(/<span(.*?)data-redactor="verified"(.*?)>([\w\W]*?)<\/span>/gi, '<span$1$2>$3</span>');
-			html = html.replace(/<span(.*?)data-redactor-inlineMethods=""(.*?)>([\w\W]*?)<\/span>/gi, '<span$1$2>$3</span>' );
-			html = html.replace(/<span\s*?>([\w\W]*?)<\/span>/gi, '$1');
-			html = html.replace(/<span\s*?id="selection-marker(.*?)"(.*?)>([\w\W]*?)<\/span>/gi, '');
-			html = html.replace(/<span\s*?>([\w\W]*?)<\/span>/gi, '$1');
-			html = html.replace(/<span(.*?)data-redactor="verified"(.*?)>([\w\W]*?)<\/span>/gi, '<span$1$2>$3</span>');
-			html = html.replace(/<span(.*?)data-redactor-inlineMethods=""(.*?)>([\w\W]*?)<\/span>/gi, '<span$1$2>$3</span>' );
+			html = html.replace(/<span(.*?)>([\w\W]*?)<\/span>/gi, '$2');
+			html = html.replace(/<inline>/gi, '<span>');
+			html = html.replace(/<inline /gi, '<span ');
+			html = html.replace(/<\/inline>/gi, '</span>');
+			html = html.replace(/<span(.*?)class="redactor_placeholder"(.*?)>([\w\W]*?)<\/span>/gi, '');
 			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');
 
-			// amp fix
-			html = html.replace(/;amp;/gi, ';');
+			// fixes
+			html = html.replace(/&amp;/gi, '&');
+			html = html.replace(/™/gi, '&trade;');
+			html = html.replace(/©/gi, '&copy;');
 
 
 			html = this.cleanReConvertProtected(html);
@@ -972,6 +1047,11 @@
 			// options
 			if (this.opts.tabindex) $source.attr('tabindex', this.opts.tabindex);
 			if (this.opts.minHeight) $source.css('min-height', this.opts.minHeight + 'px');
+			if (this.opts.maxHeight)
+			{
+				this.opts.autoresize = false;
+				this.sourceHeight = this.opts.maxHeight;
+			}
 			if (this.opts.wym) this.$editor.addClass('redactor_editor_wym');
 			if (!this.opts.autoresize) $source.css('height', this.sourceHeight);
 		},
@@ -982,7 +1062,7 @@
 			// load toolbar
 			if (this.opts.toolbar)
 			{
-				this.opts.toolbar = this.initToolbar(this.opts.curLang);
+				this.opts.toolbar = this.toolbarInit(this.opts.curLang);
 				this.toolbarBuild();
 			}
 
@@ -1029,7 +1109,9 @@
 		},
 		buildBindKeyboard: function()
 		{
-			if (this.opts.dragUpload)
+			this.dblEnter = 0;
+
+			if (this.opts.dragUpload && this.opts.imageUpload !== false)
 			{
 				this.$editor.on('drop.redactor', $.proxy(this.buildEventDrop, this));
 			}
@@ -1038,8 +1120,6 @@
 			this.$editor.on('keydown.redactor', $.proxy(this.buildEventKeydown, this));
 			this.$editor.on('keyup.redactor', $.proxy(this.buildEventKeyup, this));
 
-
-
 			// textarea callback
 			if ($.isFunction(this.opts.textareaKeydownCallback))
 			{
@@ -1052,22 +1132,27 @@
 				this.$editor.on('focus.redactor', $.proxy(this.opts.focusCallback, this));
 			}
 
+			var clickedElement;
+			$(document).mousedown(function(e) {
+				clickedElement = $(e.target);
+			});
+
 			// blur callback
-			this.$editor.on('blur.redactor', $.proxy(function()
+			this.$editor.on('blur.redactor', $.proxy(function(e)
 			{
-				this.selectall = false;
+				if (!$(clickedElement).hasClass('redactor_toolbar') && $(clickedElement).parents('.redactor_toolbar').size() == 0)
+				{
+					this.selectall = false;
+					if ($.isFunction(this.opts.blurCallback)) this.callback('blur', e);
+				}
 			}, this));
-			if ($.isFunction(this.opts.blurCallback))
-			{
-				this.$editor.on('blur.redactor', $.proxy(this.opts.blurCallback, this));
-			}
 
 		},
 		buildEventDrop: function(e)
 		{
 			e = e.originalEvent || e;
 
-			if (window.FormData === undefined) return true;
+			if (window.FormData === undefined || !e.dataTransfer) return true;
 
 		    var length = e.dataTransfer.files.length;
 		    if (length == 0) return true;
@@ -1086,7 +1171,14 @@
 			var progress = $('<div id="redactor-progress-drag" class="redactor-progress redactor-progress-striped"><div id="redactor-progress-bar" class="redactor-progress-bar" style="width: 100%;"></div></div>');
 			$(document.body).append(progress);
 
-			this.dragUploadAjax(this.opts.imageUpload, file, true, progress, e);
+			if (this.opts.s3 === false)
+			{
+				this.dragUploadAjax(this.opts.imageUpload, file, true, progress, e, this.opts.imageUploadParam);
+			}
+			else
+			{
+				this.s3uploadFile(file);
+			}
 
 		},
 		buildEventPaste: function(e)
@@ -1108,13 +1200,13 @@
 
 			if (this.opts.cleanup)
 			{
-				rtePaste = true;
+				this.rtePaste = true;
 
 				this.selectionSave();
 
 				if (!this.selectall)
 				{
-					if (this.opts.autoresize === true )
+					if (this.opts.autoresize === true && this.fullscreen !== true)
 					{
 						this.$editor.height(this.$editor.height());
 						this.saveScroll = this.document.body.scrollTop;
@@ -1137,7 +1229,7 @@
 					var html = this.getFragmentHtml(pastedFrag);
 					this.pasteClean(html);
 
-					if (this.opts.autoresize === true) this.$editor.css('height', 'auto');
+					if (this.opts.autoresize === true && this.fullscreen !== true) this.$editor.css('height', 'auto');
 
 				}, this), 1);
 			}
@@ -1169,7 +1261,7 @@
 		},
 		buildEventKeydown: function(e)
 		{
-			if (rtePaste) return false;
+			if (this.rtePaste) return false;
 
 			var key = e.which;
 			var ctrl = e.ctrlKey || e.metaKey;
@@ -1192,8 +1284,17 @@
 			// down
 			if (key === this.keyCode.DOWN)
 			{
-				if (parent && $(parent).get(0).tagName === 'BLOCKQUOTE') this.insertAfterLastElement(parent);
-				if (current && $(current).get(0).tagName === 'BLOCKQUOTE') this.insertAfterLastElement(current);
+				if (parent && $(parent)[0].tagName === 'BLOCKQUOTE') this.insertAfterLastElement(parent);
+				if (current && $(current)[0].tagName === 'BLOCKQUOTE') this.insertAfterLastElement(current);
+
+				if (parent && $(parent)[0].tagName === 'P' && $(parent).parent()[0].tagName == 'BLOCKQUOTE')
+				{
+					this.insertAfterLastElement(parent, $(parent).parent()[0]);
+				}
+				if (current && $(current)[0].tagName === 'P' && parent && $(parent)[0].tagName == 'BLOCKQUOTE')
+				{
+					this.insertAfterLastElement(current, parent);
+				}
 			}
 
 			// shortcuts setup
@@ -1224,7 +1325,7 @@
 			if (key == this.keyCode.ENTER && !e.shiftKey && !e.ctrlKey && !e.metaKey )
 			{
 				// In ie, opera in the tables are created paragraphs, fix it.
-				if (parent.nodeType == 1 && (parent.tagName == 'TD' || parent.tagName == 'TH'))
+				if (this.browser('msie') && (parent.nodeType == 1 && (parent.tagName == 'TD' || parent.tagName == 'TH')))
 				{
 					e.preventDefault();
 					this.bufferSet();
@@ -1233,22 +1334,49 @@
 					return false;
 				}
 
-				// pre
-				if (pre === true)
+				// blockquote exit
+				if (block && (block.tagName == 'BLOCKQUOTE' || $(block).parent()[0].tagName == 'BLOCKQUOTE'))
 				{
-					e.preventDefault();
-					this.bufferSet();
-					var html = $(current).parent().text();
-					this.insertNode(document.createTextNode('\n'));
-					if (html.search(/\s$/) == -1)
+					if (this.isEndOfElement())
 					{
-						this.insertNode(document.createTextNode('\n'));
-					}
+						if (this.dblEnter == 1)
+						{
+							var element;
+							var last;
+							if (block.tagName == 'BLOCKQUOTE')
+							{
+								last = 'br';
+								element = block;
+							}
+							else
+							{
+								last = 'p';
+								element = $(block).parent()[0];
+							}
 
-					this.sync();
-					this.callback('enter', e);
-					return false;
+							e.preventDefault();
+							this.insertingAfterLastElement(element);
+							this.dblEnter = 0;
+
+							if (last == 'p')
+							{
+								$(block).parent().find('p').last().remove();
+							}
+							else
+							{
+								var tmp = $.trim($(block).html());
+								$(block).html(tmp.replace(/<br\s?\/?>$/i, ''));
+							}
+
+							return;
+						}
+						else this.dblEnter++;
+					}
+					else this.dblEnter++;
 				}
+
+				// pre
+				if (pre === true) return this.buildEventKeydownPre(e, current);
 				else
 				{
 					if (!this.opts.linebreaks)
@@ -1328,57 +1456,75 @@
 			}
 
 			// tab
-			if (key === this.keyCode.TAB && this.opts.shortcuts )
+			if (key === this.keyCode.TAB && this.opts.shortcuts) return this.buildEventKeydownTab(e, pre);
+
+			// delete zero-width space before the removing
+			if (key === this.keyCode.BACKSPACE) this.buildEventKeydownBackspace(current);
+
+		},
+		buildEventKeydownPre: function(e, current)
+		{
+			e.preventDefault();
+			this.bufferSet();
+			var html = $(current).parent().text();
+			this.insertNode(document.createTextNode('\n'));
+			if (html.search(/\s$/) == -1)
 			{
-				if (!this.opts.tabFocus) return true;
-				if (this.isEmpty(this.get())) return true;
+				this.insertNode(document.createTextNode('\n'));
+			}
 
-				e.preventDefault();
+			this.sync();
+			this.callback('enter', e);
+			return false;
+		},
+		buildEventKeydownTab: function(e, pre)
+		{
+			if (!this.opts.tabFocus) return true;
+			if (this.isEmpty(this.get()) && this.opts.tabSpaces === false) return true;
 
-				if (pre === true && !e.shiftKey)
-				{
-					this.bufferSet();
-					this.insertNode(document.createTextNode('\t'));
-					this.sync();
-					return false;
+			e.preventDefault();
 
-				}
-				else if (this.opts.tabSpaces !== false)
-				{
-					this.bufferSet();
-					this.insertNode(document.createTextNode(Array(this.opts.tabSpaces + 1).join('\u00a0')));
-					this.sync();
-					return false;
-				}
-				else
-				{
-					if (!e.shiftKey) this.indentingIndent();
-					else this.indentingOutdent();
-				}
+			if (pre === true && !e.shiftKey)
+			{
+				this.bufferSet();
+				this.insertNode(document.createTextNode('\t'));
+				this.sync();
+				return false;
 
+			}
+			else if (this.opts.tabSpaces !== false)
+			{
+				this.bufferSet();
+				this.insertNode(document.createTextNode(Array(this.opts.tabSpaces + 1).join('\u00a0')));
+				this.sync();
 				return false;
 			}
+			else
+			{
+				if (!e.shiftKey) this.indentingIndent();
+				else this.indentingOutdent();
+			}
 
-			// delete zero-width space before the removing
-			if (key === this.keyCode.BACKSPACE)
+			return false;
+		},
+		buildEventKeydownBackspace: function(current)
+		{
+			if (typeof current.tagName !== 'undefined' && /^(H[1-6])$/i.test(current.tagName))
 			{
-				if (typeof current.tagName !== 'undefined' && /^(H[1-6])$/i.test(current.tagName))
-				{
-					var node;
-					if (this.opts.linebreaks === false) node = $('<p>' + this.opts.invisibleSpace + '</p>');
-					else node = $('<br>' + this.opts.invisibleSpace);
+				var node;
+				if (this.opts.linebreaks === false) node = $('<p>' + this.opts.invisibleSpace + '</p>');
+				else node = $('<br>' + this.opts.invisibleSpace);
 
-					$(current).replaceWith(node);
-					this.selectionStart(node);
-				}
+				$(current).replaceWith(node);
+				this.selectionStart(node);
+			}
 
-				if (typeof current.nodeValue !== 'undefined' && current.nodeValue !== null)
+			if (typeof current.nodeValue !== 'undefined' && current.nodeValue !== null)
+			{
+				//var value = $.trim(current.nodeValue.replace(/[^\u0000-\u1C7F]/g, ''));
+				if (current.remove && current.nodeType === 3 && current.nodeValue.match(/[^/\u200B]/g) == null)
 				{
-					var value = $.trim(current.nodeValue.replace(/[^\u0000-\u1C7F]/g, ''));
-					if (current.remove && current.nodeType === 3 && current.nodeValue.charCodeAt(0) == 8203 && value == '')
-					{
-						current.remove();
-					}
+					current.remove();
 				}
 			}
 		},
@@ -1392,7 +1538,7 @@
 		},
 		buildEventKeyup: function(e)
 		{
-			if (rtePaste) return false;
+			if (this.rtePaste) return false;
 
 			var key = e.which;
 			var parent = this.getParent();
@@ -1414,17 +1560,11 @@
 			// convert links
 			if ((this.opts.convertLinks || this.opts.convertImageLinks || this.opts.convertVideoLinks) && key === this.keyCode.ENTER)
 			{
-				this.formatLinkify(this.opts.linkProtocol, this.opts.convertLinks, this.opts.convertImageLinks, this.opts.convertVideoLinks);
-
-				setTimeout($.proxy(function()
-				{
-					if (this.opts.convertImageLinks) this.observeImages();
-					if (this.opts.observeLinks) this.observeLinks();
-				}, this), 5);
+				this.buildEventKeyupConverters();
 			}
 
 			// if empty
-			if (this.opts.linebreaks === false && (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE))
+			if (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE)
 			{
 				return this.formatEmpty(e);
 			}
@@ -1432,6 +1572,16 @@
 			this.callback('keyup', e);
 			this.sync();
 		},
+		buildEventKeyupConverters: function()
+		{
+			this.formatLinkify(this.opts.linkProtocol, this.opts.convertLinks, this.opts.convertImageLinks, this.opts.convertVideoLinks, this.opts.linkSize);
+
+			setTimeout($.proxy(function()
+			{
+				if (this.opts.convertImageLinks) this.observeImages();
+				if (this.opts.observeLinks) this.observeLinks();
+			}, this), 5);
+		},
 		buildPlugins: function()
 		{
 			if (!this.opts.plugins ) return;
@@ -1576,6 +1726,10 @@
 				// place the cursor inside emptyHtml
 				this.selectionStart(this.$editor.children()[0]);
 			}
+			else
+			{
+				this.focus();
+			}
 
 			this.sync();
 		},
@@ -1657,102 +1811,116 @@
 			sel.addRange(range);
 		},
 
-
 		// TOGGLE
 		toggle: function(direct)
 		{
-			var html;
-			if (this.opts.visual)
+			if (this.opts.visual) this.toggleCode(direct);
+			else this.toggleVisual();
+		},
+		toggleVisual: function()
+		{
+			var html = this.$source.hide().val();
+
+			if (typeof this.modified !== 'undefined')
 			{
-				if (direct !== false) this.selectionSave();
+				this.modified = this.cleanRemoveSpaces(this.modified, false) !== this.cleanRemoveSpaces(html, false);
+			}
 
-				var height = null;
-				if (this.opts.iframe)
-				{
-					height = this.$frame.height();
-					if (this.opts.fullpage) this.$editor.removeAttr('contenteditable');
-					this.$frame.hide();
-				}
+			if (this.modified)
+			{
+				// don't remove the iframe even if cleared all.
+				if (this.opts.fullpage && html === '') this.setFullpageOnInit(html);
 				else
 				{
-					height = this.$editor.innerHeight();
-					this.$editor.hide();
+					this.set(html);
+					if (this.opts.fullpage) this.buildBindKeyboard();
 				}
+			}
 
-				html = this.$source.val();
-				this.modified = html;
+			if (this.opts.iframe) this.$frame.show();
+			else this.$editor.show();
 
-				this.$source.height(height).show().focus();
+			if (this.opts.fullpage) this.$editor.attr('contenteditable', true );
 
-				// textarea indenting
-				this.$source.on('keydown.redactor-textarea-indenting', function (e)
-				{
-					if (e.keyCode === 9)
-					{
-						var $el = $(this);
-						var start = $el.get(0).selectionStart;
-						$el.val($el.val().substring(0, start) + "\t" + $el.val().substring($el.get(0).selectionEnd));
-						$el.get(0).selectionStart = $el.get(0).selectionEnd = start + 1;
-						return false;
-					}
-				});
+			this.$source.off('keydown.redactor-textarea-indenting');
+
+			this.$editor.focus();
+			this.selectionRestore();
 
-				this.buttonInactiveVisual();
-				this.buttonActive('html');
-				this.opts.visual = false;
+			this.observeStart();
+			this.buttonActiveVisual();
+			this.buttonInactive('html');
+			this.opts.visual = true;
+		},
+		toggleCode: function(direct)
+		{
+			if (direct !== false) this.selectionSave();
 
+			var height = null;
+			if (this.opts.iframe)
+			{
+				height = this.$frame.height();
+				if (this.opts.fullpage) this.$editor.removeAttr('contenteditable');
+				this.$frame.hide();
 			}
 			else
 			{
-				html = this.$source.hide().val();
-
-				if (typeof this.modified !== 'undefined')
-				{
-					this.modified = this.cleanRemoveSpaces(this.modified, false) !== this.cleanRemoveSpaces(html, false);
-				}
+				height = this.$editor.innerHeight();
+				this.$editor.hide();
+			}
 
-				if (this.modified)
-				{
-					// don't remove the iframe even if cleared all.
-					if (this.opts.fullpage && html === '') this.setFullpageOnInit(html);
-					else
-					{
-						this.set(html);
-						if (this.opts.fullpage) this.buildBindKeyboard();
-					}
-				}
+			var html = this.$source.val();
 
-				if (this.opts.iframe) this.$frame.show();
-				else this.$editor.show();
+			// tidy html
+			if (html !== '' && this.opts.tidyHtml)
+			{
+				this.$source.val(this.cleanHtml(html));
+			}
 
-				if (this.opts.fullpage ) this.$editor.attr('contenteditable', true );
+			this.modified = html;
 
-				this.$source.off('keydown.redactor-textarea-indenting');
+			this.$source.height(height).show().focus();
 
-				this.$editor.focus();
-				this.selectionRestore();
+			// textarea indenting
+			this.$source.on('keydown.redactor-textarea-indenting', this.textareaIndenting);
 
-				this.observeStart();
-				this.buttonActiveVisual();
-				this.buttonInactive('html');
-				this.opts.visual = true;
+			this.buttonInactiveVisual();
+			this.buttonActive('html');
+			this.opts.visual = false;
+		},
+		textareaIndenting: function(e)
+		{
+			if (e.keyCode === 9)
+			{
+				var $el = $(this);
+				var start = $el.get(0).selectionStart;
+				$el.val($el.val().substring(0, start) + "\t" + $el.val().substring($el.get(0).selectionEnd));
+				$el.get(0).selectionStart = $el.get(0).selectionEnd = start + 1;
+				return false;
 			}
 		},
 
-
 		// AUTOSAVE
 		autosave: function()
 		{
 			var savedHtml = false;
+            var html = this.get();
+            var submitData = "";
+            if(this.opts.autosaveFormdata == true)
+            {
+                submitData = this.$source.closest('form').serialize();
+            }
+            else{
+                submitData = this.$source.attr('name') + '=' + escape(encodeURIComponent(html));
+            }
 			this.autosaveInterval = setInterval($.proxy(function()
 			{
-				var html = this.get();
 				if (savedHtml !== html)
 				{
 					$.ajax({
 						url: this.opts.autosave,
 						type: 'post',
-						data: this.$source.attr('name') + '=' + escape(encodeURIComponent(html)),
+						data: submitData,
 						success: $.proxy(function(data)
 						{
 							this.callback('autosave', false, data);
@@ -1904,7 +2072,6 @@
 				var text = this.getSelectionText();
 
 				if (e.type === 'mouseup' && text != '') this.airShow(e);
-
 				if (e.type === 'keyup' && e.shiftKey && text != '')
 				{
 					var $focusElem = $(this.getElement(this.getSelection().focusNode)), offset = $focusElem.offset();
@@ -2095,6 +2262,7 @@
 			this.$editor.one('click', hdlHideDropDown);
 
 			e.stopPropagation();
+			this.$editor.focus();
 		},
 		dropdownHideAll: function()
 		{
@@ -2113,7 +2281,7 @@
 		// BUTTONS
 		buttonBuild: function(btnName, btnObject)
 		{
-			var $button = $('<a href="javascript:;" title="' + btnObject.title + '" class="redactor_btn redactor_btn_' + btnName + '"></a>');
+			var $button = $('<a href="javascript:;" title="' + btnObject.title + '" tabindex="-1" class="redactor_btn redactor_btn_' + btnName + '"></a>');
 
 			$button.on('click', $.proxy(function(e)
 			{
@@ -2337,14 +2505,47 @@
 		},
 
 		// EXEC
+		execPasteFrag: function(html)
+		{
+			var sel = this.getSelection();
+			if (sel.getRangeAt && sel.rangeCount)
+			{
+            	range = sel.getRangeAt(0);
+				range.deleteContents();
+
+				var el = document.createElement("div");
+				el.innerHTML = html;
+				var frag = document.createDocumentFragment(), node, lastNode;
+				while ((node = el.firstChild))
+				{
+	                lastNode = frag.appendChild(node);
+				}
+
+				var firstNode = frag.firstChild;
+				range.insertNode(frag);
+
+				if (lastNode)
+				{
+	                range = range.cloneRange();
+	                range.setStartAfter(lastNode);
+                    range.collapse(true);
+	                sel.removeAllRanges();
+	                sel.addRange(range);
+				}
+			}
+		},
 		exec: function(cmd, param, sync)
 		{
 			if (cmd === 'formatblock' && this.browser('msie')) param = '<' + param + '>';
 
 			if (cmd === 'inserthtml' && this.browser('msie'))
 			{
-				this.$editor.focus();
-				this.document.selection.createRange().pasteHTML(param);
+				if (!this.isIe11())
+				{
+					this.$editor.focus();
+					this.document.selection.createRange().pasteHTML(param);
+				}
+				else this.execPasteFrag(param);
 			}
 			else
 			{
@@ -2369,128 +2570,144 @@
 				return;
 			}
 
-			// stop formatting pre
-			if (this.currentOrParentIs('PRE') && !this.opts.formattingPre)
-			{
-				return false;
-			}
-
-			if (cmd === 'insertunorderedlist' || cmd === 'insertorderedlist')
-			{
-				this.bufferSet();
+			// Stop formatting pre
+			if (this.currentOrParentIs('PRE') && !this.opts.formattingPre) return false;
 
-				var parent = this.getParent();
-				var $list = $(parent).closest('ol, ul');
-				var remove = false;
+			// Lists
+			if (cmd === 'insertunorderedlist' || cmd === 'insertorderedlist') return this.execLists(cmd, param);
 
-				if ($list.length)
-				{
-					remove = true;
-					var listTag = $list[0].tagName;
-				 	if ((cmd === 'insertunorderedlist' && listTag === 'OL')
-				 	|| (cmd === 'insertorderedlist' && listTag === 'UL'))
-				 	{
-					 	remove = false;
-					}
-				}
+			// Unlink
+			if (cmd === 'unlink') return this.execUnlink(cmd, param);
 
-				this.selectionSave();
+			// Usual exec
+			this.exec(cmd, param, sync);
 
-				// remove lists
-				if (remove)
-				{
-					var nodes = this.getNodes();
-					var elems = this.getBlocks(nodes);
+			// Line
+			if (cmd === 'inserthorizontalrule') this.$editor.find('hr').removeAttr('id');
 
-					if (typeof nodes[0] != 'undefined' && nodes.length > 1 && nodes[0].nodeType == 3)
-					{
-						// fix the adding the first li to the array
-						elems.unshift(this.getBlock());
-					}
+		},
+		execUnlink: function(cmd, param)
+		{
+			this.bufferSet();
 
-					var data = '', replaced = '';
-					$.each(elems, $.proxy(function(i,s)
-					{
-						if (s.tagName == 'LI')
-						{
-							var $s = $(s);
-							var cloned = $s.clone();
-							cloned.find('ul', 'ol').remove();
+			var link = this.currentOrParentIs('A');
+			if (link)
+			{
+				$(link).replaceWith($(link).text());
 
-							if (this.opts.linebreaks === false) data += this.outerHtml($('<p>').append(cloned.contents()));
-							else data += cloned.html() + '<br>';
+				this.sync();
+				this.callback('execCommand', cmd, param);
+				return;
+			}
+		},
+		execLists: function(cmd, param)
+		{
+			this.bufferSet();
 
-							if (i == 0)
-							{
-								$s.addClass('redactor-replaced').empty();
-								replaced = this.outerHtml($s);
-							}
-							else $s.remove();
-						}
+			var parent = this.getParent();
+			var $list = $(parent).closest('ol, ul');
+			var remove = false;
 
-					}, this));
+			if ($list.length)
+			{
+				remove = true;
+				var listTag = $list[0].tagName;
+			 	if ((cmd === 'insertunorderedlist' && listTag === 'OL')
+			 	|| (cmd === 'insertorderedlist' && listTag === 'UL'))
+			 	{
+				 	remove = false;
+				}
+			}
 
-					html = this.$editor.html().replace(replaced, '</' + listTag + '>' + data + '<' + listTag + '>');
+			this.selectionSave();
 
-					this.$editor.html(html);
-					this.$editor.find(listTag + ':empty').remove();
+			// remove lists
+			if (remove)
+			{
+				var nodes = this.getNodes();
+				var elems = this.getBlocks(nodes);
 
+				if (typeof nodes[0] != 'undefined' && nodes.length > 1 && nodes[0].nodeType == 3)
+				{
+					// fix the adding the first li to the array
+					elems.unshift(this.getBlock());
 				}
 
-				// insert lists
-				else
+				var data = '', replaced = '';
+				$.each(elems, $.proxy(function(i,s)
 				{
-					this.document.execCommand(cmd);
+					if (s.tagName == 'LI')
+					{
+						var $s = $(s);
+						var cloned = $s.clone();
+						cloned.find('ul', 'ol').remove();
 
-					var parent = this.getParent();
-					var $list = $(parent).closest('ol, ul');
+						if (this.opts.linebreaks === false) data += this.outerHtml($('<p>').append(cloned.contents()));
+						else data += cloned.html() + '<br>';
 
-					if ($list.length)
-					{
-						if ((this.browser('msie') || this.browser('mozilla')) && parent.tagName !== 'LI')
+						if (i == 0)
 						{
-							$(parent).replaceWith($(parent).html());
-						}
-
-						var $listParent = $list.parent();
-						if (this.isParentRedactor($listParent) && this.nodeTestBlocks($listParent[0]))
-						{
-							$listParent.replaceWith($listParent.contents());
+							$s.addClass('redactor-replaced').empty();
+							replaced = this.outerHtml($s);
 						}
+						else $s.remove();
 					}
 
-					if (this.browser('mozilla')) this.$editor.focus();
+				}, this));
 
-				}
+				html = this.$editor.html().replace(replaced, '</' + listTag + '>' + data + '<' + listTag + '>');
 
-				this.selectionRestore();
+				this.$editor.html(html);
+				this.$editor.find(listTag + ':empty').remove();
 
-				this.sync();
-				this.callback('execCommand', cmd, param);
-				return;
 			}
 
-			if (cmd === 'unlink')
+			// insert lists
+			else
 			{
-				this.bufferSet();
+				var firstParent = this.getParent();
+
+				this.document.execCommand(cmd);
 
-				var link = this.currentOrParentIs('A');
-				if (link)
+				var parent = this.getParent();
+				var $list = $(parent).closest('ol, ul');
+
+				if (firstParent && firstParent.tagName == 'TD')
 				{
-					$(link).replaceWith($(link).text());
+					$list.wrapAll('<td>');
+				}
 
-					this.sync();
-					this.callback('execCommand', cmd, param);
-					return;
+				if ($list.length)
+				{
+					// focus fix
+					var li = $list.children().first();
+					if ($.trim($(li).text()) == '')
+					{
+						var marker = $('<span id="selection-marker-1"></span>');
+						$(li).prepend(marker);
+					}
+
+					if ((this.browser('msie') || this.browser('mozilla')) && parent.tagName !== 'LI')
+					{
+						$(parent).replaceWith($(parent).html());
+					}
+
+					var $listParent = $list.parent();
+					if (this.isParentRedactor($listParent) && this.nodeTestBlocks($listParent[0]))
+					{
+						$listParent.replaceWith($listParent.contents());
+					}
 				}
+
+				if (this.browser('mozilla')) this.$editor.focus();
 			}
 
-			this.exec(cmd, param, sync);
+			this.selectionRestore();
+			$(marker).remove();
 
-			if (cmd === 'inserthorizontalrule')
-			{
-				this.$editor.find('hr').removeAttr('id');
-			}
+			this.sync();
+			this.callback('execCommand', cmd, param);
+			return;
 		},
 
 		// INDENTING
@@ -2512,7 +2729,6 @@
 
 				this.selectionSave();
 
-
 				if (block && block.tagName == 'LI')
 				{
 					// li
@@ -2637,6 +2853,8 @@
 				this.selectionRestore();
 			}
 
+			this.sync();
+
 		},
 		insideOutdent: function (li, index, elems)
 		{
@@ -2664,6 +2882,82 @@
 			}
 		},
 
+		// ALIGNMENT
+		alignmentLeft: function()
+		{
+			this.alignmentSet('', 'JustifyLeft');
+		},
+		alignmentRight: function()
+		{
+			this.alignmentSet('right', 'JustifyRight');
+		},
+		alignmentCenter: function()
+		{
+			this.alignmentSet('center', 'JustifyCenter');
+		},
+		alignmentJustify: function()
+		{
+			this.alignmentSet('justify', 'JustifyFull');
+		},
+		alignmentSet: function(type, cmd)
+		{
+			this.bufferSet();
+
+			if (this.oldIE())
+			{
+				this.document.execCommand(cmd, false, false);
+				return true;
+			}
+
+			this.selectionSave();
+
+			var block = this.getBlock();
+			if (!block && this.opts.linebreaks)
+			{
+				// one element
+				this.exec('formatBlock', 'blockquote');
+				var newblock = this.getBlock();
+				var block = $('<div data-tagblock="">').html($(newblock).html());
+				$(newblock).replaceWith(block);
+
+				$(block).css('text-align', type);
+				this.removeEmptyAttr(block, 'style');
+
+				if (type == '' && typeof($(block).data('tagblock')) !== 'undefined')
+				{
+					$(block).replaceWith($(block).html());
+				}
+			}
+			else
+			{
+				var elements = this.getBlocks();
+				$.each(elements, $.proxy(function(i, elem)
+				{
+					var $el = false;
+
+					if ($.inArray(elem.tagName, this.opts.alignmentTags) !== -1)
+					{
+						$el = $(elem);
+					}
+					else
+					{
+						$el = $(elem).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
+					}
+
+					if ($el)
+					{
+						$el.css('text-align', type);
+						this.removeEmptyAttr($el, 'style');
+					}
+
+				}, this));
+			}
+
+			this.selectionRestore();
+
+			this.sync();
+		},
+
 		// CLEAN
 		cleanEmpty: function(html)
 		{
@@ -2802,9 +3096,10 @@
 
 			html = html + "\n";
 
+
 			var safes = [];
 			var matches = html.match(/<(table|div|pre|object)(.*?)>([\w\W]*?)<\/(table|div|pre|object)>/gi);
-			if (matches === null) matches = [];
+			if (!matches) matches = [];
 
 			var commentsMatches = html.match(/<!--([\w\W]*?)-->/gi);
 			if (commentsMatches) matches = $.merge(matches, commentsMatches);
@@ -2812,10 +3107,7 @@
 			if (this.opts.phpTags)
 			{
 				var phpMatches = html.match(/<section(.*?)rel="redactor-php-tag">([\w\W]*?)<\/section>/gi);
-				if (phpMatches)
-				{
-					matches = $.merge(matches, phpMatches);
-				}
+				if (phpMatches) matches = $.merge(matches, phpMatches);
 			}
 
 			if (matches)
@@ -2851,24 +3143,18 @@
                 {
 					if (htmls[i].search('{replace') == -1)
 					{
-						html += '<p>' +  htmls[i].replace(/^\n+|\n+$/g, "") + "</p>";
+						htmls[i] = htmls[i].replace(/<p>\n\t<\/p>/gi, '');
+						htmls[i] = htmls[i].replace(/<p><\/p>/gi, '');
+
+						if (htmls[i] != '')
+						{
+							html += '<p>' +  htmls[i].replace(/^\n+|\n+$/g, "") + "</p>";
+						}
 					}
 					else html += htmls[i];
 				}
 			}
 
-			// blockquote
-			if (html.search(/<blockquote/gi) !== -1)
-			{
-				$.each(html.match(/<blockquote(.*?)>([\w\W]*?)<\/blockquote>/gi), function(i,s)
-				{
-					var str = '';
-					str = s.replace('<p>', '');
-					str = str.replace('</p>', '<br>');
-					html = html.replace(s, str);
-				});
-			}
-
 			html = R('<p>\s*</p>', 'gi', '');
 			html = R('<p>([^<]+)</(div|address|form)>', 'gi', "<p>$1</p></$2>");
 			html = R('<p>\s*(</?' + blocks + '[^>]*>)\s*</p>', 'gi', "$1");
@@ -2891,7 +3177,6 @@
 			html = R('<br></p></blockquote>', 'gi', '</blockquote>');
 			html = R('<p>\t*</p>', 'gi', '');
 
-
 			// restore safes
 			$.each(safes, function(i,s)
 			{
@@ -2900,7 +3185,7 @@
 
 			return $.trim(html);
 		},
-		cleanConvertInlineTags: function(html)
+		cleanConvertInlineTags: function(html, set)
 		{
 			var boldTag = 'strong';
 			if (this.opts.boldTag === 'b') boldTag = 'b';
@@ -2918,11 +3203,13 @@
 			if (this.opts.italicTag === 'em') html = html.replace(/<i>([\w\W]*?)<\/i>/gi, '<em>$1</em>');
 			else html = html.replace(/<em>([\w\W]*?)<\/em>/gi, '<i>$1</i>');
 
-			html = html.replace(/<strike>([\w\W]*?)<\/strike>/gi, '<del>$1</del>');
-
-			if (!/<span(.*?)data-redactor="verified"(.*?)>([\w\W]*?)<\/span>/gi.test(html))
+			if (set !== true)
+			{
+				html = html.replace(/<strike>([\w\W]*?)<\/strike>/gi, '<del>$1</del>');
+			}
+			else
 			{
-				html = html.replace(/<span(.*?)(?!data-redactor="verified")(.*?)>([\w\W]*?)<\/span>/gi, '<span$1 data-redactor="verified"$2>$3</span>');
+				html = html.replace(/<del>([\w\W]*?)<\/del>/gi, '<strike>$1</strike>');
 			}
 
 			return html;
@@ -2958,8 +3245,12 @@
 					var arr = s.match(/<(pre|code)(.*?)>([\w\W]*?)<\/(pre|code)>/i);
 
 					arr[3] = arr[3].replace(/&nbsp;/g, ' ');
+
 					if (encode !== false) arr[3] = this.cleanEncodeEntities(arr[3]);
 
+					// $ fix
+					arr[3] = arr[3].replace(/\$/g, '&#36;');
+
 					html = html.replace(s, '<' + arr[1] + arr[2] + '>' + arr[3] + '</' + arr[1] + '>');
 
 				}, this));
@@ -2970,26 +3261,21 @@
 		cleanEncodeEntities: function(str)
 		{
 			str = String(str).replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"');
-			return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+			return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 		},
 		cleanUnverified: function()
 		{
 			// label, abbr, mark, meter, code, q, dfn, ins, time, kbd, var
-
 			var $elem = this.$editor.find('li, img, a, b, strong, sub, sup, i, em, u, small, strike, del, span, cite');
 
-			$elem.not('[data-redactor="verified"]').filter('[style*="font-size"][style*="line-height"]')
-			.css('font-size', '')
-			.css('line-height', '');
-
-			$elem.not('[data-redactor="verified"]').filter('[style*="background-color: transparent;"][style*="line-height"]')
+			$elem.filter('[style*="background-color: transparent;"][style*="line-height"]')
 			.css('background-color', '')
 			.css('line-height', '');
 
-			$elem.not('[data-redactor="verified"]').filter('[style*="background-color: transparent;"]')
+			$elem.filter('[style*="background-color: transparent;"]')
 			.css('background-color', '');
 
-			$elem.not('[data-redactor="verified"]').css('line-height', '');
+			$elem.css('line-height', '');
 
 			$.each($elem, $.proxy(function(i,s)
 			{
@@ -3181,97 +3467,33 @@
 			return out;
 		},
 
-		// ALIGNMENT
-		alignmentLeft: function()
-		{
-			this.alignmentSet('', 'JustifyLeft');
-		},
-		alignmentRight: function()
-		{
-			this.alignmentSet('right', 'JustifyRight');
-		},
-		alignmentCenter: function()
-		{
-			this.alignmentSet('center', 'JustifyCenter');
-		},
-		alignmentJustify: function()
-		{
-			this.alignmentSet('justify', 'JustifyFull');
-		},
-		alignmentSet: function(type, cmd)
+		// FORMAT
+		formatEmpty: function(e)
 		{
-			this.bufferSet();
-
-			if (this.oldIE())
-			{
-				this.document.execCommand(cmd, false, false);
-				return true;
-			}
-
-			this.selectionSave();
+			var html = $.trim(this.$editor.html());
 
-			var block = this.getBlock();
-			if (!block && this.opts.linebreaks)
+			if (this.opts.linebreaks)
 			{
-				// one element
-				this.exec('formatBlock', 'blockquote');
-				var newblock = this.getBlock();
-				var block = $('<div data-tagblock="">').html($(newblock).html());
-				$(newblock).replaceWith(block);
-
-				$(block).css('text-align', type);
-				this.removeEmptyAttr(block, 'style');
-
-				if (type == '' && typeof($(block).data('tagblock')) !== 'undefined')
+				if (html == '')
 				{
-					$(block).replaceWith($(block).html());
+					e.preventDefault();
+					this.$editor.html('');
+					this.focus();
 				}
 			}
 			else
 			{
-				var elements = this.getBlocks();
-				$.each(elements, $.proxy(function(i, elem)
-				{
-					var $el = false;
-
-					if ($.inArray(elem.tagName, this.opts.alignmentTags) !== -1)
-					{
-						$el = $(elem);
-					}
-					else
-					{
-						$el = $(elem).closest(this.opts.alignmentTags.toString().toLowerCase(), this.$editor[0]);
-					}
-
-					if ($el)
-					{
-						$el.css('text-align', type);
-						this.removeEmptyAttr($el, 'style');
-					}
+				html = html.replace(/<br\s?\/?>/i, '');
+				var thtml = html.replace(/<p>\s?<\/p>/gi, '');
 
-				}, this));
-			}
-
-			this.selectionRestore();
-
-			this.sync();
-		},
-
-		// FORMAT
-		formatEmpty: function(e)
-		{
-			var html = $.trim(this.$editor.html());
-
-			html = html.replace(/<br\s?\/?>/i, '');
-			var thtml = html.replace(/<p>\s?<\/p>/gi, '');
-
-			if (html === '' || thtml === '')
-			{
-				e.preventDefault();
+				if (html === '' || thtml === '')
+				{
+					e.preventDefault();
 
-				var node = $(this.opts.emptyHtml).get(0);
-				this.$editor.html(node);
-				this.focus();
+					var node = $(this.opts.emptyHtml).get(0);
+					this.$editor.html(node);
+					this.focus();
+				}
 			}
 
 			this.sync();
@@ -3287,7 +3509,29 @@
 			{
 				if (node.tagName !== 'LI')
 				{
-					this.formatBlock(tag, node);
+					var parent = $(node).parent();
+
+					if (tag === 'p')
+					{
+						if ((node.tagName === 'P'
+						&& parent.size() != 0
+						&& parent[0].tagName === 'BLOCKQUOTE')
+						||
+						node.tagName === 'BLOCKQUOTE')
+						{
+							this.formatQuote();
+							return;
+						}
+						else if (this.opts.linebreaks) return;
+						else
+						{
+							this.formatBlock(tag, node);
+						}
+					}
+					else
+					{
+						this.formatBlock(tag, node);
+					}
 				}
 
 			}, this));
@@ -3327,8 +3571,15 @@
 			}
 			else
 			{
+				var parent = this.getParent();
+
 				var node = $('<' + tag + '>').append(contents);
 				$(block).replaceWith(node);
+
+				if (parent && parent.tagName == 'TD')
+				{
+					$(node).wrapAll('<td>');
+				}
 			}
 		},
 		formatChangeTag: function(fromElement, toTagName, save)
@@ -3348,25 +3599,110 @@
 		{
 			this.bufferSet();
 
+			// paragraphy
 			if (this.opts.linebreaks === false)
 			{
 				this.selectionSave();
 
 				var blocks = this.getBlocks();
+
+				var blockquote = false;
+				var blocksLen = blocks.length;
 				if (blocks)
 				{
+					var data = '';
+					var replaced = '';
+					var replace = false;
+					var paragraphsOnly = true;
+
+					$.each(blocks, function(i,s)
+					{
+						if (s.tagName !== 'P') paragraphsOnly = false;
+					});
+
 					$.each(blocks, $.proxy(function(i,s)
 					{
 						if (s.tagName === 'BLOCKQUOTE')
 						{
 							this.formatBlock('p', s, false);
 						}
+						else if (s.tagName === 'P')
+						{
+							blockquote = $(s).parent();
+							// from blockquote
+							if (blockquote[0].tagName == 'BLOCKQUOTE')
+							{
+								var count = $(blockquote).children('p').size();
+
+								// one
+								if (count == 1)
+								{
+									$(blockquote).replaceWith(s);
+								}
+								// all
+								else if (count == blocksLen)
+								{
+									replace = 'blockquote';
+									data += this.outerHtml(s);
+								}
+								// some
+								else
+								{
+									replace = 'html';
+									data += this.outerHtml(s);
+
+									if (i == 0)
+									{
+										$(s).addClass('redactor-replaced').empty();
+										replaced = this.outerHtml(s);
+									}
+									else $(s).remove();
+								}
+							}
+							// to blockquote
+							else
+							{
+								if (paragraphsOnly === false || blocks.length == 1)
+								{
+									this.formatBlock('blockquote', s, false);
+								}
+								else
+								{
+									replace = 'paragraphs';
+									data += this.outerHtml(s);
+								}
+							}
+
+						}
 						else if (s.tagName !== 'LI')
 						{
 							this.formatBlock('blockquote', s, false);
 						}
 
 					}, this));
+
+					if (replace)
+					{
+						if (replace == 'paragraphs')
+						{
+							$(blocks[0]).replaceWith('<blockquote>' + data + '</blockquote>');
+							$(blocks).remove();
+						}
+						else if (replace == 'blockquote')
+						{
+							$(blockquote).replaceWith(data);
+						}
+						else if (replace == 'html')
+						{
+							var html = this.$editor.html().replace(replaced, '</blockquote>' + data + '<blockquote>');
+
+							this.$editor.html(html);
+							this.$editor.find('blockquote').each(function()
+							{
+								if ($.trim($(this).html()) == '') $(this).remove();
+							})
+						}
+					}
 				}
 
 				this.selectionRestore();
@@ -3379,9 +3715,34 @@
 				{
 					this.selectionSave();
 
-					$(block).replaceWith($(block).html() + '<br>');
+					var html = $.trim($(block).html());
+					var selection = $.trim(this.getSelectionHtml());
+
+					html = html.replace(/<span(.*?)id="selection-marker(.*?)<\/span>/gi, '');
+
+					if (html == selection)
+					{
+						$(block).replaceWith($(block).html() + '<br>');
+					}
+					else
+					{
+						// replace
+						this.inlineFormat('tmp');
+						var tmp = this.$editor.find('tmp');
+						tmp.empty();
+
+						var newhtml = this.$editor.html().replace('<tmp></tmp>', '</blockquote><span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>' + selection + '<blockquote>');
+
+						this.$editor.html(newhtml);
+						tmp.remove();
+						this.$editor.find('blockquote').each(function()
+						{
+							if ($.trim($(this).html()) == '') $(this).remove();
+						})
+					}
 
 					this.selectionRestore();
+					this.$editor.find('span#selection-marker-1').attr('id', false);
 				}
 				else
 				{
@@ -3416,8 +3777,7 @@
 			this.sync();
 		},
 
-
-		// BLOCK CLASS AND STYLE
+		// BLOCK
 		blockRemoveAttr: function(attr, value)
 		{
 			var nodes = this.getBlocks();
@@ -3463,7 +3823,7 @@
 			this.sync();
 		},
 
-		// INLINE CLASS AND STYLE
+		// INLINE
 		inlineRemoveClass: function(className)
 		{
 			this.selectionSave();
@@ -3544,27 +3904,32 @@
 					this.inlineSetMethods(type, s, attr, value);
 
 				}, this));
+
 			}
 
 			this.selectionRestore();
-
 			this.sync();
 		},
 		inlineSetMethods: function(type, s, attr, value)
 		{
 			var parent = $(s).parent(), el;
 
-			if (parent && parent[0].tagName === 'SPAN' && parent[0].attributes.length != 0)
+			var selectionHtml = this.getSelectionText();
+			var parentHtml = $(parent).text();
+			var selected = selectionHtml == parentHtml;
+
+			if (selected && parent && parent[0].tagName === 'INLINE' && parent[0].attributes.length != 0)
 			{
 				el = parent;
 				$(s).replaceWith($(s).html());
 			}
 			else
 			{
-				el = $('<span data-redactor="verified" data-redactor-inlineMethods>').append($(s).contents());
+				el = $('<inline>').append($(s).contents());
 				$(s).replaceWith(el);
 			}
 
+
 			$(el)[type](attr, value);
 
 			return el;
@@ -3585,9 +3950,13 @@
 
 			$.each(nodes, $.proxy(function(i, node)
 			{
-				if (!collapsed && node.tagName !== 'SPAN')
+				if (!collapsed && node.tagName !== 'INLINE')
 				{
-					if (node.parentNode.tagName === 'SPAN' && !$(node.parentNode).hasClass('redactor_editor'))
+					var selectionHtml = this.getSelectionText();
+					var parentHtml = $(node).parent().text();
+					var selected = selectionHtml == parentHtml;
+
+					if (selected && node.parentNode.tagName === 'INLINE' && !$(node.parentNode).hasClass('redactor_editor'))
 					{
 						node = node.parentNode;
 					}
@@ -3599,7 +3968,7 @@
 		},
 		inlineUnwrapSpan: function()
 		{
-			var $spans = this.$editor.find('span[data-redactor-inlineMethods]');
+			var $spans = this.$editor.find('inline');
 
 			$.each($spans, $.proxy(function(i, span)
 			{
@@ -3664,13 +4033,13 @@
 
 			this.bufferSet();
 
-			var $html = $('<div>').append($.parseHTML(html));
+			var $html = $('<div>').append(html);
 			html = $html.html();
 
 			html = this.cleanRemoveEmptyTags(html);
 
 			// Update value
-			$html = $('<div>').append($.parseHTML(html));
+			$html = $('<div>').append(html);
 
 			var currBlock = this.getBlock();
 
@@ -3693,18 +4062,22 @@
 				html = '<p>' + html + '</p>';
 			}
 
-			// in the quote, we can insert text or links only
-/*
-			if (currBlock.tagName == 'BLOCKQUOTE' && html.indexOf('<a') === -1)
-			{
-				this.insertText(html);
-			}
-			else
-*/
+			html = this.setSpansVerifiedHtml(html);
+
 			if ($html.contents().length > 1 && currBlock
-					|| $html.contents().is('p, :header, ul, ol, div, table, blockquote, pre, address, section, header, footer, aside, article'))
+			|| $html.contents().is('p, :header, ul, ol, li, div, table, td, blockquote, pre, address, section, header, footer, aside, article'))
 			{
-				if (this.browser('msie')) this.document.selection.createRange().pasteHTML(html);
+				if (this.browser('msie'))
+				{
+					if (!this.isIe11())
+					{
+						this.document.selection.createRange().pasteHTML(html);
+					}
+					else
+					{
+						this.execPasteFrag(html);
+					}
+				}
 				else this.document.execCommand('inserthtml', false, html);
 			}
 			else this.insertHtmlAdvanced(html, false);
@@ -3721,10 +4094,15 @@
 
 			this.observeStart();
 
+			// set no editable
+			this.setNonEditable();
+
 			if (sync !== false) this.sync();
 		},
 		insertHtmlAdvanced: function(html, sync)
 		{
+			html = this.setSpansVerifiedHtml(html);
+
 			var sel = this.getSelection();
 
 			if (sel.getRangeAt && sel.rangeCount)
@@ -3758,15 +4136,35 @@
 			}
 
 		},
+		insertBeforeCursor: function(html)
+		{
+			html = this.setSpansVerifiedHtml(html);
+
+			var node = $(html);
+
+			var space = document.createElement("span");
+			space.innerHTML = "\u200B";
+
+			var range = this.getRange();
+			range.insertNode(space);
+			range.insertNode(node[0]);
+			range.collapse(false);
+
+			var sel = this.getSelection();
+			sel.removeAllRanges();
+			sel.addRange(range);
+
+			this.sync();
+		},
 		insertText: function(html)
 		{
-			var $html = $($.parseHTML(html));
+			var $html = $(html);
 
 			if ($html.length) html = $html.text();
 
 			this.$editor.focus();
 
-			if (this.browser('msie')) this.document.selection.createRange().pasteHTML(html);
+			if (this.browser('msie') && !this.isIe11()) this.document.selection.createRange().pasteHTML(html);
 			else this.document.execCommand('inserthtml', false, html);
 
 			this.sync();
@@ -3774,6 +4172,23 @@
 		insertNode: function(node)
 		{
 			node = node[0] || node;
+
+			if (node.tagName == 'SPAN')
+			{
+				var replacementTag = 'inline';
+
+			    var outer = node.outerHTML;
+
+			    // Replace opening tag
+			    var regex = new RegExp('<' + node.tagName, 'i');
+			    var newTag = outer.replace(regex, '<' + replacementTag);
+
+			    // Replace closing tag
+			    regex = new RegExp('</' + node.tagName, 'i');
+			    newTag = newTag.replace(regex, '</' + replacementTag);
+			    node = $(newTag)[0];
+			}
+
 			var sel = this.getSelection();
 			if (sel.getRangeAt && sel.rangeCount)
 			{
@@ -3815,29 +4230,48 @@
 			}
 
 		},
-		insertAfterLastElement: function(element)
+		insertAfterLastElement: function(element, parent)
 		{
+			if (typeof(parent) != 'undefined') element = parent;
+
 			if (this.isEndOfElement())
 			{
-
-				if ($($.trim(this.$editor.html())).get(0) != $.trim(element)
-				&& this.$editor.contents().last()[0] !== element) return false;
-
-				this.bufferSet();
-
-				if (this.opts.linebreaks === false)
+				if (this.opts.linebreaks)
 				{
-					var node = $(this.opts.emptyHtml);
-					$(element).after(node);
-					this.selectionStart(node);
+					var contents = $('<div>').append($.trim(this.$editor.html())).contents();
+					if (this.outerHtml(contents.last()[0]) != this.outerHtml(element))
+					{
+						return false;
+					}
 				}
 				else
 				{
-					var node = $('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>', this.document)[0];
-					$(element).after(node);
-					$(node).after(this.opts.invisibleSpace);
-					this.selectionRestore();
+					if (this.$editor.contents().last()[0] !== element)
+					{
+						return false;
+					}
 				}
+
+				this.insertingAfterLastElement(element);
+			}
+		},
+		insertingAfterLastElement: function(element)
+		{
+			this.bufferSet();
+
+			if (this.opts.linebreaks === false)
+			{
+				var node = $(this.opts.emptyHtml);
+				$(element).after(node);
+				this.selectionStart(node);
+			}
+			else
+			{
+				var node = $('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>', this.document)[0];
+				$(element).after(node);
+				$(node).after(this.opts.invisibleSpace);
+				this.selectionRestore();
+				this.$editor.find('span#selection-marker-1').removeAttr('id');
 			}
 		},
 		insertLineBreak: function()
@@ -3865,6 +4299,16 @@
 		{
 			html = this.callback('pasteBefore', false, html);
 
+			// ie10 fix paste links
+			if (this.browser('msie'))
+			{
+				var tmp = $.trim(html);
+				if (tmp.search(/^<a(.*?)>(.*?)<\/a>$/i) == 0)
+				{
+					html = html.replace(/^<a(.*?)>(.*?)<\/a>$/i, "$2");
+				}
+			}
+
 			if (this.opts.pastePlainText)
 			{
 				var tmp = this.document.createElement('div');
@@ -3874,6 +4318,7 @@
 				tmp.innerHTML = html;
 				html = tmp.textContent || tmp.innerText;
 
+				html = $.trim(html);
 				html = html.replace('\n', '<br>');
 				html = this.cleanParagraphy(html);
 
@@ -3890,8 +4335,13 @@
 			}
 
 			// ms word list
-			html = html.replace(/<p(.*?)class="MsoListParagraphCxSpFirst"([\w\W]*?)<\/p>/gi, '<ul><p$2</p>');
-			html = html.replace(/<p(.*?)class="MsoListParagraphCxSpLast"([\w\W]*?)<\/p>/gi, '<p$2</p></ul>');
+			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>');
+			// remove ms word's bullet
+			html = html.replace(/·/g, '');
 
 			// remove comments and php tags
 			html = html.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi, '');
@@ -3911,6 +4361,8 @@
 			html = html.replace(/<td><\/td>/gi, '[td]');
 			html = html.replace(/<td>&nbsp;<\/td>/gi, '[td]');
 			html = html.replace(/<td><br><\/td>/gi, '[td]');
+			html = html.replace(/<td(.*?)colspan="(.*?)"(.*?)>([\w\W]*?)<\/td>/gi, '[td colspan="$2"]$4[/td]');
+			html = html.replace(/<td(.*?)rowspan="(.*?)"(.*?)>([\w\W]*?)<\/td>/gi, '[td rowspan="$2"]$4[/td]');
 			html = html.replace(/<a(.*?)href="(.*?)"(.*?)>([\w\W]*?)<\/a>/gi, '[a href="$2"]$4[/a]');
 			html = html.replace(/<iframe(.*?)>([\w\W]*?)<\/iframe>/gi, '[iframe$1]$2[/iframe]');
 			html = html.replace(/<video(.*?)>([\w\W]*?)<\/video>/gi, '[video$1]$2[/video]');
@@ -3918,7 +4370,6 @@
 			html = html.replace(/<embed(.*?)>([\w\W]*?)<\/embed>/gi, '[embed$1]$2[/embed]');
 			html = html.replace(/<object(.*?)>([\w\W]*?)<\/object>/gi, '[object$1]$2[/object]');
 			html = html.replace(/<param(.*?)>/gi, '[param$1]');
-			html = html.replace(/<img(.*?)style="(.*?)"(.*?)>/gi, '[img$1$3]');
 			html = html.replace(/<img(.*?)>/gi, '[img$1]');
 
 			// remove classes
@@ -3929,10 +4380,11 @@
 
 			// remove empty
 			html = html.replace(/<[^\/>][^>]*>(\s*|\t*|\n*|&nbsp;|<br>)<\/[^>]+>/gi, '');
-
 			html = html.replace(/<div>\s*?\t*?\n*?(<ul>|<ol>|<p>)/gi, '$1');
 
 			// revert
+			html = html.replace(/\[td colspan="(.*?)"\]([\w\W]*?)\[\/td\]/gi, '<td colspan="$1">$2</td>');
+			html = html.replace(/\[td rowspan="(.*?)"\]([\w\W]*?)\[\/td\]/gi, '<td rowspan="$1">$2</td>');
 			html = html.replace(/\[td\]/gi, '<td>&nbsp;</td>');
 			html = html.replace(/\[a href="(.*?)"\]([\w\W]*?)\[\/a\]/gi, '<a href="$1">$2</a>');
 			html = html.replace(/\[iframe(.*?)\]([\w\W]*?)\[\/iframe\]/gi, '<iframe$1>$2</iframe>');
@@ -3960,7 +4412,6 @@
 				html = this.cleanParagraphy(html);
 			}
 
-
 			// remove span
 			html = html.replace(/<span(.*?)>([\w\W]*?)<\/span>/gi, '$2');
 
@@ -3988,6 +4439,13 @@
 			// remove safari local images
 			html = html.replace(/<img src="webkit-fake-url\:\/\/(.*?)"(.*?)>/gi, '');
 
+			// remove p in td
+			html = html.replace(/<td(.*?)>(\s*|\t*|\n*)<p>([\w\W]*?)<\/p>(\s*|\t*|\n*)<\/td>/gi, '<td$1>$3</td>');
+
+			// remove divs
+			html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '$2');
+			html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '$2');
+
 			// FF specific
 			this.pasteClipboardMozilla = false;
 			if (this.browser('mozilla'))
@@ -4013,7 +4471,7 @@
 				}
 			}
 
-			// bullets
+			// bullets again
 			html = html.replace(/<p>•([\w\W]*?)<\/p>/gi, '<li>$1</li>');
 
 			// ie inserts a blank font tags when pasting
@@ -4022,6 +4480,12 @@
 				html = html.replace(/<font>([\w\W]*?)<\/font>/gi, '$1');
 			}
 
+			// ms word lists breakline
+			html = html.replace(/<p>\n?<li>/gi, '<li>');
+			if (this.browser('msie') && !this.isIe11())
+			{
+				html = html.replace(/\n/g, '');
+			}
 
 			this.pasteInsert(html);
 
@@ -4051,7 +4515,7 @@
 			this.selectall = false;
 			setTimeout($.proxy(function()
 			{
-				rtePaste = false;
+				this.rtePaste = false;
 
 				// FF specific
 				if (this.browser('mozilla'))
@@ -4065,10 +4529,9 @@
 
 			}, this), 100);
 
-			if (this.opts.autoresize) $(this.document.body).scrollTop(this.saveScroll);
+			if (this.opts.autoresize && this.fullscreen !== true) $(this.document.body).scrollTop(this.saveScroll);
 			else this.$editor.scrollTop(this.saveScroll);
 		},
-
 		pasteClipboardUploadMozilla: function()
 		{
 			var imgs = this.$editor.find('img[data-mozilla-paste-image]');
@@ -4085,7 +4548,7 @@
 				},
 				$.proxy(function(data)
 				{
-					var json = $.parseJSON(data);
+					var json = (typeof data === 'string' ? $.parseJSON(data) : data);
 		        	$s.attr('src', json.filelink);
 		        	$s.removeAttr('data-mozilla-paste-image');
 
@@ -4113,7 +4576,7 @@
 				},
 				$.proxy(function(data)
 				{
-					var json = $.parseJSON(data);
+					var json = (typeof data === 'string' ? $.parseJSON(data) : data);
 
 					var html = '<img src="' + json.filelink + '" id="clipboard-image-marker" />';
 					this.execCommand('inserthtml', html, false);
@@ -4187,12 +4650,10 @@
 			setTimeout($.proxy(this.observeStart, this), 4);
 		},
 
-
 		// OBSERVE
 		observeStart: function()
 		{
 			this.observeImages();
-			this.observeTables();
 
 			if (this.opts.observeLinks) this.observeLinks();
 		},
@@ -4204,10 +4665,11 @@
 				this.linkObserverTooltipClose(e);
 
 			}, this));
-		},
-		observeTables: function()
-		{
-			this.$editor.find('table').on('click', $.proxy(this.tableObserver, this));
+			$(document).on('click.redactor', $.proxy(function(e)
+			{
+				this.linkObserverTooltipClose(e);
+
+			}, this));
 		},
 		observeImages: function()
 		{
@@ -4277,7 +4739,6 @@
 			$('.redactor-link-tooltip').remove();
 		},
 
-
 		// SELECTION
 		getSelection: function()
 		{
@@ -4294,7 +4755,7 @@
 			{
 				if (this.document.getSelection)
 				{
-					var sel = this.document.getSelection();
+					var sel = this.getSelection();
 					if (sel.getRangeAt && sel.rangeCount) return sel.getRangeAt(0);
 				}
 
@@ -4397,172 +4858,62 @@
 
 			var textNodes = this.getTextNodesIn(el);
 			var foundStart = false;
-			var charCount = 0, endCharCount;
-
-			if (textNodes.length == 1 && start)
-			{
-				range.setStart(textNodes[0], start);
-				range.setEnd(textNodes[0], end);
-			}
-			else
-			{
-				for (var i = 0, textNode; textNode = textNodes[i++];)
-				{
-					endCharCount = charCount + textNode.length;
-					if (!foundStart && start >= charCount && (start < endCharCount || (start == endCharCount && i < textNodes.length)))
-					{
-						range.setStart(textNode, start - charCount);
-						foundStart = true;
-					}
-
-					if (foundStart && end <= endCharCount)
-					{
-						range.setEnd( textNode, end - charCount );
-						break;
-					}
-
-					charCount = endCharCount;
-				}
-			}
-
-			var sel = this.getSelection();
-			sel.removeAllRanges();
-			sel.addRange( range );
-		},
-		getTextNodesIn: function (node)
-		{
-			var textNodes = [];
-
-			if (node.nodeType == 3) textNodes.push(node);
-			else
-			{
-				var children = node.childNodes;
-				for (var i = 0, len = children.length; i < len; ++i)
-				{
-					textNodes.push.apply(textNodes, this.getTextNodesIn(children[i]));
-				}
-			}
-
-			return textNodes;
-		},
-
-		// SAVE & RESTORE
-		selectionSave: function()
-		{
-			if (!this.isFocused()) this.$editor.focus();
-
-			if (!this.opts.rangy)
-			{
-				this.selectionCreateMarker(this.getRange());
-			}
-			// rangy
-			else
-			{
-				this.savedSel = rangy.saveSelection();
-			}
-		},
-		selectionCreateMarker: function(range, remove)
-		{
-			if (!range) return;
-
-			var node1 = $('<span id="selection-marker-1" class="redactor-selection-marker">' + this.opts.invisibleSpace + '</span>', this.document)[0];
-			var node2 = $('<span id="selection-marker-2" class="redactor-selection-marker">' + this.opts.invisibleSpace + '</span>', this.document)[0];
-
-			if (range.collapsed === true)
-			{
-				this.selectionSetMarker(range, node1, true);
-			}
-			else
-			{
-				this.selectionSetMarker(range, node1, true);
-				this.selectionSetMarker(range, node2, false);
-			}
-
-			this.savedSel = this.$editor.html();
-
-			this.selectionRestore(false, false);
-		},
-		selectionSetMarker: function(range, node, type)
-		{
-			var boundaryRange = range.cloneRange();
-
-			boundaryRange.collapse(type);
-
-			boundaryRange.insertNode(node);
-			boundaryRange.detach();
-		},
-		selectionRestore: function(replace, remove)
-		{
-			if (!this.opts.rangy)
-			{
-				if (replace === true && this.savedSel)
-				{
-					this.$editor.html(this.savedSel);
-				}
-
-				var node1 = this.$editor.find('span#selection-marker-1');
-				var node2 = this.$editor.find('span#selection-marker-2');
-
-				if (this.browser('mozilla'))
-				{
-					this.$editor.focus();
-				}
-				else if (!this.isFocused())
-				{
-					this.$editor.focus();
-				}
-
-				if (node1.length != 0 && node2.length != 0)
-				{
-					this.selectionSet(node1[0], 0, node2[0], 0);
-				}
-				else if (node1.length != 0)
-				{
-					this.selectionSet(node1[0], 0, null, 0);
-				}
+			var charCount = 0, endCharCount;
 
-				if (remove !== false)
-				{
-					this.selectionRemoveMarkers();
-					this.savedSel = false;
-				}
-			}
-			// rangy
-			else
+			if (textNodes.length == 1 && start)
 			{
-				rangy.restoreSelection(this.savedSel);
+				range.setStart(textNodes[0], start);
+				range.setEnd(textNodes[0], end);
 			}
-		},
-		selectionRemoveMarkers: function(type)
-		{
-			if (!this.opts.rangy)
+			else
 			{
-				$.each(this.$editor.find('span.redactor-selection-marker'), function()
+				for (var i = 0, textNode; textNode = textNodes[i++];)
 				{
-					var html = $.trim($(this).html().replace(/[^\u0000-\u1C7F]/g, ''));
-					if (html == '')
+					endCharCount = charCount + textNode.length;
+					if (!foundStart && start >= charCount && (start < endCharCount || (start == endCharCount && i < textNodes.length)))
 					{
-						$(this).remove();
+						range.setStart(textNode, start - charCount);
+						foundStart = true;
 					}
-					else
+
+					if (foundStart && end <= endCharCount)
 					{
-						$(this).removeAttr('class').removeAttr('id');
+						range.setEnd( textNode, end - charCount );
+						break;
 					}
-				});
+
+					charCount = endCharCount;
+				}
 			}
-			// rangy
+
+			var sel = this.getSelection();
+			sel.removeAllRanges();
+			sel.addRange( range );
+		},
+		getTextNodesIn: function (node)
+		{
+			var textNodes = [];
+
+			if (node.nodeType == 3) textNodes.push(node);
 			else
 			{
-				rangy.removeMarkers(this.savedSel);
+				var children = node.childNodes;
+				for (var i = 0, len = children.length; i < len; ++i)
+				{
+					textNodes.push.apply(textNodes, this.getTextNodesIn(children[i]));
+				}
 			}
+
+			return textNodes;
 		},
+
 		// GET ELEMENTS
 		getCurrent: function()
 		{
 			var el = false;
 			var sel = this.getSelection();
 
-			if (sel.rangeCount > 0) el = sel.getRangeAt(0).startContainer;
+			if (sel && sel.rangeCount > 0) el = sel.getRangeAt(0).startContainer;
 
 			return this.isParentRedactor(el);
 		},
@@ -4618,47 +4969,8 @@
 		{
 			return this.rTestBlock.test(tag);
 		},
-		getSelectedNodes: function(range)
-		{
-			if (typeof range == 'undefined' || range == false) var range = this.getRange()
-			if (range && range.collapsed === true)
-			{
-				return [this.getCurrent()];
-			}
-
-		    var sel = this.getSelection();
-		    try {
-		    	var frag = sel.getRangeAt(0).cloneContents();
-		    }
-		    catch(e)
-		    {
-		    	return(false);
-		    }
-
-		    var tempspan = this.document.createElement("span");
-		    tempspan.appendChild(frag);
-
-		    window.selnodes = tempspan.childNodes;
-
-			var len = selnodes.length;
-		    var output = [];
-		    for(var i = 0, u = len; i<u; i++)
-		    {
-		        output.push(selnodes[i]);
-			}
-
-			if (output.length == 0) output.push(this.getCurrent());
-
-		    return output;
-		},
 		getNodes: function(range, tag)
 		{
-			if (this.opts.linebreaks)
-			{
-				return this.getSelectedNodes(range);
-			}
-
-
 			if (typeof range == 'undefined' || range == false) var range = this.getRange();
 			if (range && range.collapsed === true)
 			{
@@ -4711,6 +5023,13 @@
 				}
 			}
 
+			// last element filtering
+			var last = finalnodes[finalnodes.length-1];
+			if (this.nodeTestBlocks(last))
+			{
+				finalnodes = finalnodes.slice(0, -1);
+			}
+
 			return finalnodes;
 		},
 		getElement: function(node)
@@ -4746,7 +5065,7 @@
 			node = range.startContainer;
 			while (node && node != range.commonAncestorContainer)
 			{
-				rangeNodes.unshift( node );
+				rangeNodes.unshift(node);
 				node = node.parentNode;
 			}
 
@@ -4767,7 +5086,6 @@
 			}
 		},
 
-
 		// GET SELECTION HTML OR TEXT
 		getSelectionText: function()
 		{
@@ -4793,6 +5111,117 @@
 			return this.syncClean(html);
 		},
 
+		// SAVE & RESTORE
+		selectionSave: function()
+		{
+			if (!this.isFocused()) this.$editor.focus();
+
+			if (!this.opts.rangy)
+			{
+				this.selectionCreateMarker(this.getRange());
+			}
+			// rangy
+			else
+			{
+				this.savedSel = rangy.saveSelection();
+			}
+		},
+		selectionCreateMarker: function(range, remove)
+		{
+			if (!range) return;
+
+			var node1 = $('<span id="selection-marker-1" class="redactor-selection-marker">' + this.opts.invisibleSpace + '</span>', this.document)[0];
+			var node2 = $('<span id="selection-marker-2" class="redactor-selection-marker">' + this.opts.invisibleSpace + '</span>', this.document)[0];
+
+			if (range.collapsed === true)
+			{
+				this.selectionSetMarker(range, node1, true);
+			}
+			else
+			{
+				this.selectionSetMarker(range, node1, true);
+				this.selectionSetMarker(range, node2, false);
+			}
+
+			this.savedSel = this.$editor.html();
+
+			this.selectionRestore(false, false);
+		},
+		selectionSetMarker: function(range, node, type)
+		{
+			var boundaryRange = range.cloneRange();
+
+			boundaryRange.collapse(type);
+
+			boundaryRange.insertNode(node);
+			boundaryRange.detach();
+		},
+		selectionRestore: function(replace, remove)
+		{
+			if (!this.opts.rangy)
+			{
+				if (replace === true && this.savedSel)
+				{
+					this.$editor.html(this.savedSel);
+				}
+
+				var node1 = this.$editor.find('span#selection-marker-1');
+				var node2 = this.$editor.find('span#selection-marker-2');
+
+				if (this.browser('mozilla'))
+				{
+					this.$editor.focus();
+				}
+				else if (!this.isFocused())
+				{
+					this.$editor.focus();
+				}
+
+				if (node1.length != 0 && node2.length != 0)
+				{
+					this.selectionSet(node1[0], 0, node2[0], 0);
+				}
+				else if (node1.length != 0)
+				{
+					this.selectionSet(node1[0], 0, null, 0);
+				}
+
+				if (remove !== false)
+				{
+					this.selectionRemoveMarkers();
+					this.savedSel = false;
+				}
+			}
+			// rangy
+			else
+			{
+				rangy.restoreSelection(this.savedSel);
+			}
+		},
+		selectionRemoveMarkers: function(type)
+		{
+			if (!this.opts.rangy)
+			{
+				$.each(this.$editor.find('span.redactor-selection-marker'), function()
+				{
+					var html = $.trim($(this).html().replace(/[^\u0000-\u1C7F]/g, ''));
+					if (html == '')
+					{
+						$(this).remove();
+					}
+					else
+					{
+						$(this).removeAttr('class').removeAttr('id');
+					}
+				});
+			}
+			// rangy
+			else
+			{
+				rangy.removeMarkers(this.savedSel);
+			}
+		},
+
 		// TABLE
 		tableShow: function()
 		{
@@ -4843,20 +5272,13 @@
 			this.selectionRestore();
 
 			var current = this.getBlock() || this.getCurrent();
-			if (current && current.tagName != 'BODY')
-			{
-				$(current).after(html)
-			}
-			else
-			{
-				this.insertHtmlAdvanced(html, false);
 
-			}
+			if (current && current.tagName != 'BODY') $(current).after(html)
+			else this.insertHtmlAdvanced(html, false);
 
 			this.selectionRestore();
 
 			var table = this.$editor.find('#table' + tableId);
-			this.tableObserver(table);
 			this.buttonActiveObserver();
 
 			table.find('span#selection-marker-1').remove();
@@ -4864,92 +5286,98 @@
 
 			this.sync();
 		},
-		tableObserver: function(e)
-		{
-			this.$table = $(e.target || e).closest('table');
-
-			this.$tbody = $(e.target).closest('tbody');
-			this.$thead = this.$table.find('thead');
-
-			this.$current_td = $(e.target || this.$table.find('td').first());
-			this.$current_tr = $(e.target || this.$table.find('tr').first()).closest('tr');
-		},
 		tableDeleteTable: function()
 		{
-			this.bufferSet();
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			if ($table.size() == 0) return false;
 
-			if (!this.$table) return;
+			this.bufferSet();
 
-			this.$table.remove();
-			this.$table = false;
+			$table.remove();
 			this.sync();
-
 		},
 		tableDeleteRow: function()
 		{
-			this.bufferSet();
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			if ($table.size() == 0) return false;
 
-			if (!this.$current_tr) return;
+			this.bufferSet();
 
-			// Set the focus correctly
-			var $focusTR = this.$current_tr.prev().length ? this.$current_tr.prev() : this.$current_tr.next();
-			if ($focusTR.length)
+			var $current_tr =  $(this.getParent()).closest('tr');
+			var $focus_tr = $current_tr.prev().length ? $current_tr.prev() : $current_tr.next();
+			if ($focus_tr.length)
 			{
-				var $focusTD = $focusTR.children('td' ).first();
-				if ($focusTD.length)
+				var $focus_td = $focus_tr.children('td' ).first();
+				if ($focus_td.length)
 				{
-					$focusTD.prepend('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>');
-					this.selectionRestore();
+					$focus_td.prepend('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>');
 				}
 			}
 
-			this.$current_tr.remove();
+			$current_tr.remove();
+			this.selectionRestore();
 			this.sync();
 		},
 		tableDeleteColumn: function()
 		{
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			if ($table.size() == 0) return false;
+
 			this.bufferSet();
-			var index = this.$current_td.get(0).cellIndex;
+
+			var $current_td =  $(this.getParent()).closest('td');
+			var index = $current_td.get(0).cellIndex;
 
 			// Set the focus correctly
-			this.$table.find('tr').each($.proxy(function(i, elem)
+			$table.find('tr').each($.proxy(function(i, elem)
 			{
 				var focusIndex = index - 1 < 0 ? index + 1 : index - 1;
 				if (i === 0)
 				{
 					$(elem).find('td').eq(focusIndex).prepend('<span id="selection-marker-1">' + this.opts.invisibleSpace + '</span>');
-					this.selectionRestore();
 				}
 
 				$(elem).find('td').eq(index).remove();
 
 			}, this));
 
+			this.selectionRestore();
 			this.sync();
 		},
 		tableAddHead: function()
 		{
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			if ($table.size() == 0) return false;
+
 			this.bufferSet();
 
-			if (this.$table.find('thead').size() !== 0) this.tableDeleteHead();
+			if ($table.find('thead').size() !== 0) this.tableDeleteHead();
 			else
 			{
-				var tr = this.$table.find('tr').first().clone();
-				tr.find('td').html( this.opts.invisibleSpace );
-				this.$thead = $('<thead></thead>');
-				this.$thead.append(tr);
-				this.$table.prepend(this.$thead);
+				var tr = $table.find('tr').first().clone();
+				tr.find('td').html(this.opts.invisibleSpace);
+				$thead = $('<thead></thead>');
+				$thead.append(tr);
+				$table.prepend($thead);
 
 				this.sync();
 			}
 		},
 		tableDeleteHead: function()
 		{
-			this.bufferSet();
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			var $thead = $table.find('thead');
+
+			if ($thead.size() == 0) return false;
 
-			$(this.$thead).remove();
-			this.$thead = false;
+			this.bufferSet();
 
+			$thead.remove();
 			this.sync();
 		},
 		tableAddRowAbove: function()
@@ -4970,29 +5398,41 @@
 		},
 		tableAddRow: function(type)
 		{
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			if ($table.size() == 0) return false;
+
 			this.bufferSet();
 
-			var new_tr = this.$current_tr.clone();
+			var $current_tr = $(this.getParent()).closest('tr');
+			var new_tr = $current_tr.clone();
 			new_tr.find('td').html(this.opts.invisibleSpace);
 
-			if (type === 'after') this.$current_tr.after(new_tr);
-			else this.$current_tr.before(new_tr);
+			if (type === 'after') $current_tr.after(new_tr);
+			else $current_tr.before(new_tr);
 
 			this.sync();
 		},
 		tableAddColumn: function (type)
 		{
+			var $table = $(this.getParent()).closest('table');
+			if (!this.isParentRedactor($table)) return false;
+			if ($table.size() == 0) return false;
+
 			this.bufferSet();
 
 			var index = 0;
 
-			this.$current_tr.find('td').each($.proxy(function(i, elem)
+			var $current_tr = $(this.getParent()).closest('tr');
+			var $current_td =  $(this.getParent()).closest('td');
+
+			$current_tr.find('td').each($.proxy(function(i, elem)
 			{
-				if ($(elem)[0] === this.$current_td[0]) index = i;
+				if ($(elem)[0] === $current_td[0]) index = i;
 
 			}, this));
 
-			this.$table.find('tr').each($.proxy(function(i, elem)
+			$table.find('tr').each($.proxy(function(i, elem)
 			{
 				var $current = $(elem).find('td').eq(index);
 
@@ -5189,10 +5629,24 @@
 				}
 				else
 				{
-					this.exec('inserthtml', a);
+					var $a = $(a).addClass('redactor-added-link');
+					this.exec('inserthtml', this.outerHtml($a), false);
+					this.$editor.find('a.redactor-added-link').removeAttr('style').removeClass('redactor-added-link').each(function()
+					{
+						if (this.className == '') $(this).removeAttr('class');
+					});
+					this.sync();
 				}
 			}
 
+			// link tooltip
+			setTimeout($.proxy(function()
+			{
+
+				if (this.opts.observeLinks) this.observeLinks();
+
+			}, this), 5);
+
 			this.modalClose();
 		},
 
@@ -5223,7 +5677,8 @@
 						{
 							this.callback('fileUploadError', json);
 
-						}, this)
+						}, this),
+						uploadParam: this.opts.fileUploadParam
 					});
 				}
 
@@ -5366,7 +5821,8 @@
 								{
 									this.callback('imageUploadError', json);
 
-								}, this)
+								}, this),
+								uploadParam: this.opts.imageUploadParam
 							});
 						}
 					}
@@ -5460,7 +5916,7 @@
 
 			}, this);
 
-			this.modalInit(this.opts.curLang.image, this.opts.modal_image_edit, 380, callback);
+			this.modalInit(this.opts.curLang.edit, this.opts.modal_image_edit, 380, callback);
 
 		},
 		imageRemove: function(el)
@@ -5491,14 +5947,17 @@
 
 			if (floating === 'left')
 			{
-				$el.css({ 'float': 'left', 'margin': '0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + ' 0' });
+				this.imageMargin = '0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + ' 0';
+				$el.css({ 'float': 'left', 'margin': this.imageMargin });
 			}
 			else if (floating === 'right')
 			{
-				$el.css({ 'float': 'right', 'margin': '0 0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + '' });
+				this.imageMargin = '0 0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + '';
+				$el.css({ 'float': 'right', 'margin': this.imageMargin });
 			}
 			else
 			{
+				this.imageMargin = '0px';
 				var imageBox = $el.closest('#redactor-image-box');
 				if (imageBox.size() != 0) imageBox.css({ 'float': '', 'margin': '' });
 				$el.css({ 'float': '', 'margin': '' });
@@ -5566,11 +6025,12 @@
 
 			this.$editor.find('#redactor-image-editter, #redactor-image-resizer').remove();
 
-			var margin = imageBox.css('margin');
-			if (margin != '0px')
+
+			if (this.imageMargin != '0px')
 			{
-				imageBox.find('img').css('margin', margin);
+				imageBox.find('img').css('margin', this.imageMargin);
 				imageBox.css('margin', '');
+				this.imageMargin = '0px';
 			}
 
 			imageBox.find('img').css('opacity', '');
@@ -5693,6 +6153,7 @@
 
 					if (this.keyCode.BACKSPACE == key || this.keyCode.DELETE == key)
 					{
+						this.bufferSet();
 						this.imageResizeHide(false);
 						this.imageRemove($image);
 					}
@@ -5717,10 +6178,10 @@
 			});
 			imageBox.attr('contenteditable', false);
 
-			var margin = $image.css('margin');
-			if (margin != '0px')
+			this.imageMargin = $image[0].style.margin;
+			if (this.imageMargin != '0px')
 			{
-				imageBox.css('margin', margin);
+				imageBox.css('margin', this.imageMargin);
 				$image.css('margin', '');
 			}
 
@@ -5774,7 +6235,8 @@
 		{
 			var img = '<img id="image-marker" src="' + $(e.target).attr('rel') + '" alt="' + $(e.target).attr('title') + '" />';
 
-			if (this.opts.paragraphy) img = '<p>' + img + '</p>';
+			var parent = this.getParent();
+			if (this.opts.paragraphy && $(parent).closest('li').size() == 0) img = '<p>' + img + '</p>';
 
 			this.imageInsert(img, true);
 		},
@@ -5806,7 +6268,12 @@
 				if (link !== true)
 				{
 					html = '<img id="image-marker" src="' + json.filelink + '" />';
-					if (this.opts.paragraphy) html = '<p>' + html + '</p>';
+
+					var parent = this.getParent();
+					if (this.opts.paragraphy && $(parent).closest('li').size() == 0)
+					{
+						html = '<p>' + html + '</p>';
+					}
 				}
 				else
 				{
@@ -5844,7 +6311,7 @@
 						+ '<label>' + this.opts.curLang.filename + '</label>'
 						+ '<input type="text" id="redactor_filename" class="redactor_input" />'
 						+ '<div style="margin-top: 7px;">'
-							+ '<input type="file" id="redactor_file" name="file" />'
+							+ '<input type="file" id="redactor_file" name="' + this.opts.fileUploadParam + '" />'
 						+ '</div>'
 					+ '</form>'
 				+ '</section>',
@@ -5864,9 +6331,9 @@
 					+ '</select>'
 				+ '</section>'
 				+ '<footer>'
-					+ '<button id="redactor_image_delete_btn" class="redactor_modal_btn">' + this.opts.curLang._delete + '</button>&nbsp;&nbsp;&nbsp;'
+					+ '<button id="redactor_image_delete_btn" class="redactor_modal_btn redactor_modal_delete_btn">' + this.opts.curLang._delete + '</button>&nbsp;&nbsp;&nbsp;'
 					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
-					+ '<input type="button" name="save" class="redactor_modal_btn" id="redactorSaveBtn" value="' + this.opts.curLang.save + '" />'
+					+ '<input type="button" name="save" class="redactor_modal_btn redactor_modal_action_btn" id="redactorSaveBtn" value="' + this.opts.curLang.save + '" />'
 				+ '</footer>',
 
 				modal_image: String()
@@ -5881,7 +6348,7 @@
 					+ '</div>'
 					+ '<form id="redactorInsertImageForm" method="post" action="" enctype="multipart/form-data">'
 						+ '<div id="redactor_tab1" class="redactor_tab">'
-							+ '<input type="file" id="redactor_file" name="file" />'
+							+ '<input type="file" id="redactor_file" name="' + this.opts.imageUploadParam + '" />'
 						+ '</div>'
 						+ '<div id="redactor_tab2" class="redactor_tab" style="display: none;">'
 							+ '<div id="redactor_image_box"></div>'
@@ -5894,7 +6361,7 @@
 				+ '</section>'
 				+ '<footer>'
 					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
-					+ '<input type="button" name="upload" class="redactor_modal_btn" id="redactor_upload_btn" value="' + this.opts.curLang.insert + '" />'
+					+ '<input type="button" name="upload" class="redactor_modal_btn redactor_modal_action_btn" id="redactor_upload_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>',
 
 				modal_link: String()
@@ -5929,7 +6396,7 @@
 				+ '</section>'
 				+ '<footer>'
 					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
-					+ '<input type="button" class="redactor_modal_btn" id="redactor_insert_link_btn" value="' + this.opts.curLang.insert + '" />'
+					+ '<input type="button" class="redactor_modal_btn redactor_modal_action_btn" id="redactor_insert_link_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>',
 
 				modal_table: String()
@@ -5941,7 +6408,7 @@
 				+ '</section>'
 				+ '<footer>'
 					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
-					+ '<input type="button" name="upload" class="redactor_modal_btn" id="redactor_insert_table_btn" value="' + this.opts.curLang.insert + '" />'
+					+ '<input type="button" name="upload" class="redactor_modal_btn redactor_modal_action_btn" id="redactor_insert_table_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>',
 
 				modal_video: String()
@@ -5953,7 +6420,7 @@
 				+ '</section>'
 				+ '<footer>'
 					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
-					+ '<input type="button" class="redactor_modal_btn" id="redactor_insert_video_btn" value="' + this.opts.curLang.insert + '" />'
+					+ '<input type="button" class="redactor_modal_btn redactor_modal_action_btn" id="redactor_insert_video_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>'
 
 			});
@@ -6051,7 +6518,14 @@
 			$redactorModal.find('.redactor_btn_modal_close').on('click', $.proxy(this.modalClose, this));
 
 			// save scroll
-			if (this.opts.autoresize === true) this.saveModalScroll = this.document.body.scrollTop;
+			if (this.opts.autoresize === true)
+			{
+				this.saveModalScroll = this.document.body.scrollTop;
+			}
+			else
+			{
+				this.saveModalScroll = this.$editor.scrollTop();
+			}
 
 			if (this.isMobile() === false)
 			{
@@ -6124,7 +6598,14 @@
 				this.selectionRestore();
 
 				// restore scroll
-				if (this.opts.autoresize && this.saveModalScroll) $(this.document.body).scrollTop(this.saveModalScroll);
+				if (this.opts.autoresize && this.saveModalScroll)
+				{
+					$(this.document.body).scrollTop(this.saveModalScroll);
+				}
+				else if (this.opts.autoresize === false && this.saveModalScroll)
+				{
+					this.$editor.scrollTop(this.saveModalScroll);
+				}
 
 			}, this));
 
@@ -6143,7 +6624,6 @@
 			$('#redactor_tab' + num).show();
 		},
 
-
 		// S3
 		s3handleFileSelect: function(e)
 		{
@@ -6164,10 +6644,14 @@
 		s3executeOnSignedUrl: function(file, callback)
 		{
 			var xhr = new XMLHttpRequest();
-			xhr.open('GET', this.opts.s3 + '?name=' + file.name + '&type=' + file.type, true);
+
+			var mark = '?';
+			if (this.opts.s3.search(/\?/) != '-1') mark = '&';
+
+			xhr.open('GET', this.opts.s3 + mark + 'name=' + file.name + '&type=' + file.type, true);
 
 			// Hack to pass bytes through unprocessed.
-			xhr.overrideMimeType('text/plain; charset=x-user-defined');
+			if (xhr.overrideMimeType) xhr.overrideMimeType('text/plain; charset=x-user-defined');
 
 			xhr.onreadystatechange = function(e)
 			{
@@ -6218,7 +6702,7 @@
 					{
 						//setProgress(100, 'Upload completed.');
 
-						$('#redactor-progress').hide();
+						$('#redactor-progress, #redactor-progress-drag').hide();
 
 						var s3image = url.split('?');
 
@@ -6279,7 +6763,6 @@
 			}
 		},
 
-
 		// UPLOAD
 		uploadInit: function(el, options)
 		{
@@ -6451,7 +6934,8 @@
 				preview: false,
 				uploadFields: false,
 				text: this.opts.curLang.drop_file_here,
-				atext: this.opts.curLang.or_choose
+				atext: this.opts.curLang.or_choose,
+				uploadParam: false
 			}, options);
 
 			if (window.FormData === undefined) return false;
@@ -6486,11 +6970,11 @@
 
 				this.dropareabox.removeClass('hover').addClass('drop');
 
-				this.dragUploadAjax(this.draguploadOptions.url, e.dataTransfer.files[0], false);
+				this.dragUploadAjax(this.draguploadOptions.url, e.dataTransfer.files[0], false, false, false, this.draguploadOptions.uploadParam);
 
 			}, this );
 		},
-		dragUploadAjax: function(url, file, directupload, progress, e)
+		dragUploadAjax: function(url, file, directupload, progress, e, uploadParam)
 		{
 
 
@@ -6510,7 +6994,14 @@
 			var fd = new FormData();
 
 			// append file data
-			fd.append('file', file);
+			if (uploadParam !== false)
+			{
+				fd.append(uploadParam, file);
+			}
+			else
+			{
+				fd.append('file', file);
+			}
 
 			// append hidden fields
 			if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
@@ -6536,7 +7027,7 @@
 					data = data.replace(/^\[/, '');
 					data = data.replace(/\]$/, '');
 
-					var json = $.parseJSON(data);
+					var json = (typeof data === 'string' ? $.parseJSON(data) : data);
 
 					if (directupload)
 					{
@@ -6595,7 +7086,6 @@
 			this.dropareabox.text('Loading ' + percent + '% ' + (text || ''));
 		},
 
-
 		// UTILS
 		isMobile: function()
 		{
@@ -6623,20 +7113,30 @@
 
 			return html == '';
 		},
+		isIe11: function()
+		{
+			return !!navigator.userAgent.match(/Trident\/7\./);
+		},
 		browser: function(browser)
 		{
 			var ua = navigator.userAgent.toLowerCase();
-			var match = /(chrome)[ \/]([\w.]+)/.exec(ua)
-					|| /(webkit)[ \/]([\w.]+)/.exec(ua)
-					|| /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua)
-					|| /(msie) ([\w.]+)/.exec(ua)
-					|| ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua)
-					|| [];
+			var match = /(opr)[\/]([\w.]+)/.exec( ua ) ||
+            /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+            /(webkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(ua) ||
+            /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+            /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+            /(msie) ([\w.]+)/.exec( ua ) ||
+            ua.indexOf("trident") >= 0 && /(rv)(?::| )([\w.]+)/.exec( ua ) ||
+            ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+            [];
 
 			if (browser == 'version') return match[2];
 			if (browser == 'webkit') return (match[1] == 'chrome' || match[1] == 'webkit');
+			if (match[1] == 'rv') return browser == 'msie';
+			if (match[1] == 'opr') return browser == 'webkit';
+
+			return browser == match[1];
 
-			return match[1] == browser;
 		},
 		oldIE: function()
 		{
@@ -6718,19 +7218,20 @@
 
 			return array;
 		}
+
 	};
 
 	// constructor
 	Redactor.prototype.init.prototype = Redactor.prototype;
 
 	// LINKIFY
-	$.Redactor.fn.formatLinkify = function(protocol, convertLinks, convertImageLinks, convertVideoLinks)
+	$.Redactor.fn.formatLinkify = function(protocol, convertLinks, convertImageLinks, convertVideoLinks, linkSize)
 	{
 		var url1 = /(^|&lt;|\s)(www\..+?\..+?)(\s|&gt;|$)/g,
 			url2 = /(^|&lt;|\s)(((https?|ftp):\/\/|mailto:).+?)(\s|&gt;|$)/g,
 			urlImage = /(https?:\/\/.*\.(?:png|jpg|jpeg|gif))/gi,
-			urlYoutube = /^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/,
-			urlVimeo = /http:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/;
+			urlYoutube = /https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig,
+			urlVimeo = /https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/;
 
 		var childNodes = (this.$editor ? this.$editor.get(0) : this).childNodes, i = childNodes.length;
 		while (i--)
@@ -6748,7 +7249,7 @@
 
 					if (html.match(urlYoutube))
 					{
-						html = html.replace(urlYoutube, iframeStart + '//www.youtube.com/embed/$2' + iframeEnd);
+						html = html.replace(urlYoutube, iframeStart + '//www.youtube.com/embed/$1' + iframeEnd);
 						$(n).after(html).remove();
 					}
 					else if (html.match(urlVimeo))
@@ -6771,13 +7272,13 @@
 				{
 					var href = (html.match(url1) || html.match(url2));
 					href = href[0];
-					if (href.length > 50) href = href.substring(0, 50) + '...';
+					if (href.length > linkSize) href = href.substring(0, linkSize) + '...';
 
 					html = html.replace(/&/g, '&amp;')
 					.replace(/</g, '&lt;')
 					.replace(/>/g, '&gt;')
-					.replace(url1, '$1<a href="' + protocol + '$2">' + href + '</a>$3')
-					.replace(url2, '$1<a href="$2">' + href + '</a>$5');
+					.replace(url1, '$1<a href="' + protocol + '$2">' + $.trim(href) + '</a>$3')
+					.replace(url2, '$1<a href="$2">' + $.trim(href) + '</a>$5');
 
 
 					$(n).after(html).remove();
@@ -6785,7 +7286,7 @@
 			}
 			else if (n.nodeType === 1 && !/^(a|button|textarea)$/i.test(n.tagName))
 			{
-				$.Redactor.fn.formatLinkify.call(n, protocol, convertLinks, convertImageLinks, convertVideoLinks);
+				$.Redactor.fn.formatLinkify.call(n, protocol, convertLinks, convertImageLinks, convertVideoLinks, linkSize);
 			}
 		}
 	};