redactor-rails 0.3.7 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: dd812071b4bfa7e5f8d15eea9bad6d8cbfe7cbe6
-  metadata.gz: c9c5f2eb311372f81ce21b53e68a7371288b82d7
-SHA512: 
-  data.tar.gz: 62efd7ce4a5037b095c454bc8400aa071739667c40d296c6d629fa454a4aaa4cd3586ecad6f40a2db3afeb8396ebb0c57240cc10ac26a3df0ced64c888b80f28
-  metadata.gz: 2eba13a9b040de4cb08d3390036c1101c617fe8cc65317c987cf0de03ab15882125be6660eecf0c7f287d8c8aaf7b53847fa76310cb40e054dd285ce2870bff5
+---
+SHA1:
+  metadata.gz: b7c9a0d89bbfb5867a646c9133ac5a223c6afe5c
+  data.tar.gz: f4b59a31c081303a758d7952f56eb0de73c2c5c7
+SHA512:
+  metadata.gz: de54c5344288c59cca3f7d269d3944c5a5778f8aa669eb423651ecdad33443f5c8057f45ef57771dfcbec61b2c0e49bc83897919cb103667a5070e473dde8942
+  data.tar.gz: 7c85e211eadc3d0fe82be50b73f2a693d72a551d09a6e2614edb4d151bcbefdd2361110aae30d0bd8e51401ef70b95418fda0ee1e171051982f2891232072d9b

data/README.md

@@ -2,7 +2,7 @@
 
 The redactor-rails gem integrates the [Redactor](http://redactorjs.com/) editor with the Rails 3.2 asset pipeline.
 
-This gem bundles Redactor version 9.1.4 which is the most recent version as of September 10, 2013. Check [Redactor's changelog](http://imperavi.com/redactor/log/) for further updates.
+This gem bundles Redactor version 9.0.4 which is the most recent version as of July 11, 2013. Check [Redactor's changelog](http://imperavi.com/redactor/log/) for further updates.
 
 ## Installation
 

data/app/controller/redactor_rails/documents_controller.rb

@@ -1,5 +1,5 @@
 class RedactorRails::DocumentsController < ApplicationController
-  before_filter :redactor_authenticate_user!
+  before_filter :redactor_authenticate_user! if RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user)
 
   def index
     @documents = RedactorRails.document_model.where(
@@ -23,12 +23,4 @@ class RedactorRails::DocumentsController < ApplicationController
       render :nothing => true
     end
   end
-
-  private
-
-  def redactor_authenticate_user!
-    if RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user)
-      super
-    end
-  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! if RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user)
 
   def index
     @pictures = RedactorRails.picture_model.where(
@@ -23,12 +23,4 @@ class RedactorRails::PicturesController < ApplicationController
       render :nothing => true
     end
   end
-
-  private
-
-  def redactor_authenticate_user!
-    if RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user)
-      super
-    end
-  end
 end

data/lib/redactor-rails/orm/active_record.rb

@@ -15,7 +15,7 @@ module RedactorRails
               self.table_name = "redactor_assets"
 
               belongs_to :assetable, :polymorphic => true
-              belongs_to RedactorRails.devise_user, :foreign_key => RedactorRails.devise_user_key
+              belongs_to RedactorRails.devise_user, :dependent => :destroy, :foreign_key => RedactorRails.devise_user_key
 
               if defined?(ActiveModel::ForbiddenAttributesProtection) && base.ancestors.include?(ActiveModel::ForbiddenAttributesProtection)
                 # Ok

data/lib/redactor-rails/version.rb

@@ -1,3 +1,3 @@
 module RedactorRails
-  VERSION = "0.3.7"
+  VERSION = "0.4"
 end

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

@@ -1,2 +1,2 @@
-//= require ./redactor
+//= require ./redactor.min
 //= require ./config

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

@@ -1,6 +1,6 @@
 /*
-	Redactor v9.1.4
-	Updated: Sep 10, 2013
+	Redactor v9.0.4
+	Updated: Jul 11, 2013
 
 	http://imperavi.com/redactor/
 
@@ -72,9 +72,26 @@
 	}
 
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '9.1.4';
+	$.Redactor.VERSION = '9.0.4';
 	$.Redactor.opts = {
 
+			// callbacks
+			initCallback: false,
+			changeCallback: false,
+			focusCallback: false,
+			blurCallback: false,
+			keydownCallback: false,
+			keyupCallback: false,
+			execCommandCallback: false,
+			pasteBeforeCallback: false,
+			pasteAfterCallback: false,
+			autosaveCallback: false,
+			imageUploadCallback: false,
+			imageUploadErrorCallback: false,
+			imageDeleteCallback: false,
+			fileUploadCallback: false,
+			fileUploadErrorCallback: false,
+
 			// settings
 			rangy: false,
 
@@ -90,10 +107,7 @@
 			wym: false,
 			mobile: true,
 			cleanup: true,
-			tidyHtml: true,
-			pastePlainText: false,
 			removeEmptyTags: true,
-			templateVars: false,
 
 			visual: true,
 			focus: false,
@@ -110,36 +124,26 @@
 			linkAnchor: false,
 			linkEmail: false,
 			linkProtocol: 'http://',
-			linkNofollow: false,
 
-			imageFloatMargin: '10px',
 			imageGetJson: false, // url (ex. /folder/images.json ) or false
 
 			imageUpload: false, // url
 			fileUpload: false, // url
-			clipboardUpload: true, // or false
-			clipboardUploadUrl: false, // url
-			dragUpload: true, // false
-
-			dnbImageTypes: ['image/png', 'image/jpeg', 'image/gif'], // or false
 
 			s3: false,
 			uploadFields: false,
 
 			observeImages: true,
-			observeLinks: true,
 
 			modalOverlay: true,
 
-			tabSpaces: false, // true or number of spaces
 			tabFocus: true,
 
 			air: false,
-			airButtons: ['formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent'],
+			airButtons: ['formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'fontcolor', 'backcolor'],
 
 			toolbar: true,
 			toolbarFixed: false,
-			toolbarFixedTarget: document,
 			toolbarFixedTopOffset: 0, // pixels
 			toolbarFixedBox: false,
 			toolbarExternal: false, // ID selector
@@ -149,7 +153,8 @@
 
 			buttonsCustom: {},
 			buttonsAdd: [],
-			buttons: ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'image', 'video', 'file', 'table', 'link', '|', 'alignment', '|', 'horizontalrule'], // 'underline', 'alignleft', 'aligncenter', 'alignright', 'justify'
+			buttons: ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|', 'image', 'video', 'file', 'table', 'link', '|', 'fontcolor', 'backcolor', '|', 'alignment', '|', 'horizontalrule'], // 'underline', 'alignleft', 'aligncenter', 'alignright', 'justify'
+			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'],
 
 			activeButtons: ['deleted', 'italic', 'bold', 'underline', 'unorderedlist', 'orderedlist', 'alignleft', 'aligncenter', 'alignright', 'justify', 'table'],
 			activeButtonsStates: {
@@ -168,14 +173,12 @@
 			},
 			activeButtonsAdd: false, // object, ex.: { tag: 'buttonName' }
 
-			formattingTags: ['p', 'blockquote', 'pre', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
+			formattingTags: ['p', 'blockquote', 'pre', 'h1', 'h2', 'h3', 'h4'],
 
 			linebreaks: false,
 			paragraphy: true,
 			convertDivs: true,
 			convertLinks: true,
-			convertImageLinks: false,
-			convertVideoLinks: false,
 			formattingPre: false,
 			phpTags: false,
 
@@ -201,7 +204,7 @@
 			newLevel: ['blockquote', 'div', 'dl', 'fieldset', 'form', 'frameset', 'map', 'ol', 'p', 'pre', 'select', 'td', 'th', 'tr', 'ul'],
 			blockLevelElements: ['P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'DD', 'DL', 'DT', 'DIV', 'LI',
 								'BLOCKQUOTE', 'OUTPUT', 'FIGCAPTION', 'PRE', 'ADDRESS', 'SECTION',
-								'HEADER', 'FOOTER', 'ASIDE', 'ARTICLE', 'TD'],
+								'HEADER', 'FOOTER', 'ASIDE', 'ARTICLE'],
 			// lang
 			langs: {
 				en: {
@@ -221,7 +224,6 @@
 					header2: 'Header 2',
 					header3: 'Header 3',
 					header4: 'Header 4',
-					header5: 'Header 5',
 					bold: 'Bold',
 					italic: 'Italic',
 					fontcolor: 'Font Color',
@@ -272,8 +274,7 @@
 					link_new_tab: 'Open link in new tab',
 					underline: 'Underline',
 					alignment: 'Alignment',
-					filename: 'Name (optional)',
-					edit: 'Edit'
+					filename: 'Name (optional)'
 				}
 			}
 	};
@@ -281,7 +282,8 @@
 	// Functionality
 	Redactor.fn = $.Redactor.prototype = {
 
-		keyCode: {
+		keyCode:
+		{
 			BACKSPACE: 8,
 			DELETE: 46,
 			DOWN: 40,
@@ -301,13 +303,10 @@
 			this.$element = this.$source = $(el);
 			this.uuid = uuid++;
 
-			// clonning options
-			var opts = $.extend(true, {}, $.Redactor.opts);
-
 			// current settings
 			this.opts = $.extend(
 				{},
-				opts,
+				$.Redactor.opts,
 				this.$element.data(),
 				options
 			);
@@ -419,12 +418,6 @@
 							title: lang.header4,
 							func: 'formatBlocks',
 							className: 'redactor_format_h4'
-						},
-						h5:
-						{
-							title: lang.header5,
-							func: 'formatBlocks',
-							className: 'redactor_format_h5'
 						}
 					}
 				},
@@ -656,7 +649,6 @@
 			clearInterval(this.autosaveInterval);
 
 			$(window).off('.redactor');
-			this.$source.off('redactor-textarea');
 			this.$element.off('.redactor').removeData('redactor');
 
 			var html = this.get();
@@ -677,11 +669,6 @@
 
 				$elem.removeClass('redactor_editor').removeClass('redactor_editor_wym').removeAttr('contenteditable').html(html).show();
 			}
-
-			if (this.opts.air)
-			{
-				$('.redactor_air').remove();
-			}
 		},
 
 		// API GET
@@ -720,14 +707,12 @@
 
 			return html;
 		},
-		set: function(html, strip, placeholderRemove)
+		set: function(html, strip)
 		{
 			html = html.toString();
 
 			if (this.opts.fullpage) this.setCodeIframe(html);
 			else this.setEditor(html, strip);
-
-			if (placeholderRemove !== false) this.placeholderRemove();
 		},
 		setEditor: function(html, strip)
 		{
@@ -799,14 +784,19 @@
 
 			if ($.trim(html) === '<br>') html = '';
 
-			if (html !== '' && this.opts.tidyHtml) html = this.cleanHtml(html);
-			html = html.replace(/<br>/gi, '<br />');
+			if (html !== '') html = this.cleanHtml(html);
 
 			// before callback
 			html = this.callback('syncBefore', false, html);
 
 			this.$source.val(html);
 
+			// TMP:
+			if (typeof htmlEncode != 'undefined')
+			{
+				$('#' + this.$element[0].id + '_code').html(htmlEncode(html));
+			}
+
 			// onchange & after callback
 			this.callback('syncAfter', false, html);
 
@@ -830,40 +820,23 @@
 			html = html.replace(/&#8203;/gi, '');
 			html = html.replace(/&nbsp;/gi, ' ');
 
-			// link nofollow
-			if (this.opts.linkNofollow)
-			{
-				html = html.replace(/<a(.*?)rel="nofollow"(.*?)>/gi, '<a$1$2>');
-				html = html.replace(/<a(.*?)>/gi, '<a$1 rel="nofollow">');
-			}
-
 			// php code fix
 			html = html.replace('<!--?php', '<?php');
 			html = html.replace('?-->', '?>');
 
+
+			// Remove verified attr
 			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>');
 
-			// remove image resize
-			html = html.replace(/<span(.*?)id="redactor-image-box"(.*?)>([\w\W]*?)<img(.*?)><\/span>/i, '$3<img$4>');
-			html = html.replace(/<span(.*?)id="redactor-image-resizer"(.*?)>(.*?)<\/span>/i, '');
-			html = html.replace(/<span(.*?)id="redactor-image-editter"(.*?)>(.*?)<\/span>/i, '');
-
-			// 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, '$1');
 
-			// amp fix
-			html = html.replace(/;amp;/gi, ';');
-
-
 			html = this.cleanReConvertProtected(html);
 
 			return html;
@@ -962,7 +935,7 @@
 			this.$source.attr('dir', this.opts.direction).hide();
 
 			// set code
-			this.set(this.content, true, false);
+			this.set(this.content);
 		},
 		buildOptions: function()
 		{
@@ -1029,408 +1002,333 @@
 		},
 		buildBindKeyboard: function()
 		{
-			if (this.opts.dragUpload)
+			var oldsafari = false;
+			if (this.browser('webkit') && navigator.userAgent.indexOf('Chrome') === -1)
 			{
-				this.$editor.on('drop.redactor', $.proxy(this.buildEventDrop, this));
+				var arr = this.browser('version').split('.');
+				if (arr[0] < 536) oldsafari = true;
 			}
 
-			this.$editor.on('paste.redactor', $.proxy(this.buildEventPaste, this));
-			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))
+			this.$editor.on('paste.redactor', $.proxy(function(e)
 			{
-				this.$source.on('keydown.redactor-textarea', $.proxy(this.opts.textareaKeydownCallback, this));
-			}
+				if (oldsafari) return true;
 
-			// focus callback
-			if ($.isFunction(this.opts.focusCallback))
-			{
-				this.$editor.on('focus.redactor', $.proxy(this.opts.focusCallback, this));
-			}
+				// paste except opera
+				if (this.browser('opera')) return true;
 
-			// blur callback
-			this.$editor.on('blur.redactor', $.proxy(function()
-			{
-				this.selectall = false;
-			}, this));
-			if ($.isFunction(this.opts.blurCallback))
-			{
-				this.$editor.on('blur.redactor', $.proxy(this.opts.blurCallback, this));
-			}
+				if (this.opts.cleanup)
+				{
+					rtePaste = true;
 
-		},
-		buildEventDrop: function(e)
-		{
-			e = e.originalEvent || e;
+					this.selectionSave();
 
-			if (window.FormData === undefined) return true;
+					if (!this.selectall)
+					{
+						if (this.opts.autoresize === true )
+						{
+							this.$editor.height(this.$editor.height());
+							this.saveScroll = this.document.body.scrollTop;
+						}
+						else
+						{
+							this.saveScroll = this.$editor.scrollTop();
+						}
+					}
 
-		    var length = e.dataTransfer.files.length;
-		    if (length == 0) return true;
+					var frag = this.extractContent();
 
-		    e.preventDefault();
+					setTimeout($.proxy(function()
+					{
+						var pastedFrag = this.extractContent();
+						this.$editor.append(frag);
 
-	        var file = e.dataTransfer.files[0];
+						this.selectionRestore();
 
-	        if (this.opts.dnbImageTypes !== false && this.opts.dnbImageTypes.indexOf(file.type) == -1)
-	        {
-		        return true;
-	        }
+						var html = this.getFragmentHtml(pastedFrag);
+						this.pasteClean(html);
 
-			this.bufferSet();
+						if (this.opts.autoresize === true) this.$editor.css('height', 'auto');
 
-			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), 1);
+				}
 
-			this.dragUploadAjax(this.opts.imageUpload, file, true, progress, e);
+			}, this));
 
-		},
-		buildEventPaste: function(e)
-		{
-			var oldsafari = false;
-			if (this.browser('webkit') && navigator.userAgent.indexOf('Chrome') === -1)
+			this.$editor.on('keydown.redactor', $.proxy(function(e)
 			{
-				var arr = this.browser('version').split('.');
-				if (arr[0] < 536) oldsafari = true;
-			}
+				if (rtePaste) return false;
+
+				var key = e.which;
+				var ctrl = e.ctrlKey || e.metaKey;
+				var parent = this.getParent();
+				var current = this.getCurrent();
+				var block = this.getBlock();
+				var pre = false;
 
-			if (oldsafari) return true;
+				this.callback('keydown', e);
 
-			// paste except opera (not webkit)
-			if (this.browser('opera')) return true;
+				// pre & down
+				if ((parent && $(parent).get(0).tagName === 'PRE') || (current && $(current).get(0).tagName === 'PRE'))
+				{
+					pre = true;
+					if (key === this.keyCode.DOWN) this.insertAfterLastElement(block);
+				}
 
-			// clipboard upload
-			if (this.opts.clipboardUpload && this.buildEventClipboardUpload(e)) return true;
+				// 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 (this.opts.cleanup)
-			{
-				rtePaste = true;
+				// shortcuts setup
+				if (ctrl && !e.shiftKey) this.shortcuts(e, key);
 
-				this.selectionSave();
+				// buffer setup
+				if (ctrl && key === 90 && !e.shiftKey && !e.altKey) // z key
+				{
+					e.preventDefault();
+					if (this.opts.buffer.length) this.bufferUndo();
+					else this.document.execCommand('undo', false, false);
+					return;
+				}
+				// undo
+				else if (ctrl && key === 90 && e.shiftKey && !e.altKey)
+				{
+					e.preventDefault();
+					if (this.opts.rebuffer.length != 0) this.bufferRedo();
+					else this.document.execCommand('redo', false, false);
+					return;
+				}
 
-				if (!this.selectall)
+				// select all
+				if (ctrl && key === 65)
 				{
-					if (this.opts.autoresize === true )
-					{
-						this.$editor.height(this.$editor.height());
-						this.saveScroll = this.document.body.scrollTop;
-					}
-					else
-					{
-						this.saveScroll = this.$editor.scrollTop();
-					}
+					this.selectall = true;
+				}
+				else if (key != this.keyCode.LEFT_WIN && !ctrl)
+				{
+					this.selectall = false;
 				}
 
-				var frag = this.extractContent();
 
-				setTimeout($.proxy(function()
+				// enter
+				if (key == this.keyCode.ENTER && !e.shiftKey && !e.ctrlKey && !e.metaKey )
 				{
-					var pastedFrag = this.extractContent();
-					this.$editor.append(frag);
-
-					this.selectionRestore();
+					// In ie, opera in the tables are created paragraphs, fix it.
+					if (parent.nodeType == 1 && (parent.tagName == 'TD' || parent.tagName == 'TH'))
+					{
+						this.bufferSet();
 
-					var html = this.getFragmentHtml(pastedFrag);
-					this.pasteClean(html);
+						this.insertNode(document.createElement('br'));
+						e.preventDefault();
+						return false;
+					}
 
-					if (this.opts.autoresize === true) this.$editor.css('height', 'auto');
+					// pre
+					if (pre === true)
+					{
+						this.bufferSet();
+						e.preventDefault();
 
-				}, this), 1);
-			}
-		},
-		buildEventClipboardUpload: function(e)
-		{
-			var event = e.originalEvent || e;
-			this.clipboardFilePaste = false;
+						var html = $(current).parent().text();
+						this.insertNode(document.createTextNode('\n'));
+						if (html.search(/\s$/) == -1)
+						{
+							this.insertNode(document.createTextNode('\n'));
+						}
 
-			if (typeof(event.clipboardData) === 'undefined') return false;
-			if (event.clipboardData.items)
-			{
-				var file = event.clipboardData.items[0].getAsFile();
-				if (file !== null)
-				{
-					this.bufferSet();
-					this.clipboardFilePaste = true;
+						this.sync();
 
-					var reader = new FileReader();
-					reader.onload = $.proxy(this.pasteClipboardUpload, this);
-			        reader.readAsDataURL(file);
+						return false;
+					}
+					else
+					{
+						if (!this.opts.linebreaks)
+						{
+							// replace div to p
+							if (block && this.opts.rBlockTest.test(block.tagName))
+							{
+								// hit enter
+								this.bufferSet();
 
-			        return true;
-				}
-			}
+								setTimeout($.proxy(function()
+								{
+									var blockElem = this.getBlock();
+									if (blockElem.tagName === 'DIV' && !$(blockElem).hasClass('redactor_editor'))
+									{
+										var node = $('<p>' + this.opts.invisibleSpace + '</p>');
+										$(blockElem).replaceWith(node);
+										this.selectionStart(node);
+									}
 
-			return false;
 
-		},
-		buildEventKeydown: function(e)
-		{
-			if (rtePaste) return false;
+								}, this), 1);
+							}
+							else if (block === false)
+							{
+								// hit enter
+								this.bufferSet();
 
-			var key = e.which;
-			var ctrl = e.ctrlKey || e.metaKey;
-			var parent = this.getParent();
-			var current = this.getCurrent();
-			var block = this.getBlock();
-			var pre = false;
+								var node = $('<p>' + this.opts.invisibleSpace + '</p>');
+								this.insertNode(node[0]);
+								this.selectionStart(node);
+								return false;
+							}
 
-			this.callback('keydown', e);
+						}
 
-			this.imageResizeHide(false);
+						if (this.opts.linebreaks)
+						{
+							// replace div to br
+							if (block && this.opts.rBlockTest.test(block.tagName))
+							{
+								// hit enter
+								this.bufferSet();
 
-			// pre & down
-			if ((parent && $(parent).get(0).tagName === 'PRE') || (current && $(current).get(0).tagName === 'PRE'))
-			{
-				pre = true;
-				if (key === this.keyCode.DOWN) this.insertAfterLastElement(block);
-			}
+								setTimeout($.proxy(function()
+								{
+									var blockElem = this.getBlock();
+									if ((blockElem.tagName === 'DIV' || blockElem.tagName === 'P') && !$(blockElem).hasClass('redactor_editor'))
+									{
+										this.replaceLineBreak(blockElem);
+									}
 
-			// 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);
-			}
+								}, this), 1);
+							}
+							else
+							{
+								// hit enter
+								this.bufferSet();
 
-			// shortcuts setup
-			if (ctrl && !e.shiftKey) this.shortcuts(e, key);
+								this.insertLineBreak();
+								e.preventDefault();
+								return;
+							}
+						}
 
-			// buffer setup
-			if (ctrl && key === 90 && !e.shiftKey && !e.altKey) // z key
-			{
-				e.preventDefault();
-				if (this.opts.buffer.length) this.bufferUndo();
-				else this.document.execCommand('undo', false, false);
-				return;
-			}
-			// undo
-			else if (ctrl && key === 90 && e.shiftKey && !e.altKey)
-			{
-				e.preventDefault();
-				if (this.opts.rebuffer.length != 0) this.bufferRedo();
-				else this.document.execCommand('redo', false, false);
-				return;
-			}
+						// blockquote, figcaption
+						if (block.tagName == 'BLOCKQUOTE'
+							|| block.tagName == 'FIGCAPTION')
+						{
+							// hit enter
+							this.bufferSet();
 
-			// select all
-			if (ctrl && key === 65) this.selectall = true;
-			else if (key != this.keyCode.LEFT_WIN && !ctrl) this.selectall = false;
+							this.insertLineBreak();
+							e.preventDefault();
+							return;
+						}
 
-			// enter
-			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'))
+					}
+				}
+				else if (key === this.keyCode.ENTER && (e.ctrlKey || e.shiftKey)) // Shift+Enter or Ctrl+Enter
 				{
-					e.preventDefault();
 					this.bufferSet();
-					this.insertNode(document.createElement('br'));
-					this.callback('enter', e);
-					return false;
+
+					e.preventDefault();
+					this.insertLineBreak();
 				}
 
-				// pre
-				if (pre === true)
+				// tab
+				if (key === this.keyCode.TAB && this.opts.shortcuts )
 				{
+					if (!this.opts.tabFocus) return true;
+					if (this.isEmpty(this.get())) return true;
+
 					e.preventDefault();
-					this.bufferSet();
-					var html = $(current).parent().text();
-					this.insertNode(document.createTextNode('\n'));
-					if (html.search(/\s$/) == -1)
+
+					if (pre === true && !e.shiftKey)
 					{
-						this.insertNode(document.createTextNode('\n'));
+						this.bufferSet();
+						this.insertNode(document.createTextNode('\t'));
+						this.sync();
+						return false;
+					}
+					else
+					{
+						if (!e.shiftKey) this.indentingIndent();
+						else this.indentingOutdent();
 					}
 
-					this.sync();
-					this.callback('enter', e);
 					return false;
 				}
-				else
+
+				// delete zero-width space before the removing
+				if (key === this.keyCode.BACKSPACE)
 				{
-					if (!this.opts.linebreaks)
+					if (typeof current.tagName !== 'undefined' && /^(H[1-6])$/i.test(current.tagName))
 					{
-						// replace div to p
-						if (block && this.opts.rBlockTest.test(block.tagName))
-						{
-							// hit enter
-							this.bufferSet();
-
-							setTimeout($.proxy(function()
-							{
-								var blockElem = this.getBlock();
-								if (blockElem.tagName === 'DIV' && !$(blockElem).hasClass('redactor_editor'))
-								{
-									var node = $('<p>' + this.opts.invisibleSpace + '</p>');
-									$(blockElem).replaceWith(node);
-									this.selectionStart(node);
-								}
-
-							}, this), 1);
-						}
-						else if (block === false)
-						{
-							// hit enter
-							this.bufferSet();
-
-							var node = $('<p>' + this.opts.invisibleSpace + '</p>');
-							this.insertNode(node[0]);
-							this.selectionStart(node);
-							this.callback('enter', e);
-							return false;
-						}
+						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);
 					}
 
-					if (this.opts.linebreaks)
+					if (typeof current.nodeValue !== 'undefined' && current.nodeValue !== null)
 					{
-						// replace div to br
-						if (block && this.opts.rBlockTest.test(block.tagName))
+						var value = $.trim(current.nodeValue.replace(/[^\u0000-~]/g, ''));
+						if (current.remove && current.nodeType === 3 && current.nodeValue.charCodeAt(0) == 8203 && value == '')
 						{
-							// hit enter
-							this.bufferSet();
-
-							setTimeout($.proxy(function()
-							{
-								var blockElem = this.getBlock();
-								if ((blockElem.tagName === 'DIV' || blockElem.tagName === 'P') && !$(blockElem).hasClass('redactor_editor'))
-								{
-									this.replaceLineBreak(blockElem);
-								}
-
-							}, this), 1);
-						}
-						else
-						{
-							return this.buildEventKeydownInsertLineBreak(e);
+							current.remove();
 						}
 					}
-
-					// blockquote, figcaption
-					if (block.tagName == 'BLOCKQUOTE' || block.tagName == 'FIGCAPTION')
-					{
-						return this.buildEventKeydownInsertLineBreak(e);
-					}
-
 				}
 
-				this.callback('enter', e);
-			}
-			else if (key === this.keyCode.ENTER && (e.ctrlKey || e.shiftKey)) // Shift+Enter or Ctrl+Enter
-			{
-				this.bufferSet();
-
-				e.preventDefault();
-				this.insertLineBreak();
-			}
+			}, this));
 
-			// tab
-			if (key === this.keyCode.TAB && this.opts.shortcuts )
+			this.$editor.on('keyup.redactor', $.proxy(function(e)
 			{
-				if (!this.opts.tabFocus) return true;
-				if (this.isEmpty(this.get())) return true;
-
-				e.preventDefault();
+				if (rtePaste) return false;
 
-				if (pre === true && !e.shiftKey)
-				{
-					this.bufferSet();
-					this.insertNode(document.createTextNode('\t'));
-					this.sync();
-					return false;
+				var key = e.which;
+				var parent = this.getParent();
+				var current = this.getCurrent();
 
-				}
-				else if (this.opts.tabSpaces !== false)
+				// replace to p before / after the table or body
+				if (!this.opts.linebreaks && current.nodeType == 3 && (parent == false || parent.tagName == 'BODY'))
 				{
-					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();
+					var node = $('<p>').append($(current).clone());
+					$(current).replaceWith(node);
+					var next = $(node).next();
+					if (typeof(next[0]) !== 'undefined' && next[0].tagName == 'BR')
+					{
+						next.remove();
+					}
+					this.selectionEnd(node);
 				}
 
-				return false;
-			}
-
-			// delete zero-width space before the removing
-			if (key === this.keyCode.BACKSPACE)
-			{
-				if (typeof current.tagName !== 'undefined' && /^(H[1-6])$/i.test(current.tagName))
+				// convert links
+				if (this.opts.convertLinks && key === this.keyCode.ENTER)
 				{
-					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);
+					this.formatLinkify(this.opts.linkProtocol);
 				}
 
-				if (typeof current.nodeValue !== 'undefined' && current.nodeValue !== null)
+				// if empty
+				if (this.opts.linebreaks === false && (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE))
 				{
-					var value = $.trim(current.nodeValue.replace(/[^\u0000-\u1C7F]/g, ''));
-					if (current.remove && current.nodeType === 3 && current.nodeValue.charCodeAt(0) == 8203 && value == '')
-					{
-						current.remove();
-					}
+					return this.formatEmpty(e);
 				}
-			}
-		},
-		buildEventKeydownInsertLineBreak: function(e)
-		{
-			this.bufferSet();
-			e.preventDefault();
-			this.insertLineBreak();
-			this.callback('enter', e);
-			return;
-		},
-		buildEventKeyup: function(e)
-		{
-			if (rtePaste) return false;
 
-			var key = e.which;
-			var parent = this.getParent();
-			var current = this.getCurrent();
+				this.callback('keyup', e);
+				this.sync();
 
-			// replace to p before / after the table or body
-			if (!this.opts.linebreaks && current.nodeType == 3 && (parent == false || parent.tagName == 'BODY'))
-			{
-				var node = $('<p>').append($(current).clone());
-				$(current).replaceWith(node);
-				var next = $(node).next();
-				if (typeof(next[0]) !== 'undefined' && next[0].tagName == 'BR')
-				{
-					next.remove();
-				}
-				this.selectionEnd(node);
-			}
+			}, this));
 
-			// 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);
+			// focus callback
+			if ($.isFunction(this.opts.focusCallback))
+			{
+				this.$editor.on('focus.redactor', $.proxy(this.opts.focusCallback, this));
 			}
 
-			// if empty
-			if (this.opts.linebreaks === false && (key === this.keyCode.DELETE || key === this.keyCode.BACKSPACE))
+			// blur callback
+			if ($.isFunction(this.opts.blurCallback))
 			{
-				return this.formatEmpty(e);
+				this.$editor.on('blur.redactor', $.proxy(this.opts.blurCallback, this));
 			}
 
-			this.callback('keyup', e);
-			this.sync();
 		},
 		buildPlugins: function()
 		{
@@ -1536,7 +1434,7 @@
 			this.iframeAddCss();
 
 			if (this.opts.fullpage) this.setFullpageOnInit(this.$editor.html());
-			else this.set(this.content, true, false);
+			else this.set(this.content);
 
 			this.buildOptions();
 			this.buildAfter();
@@ -1685,7 +1583,7 @@
 				this.$source.height(height).show().focus();
 
 				// textarea indenting
-				this.$source.on('keydown.redactor-textarea-indenting', function (e)
+				this.$source.on('keydown.redactor-textarea', function (e)
 				{
 					if (e.keyCode === 9)
 					{
@@ -1727,7 +1625,7 @@
 
 				if (this.opts.fullpage ) this.$editor.attr('contenteditable', true );
 
-				this.$source.off('keydown.redactor-textarea-indenting');
+				this.$source.off('keydown.redactor-textarea');
 
 				this.$editor.focus();
 				this.selectionRestore();
@@ -1823,6 +1721,8 @@
 
 			$.each(this.opts.buttons, $.proxy(function(i, btnName)
 			{
+
+
 				// separator
 				if ( btnName === '|' ) this.$toolbar.append($(this.opts.buttonSeparator));
 				else if(this.opts.toolbar[btnName])
@@ -1840,7 +1740,7 @@
 			if (this.opts.toolbarFixed)
 			{
 				this.toolbarObserveScroll();
-				$(this.opts.toolbarFixedTarget).on('scroll.redactor', $.proxy(this.toolbarObserveScroll, this));
+				$(document).on('scroll.redactor', $.proxy(this.toolbarObserveScroll, this));
 			}
 
 			// buttons response
@@ -1852,7 +1752,7 @@
 		},
 		toolbarObserveScroll: function()
 		{
-			var scrollTop = $(this.opts.toolbarFixedTarget).scrollTop();
+			var scrollTop = $(this.document).scrollTop();
 			var boxTop = this.$box.offset().top;
 			var left = 0;
 
@@ -2009,6 +1909,53 @@
 			if (this.opts.iframe) hideHandler(this.document);
 		},
 
+		// COLORPICKER
+		pickerBuild: function($dropdown, key)
+		{
+			$dropdown.width(210);
+
+			var rule = 'color';
+			if (key === 'backcolor') rule = 'background-color';
+
+			var len = this.opts.colors.length;
+			var _self = this;
+			for (var i = 0; i < len; i++)
+			{
+				var color = this.opts.colors[i];
+
+				var $swatch = $('<a rel="' + color + '" href="javascript:;" class="redactor_color_link"></a>').css({ 'backgroundColor': color });
+				$dropdown.append($swatch);
+
+				$swatch.on('click', function()
+				{
+					var type = $(this).attr('rel');
+					if (key === 'backcolor') type = $(this).css('background-color');
+
+					_self.pickerSet(rule, type);
+				});
+			}
+
+			var $elNone = $('<a href="javascript:;" class="redactor_color_none"></a>')
+					.html(this.opts.curLang.none)
+					.on('click', function()
+					{
+						_self.pickerSet(rule, false);
+					});
+
+			$dropdown.append($elNone);
+		},
+
+		pickerSet: function(rule, type)
+		{
+			this.bufferSet();
+
+			this.$editor.focus();
+			this.inlineRemoveStyle(rule);
+			if (type !== false) this.inlineSetStyle(rule, type);
+			if (this.opts.air) this.$air.fadeOut(100);
+			this.sync();
+		},
+
 		// DROPDOWNS
 		dropdownBuild: function($dropdown, dropdownObject)
 		{
@@ -2020,7 +1967,7 @@
 				if (btnObject.name === 'separator') $item = $('<a class="redactor_separator_drop">');
 				else
 				{
-					$item = $('<a href="#" class="' + btnObject.className + ' redactor_dropdown_' + btnName + '">' + btnObject.title + '</a>');
+					$item = $('<a href="javascript:;" class="' + btnObject.className + ' redactor_dropdown_' + btnName + '">' + btnObject.title + '</a>');
 					$item.on('click', $.proxy(function(e)
 					{
 						if (e.preventDefault) e.preventDefault();
@@ -2040,7 +1987,7 @@
 
 			}, this));
 		},
-		dropdownShow: function(e, key)
+		dropdownShow: function (e, $dropdown, key)
 		{
 			if (!this.opts.visual)
 			{
@@ -2048,43 +1995,30 @@
 				return false;
 			}
 
-			var $dropdown = this.$toolbar.find('.redactor_dropdown_box_' + key);
-			var $button = this.buttonGet(key);
-
-			if ($button.hasClass('dropact')) this.dropdownHideAll();
+			if (this.buttonGet(key).hasClass('dropact')) this.dropdownHideAll();
 			else
 			{
 				this.dropdownHideAll();
 
 				this.buttonActive(key);
-				$button.addClass('dropact');
+				this.buttonGet(key).addClass('dropact');
+
+				var keyPosition = this.buttonGet(key).position(), left = keyPosition.left + 'px', btnHeight = 29;
 
-				var keyPosition = $button.position();
-				if (this.toolbarFixed)
+				if (this.opts.air)
 				{
-					keyPosition = $button.offset();
+					$dropdown.css({ position: 'absolute', left: left, top: btnHeight + 'px' }).show();
 				}
-
-				// fix right placement
-				var dropdownWidth = $dropdown.width();
-				if ((keyPosition.left + dropdownWidth) > $(document).width())
+				else if (this.opts.toolbarFixed && this.toolbarFixed)
 				{
-					keyPosition.left -= dropdownWidth;
+					$dropdown.css({ position: 'fixed', left: left, top: btnHeight + 'px' }).show();
+				}
+				else
+				{
+					$dropdown.css({ position: 'absolute', left: left, top: keyPosition.top + btnHeight + 'px' }).show();
 				}
-
-				var left = keyPosition.left + 'px';
-				var btnHeight = 29;
-
-				var position = 'absolute';
-				var top = btnHeight + 'px';
-
-				if (this.opts.toolbarFixed && this.toolbarFixed) position = 'fixed';
-				else if (!this.opts.air) top = keyPosition.top + btnHeight + 'px';
-
-				$dropdown.css({ position: position, left: left, top: top }).show();
 			}
 
-
 			var hdlHideDropDown = $.proxy(function(e)
 			{
 				this.dropdownHide(e, $dropdown);
@@ -2114,6 +2048,7 @@
 		buttonBuild: function(btnName, btnObject)
 		{
 			var $button = $('<a href="javascript:;" title="' + btnObject.title + '" class="redactor_btn redactor_btn_' + btnName + '"></a>');
+			var $dropdown = $('<div class="redactor_dropdown" style="display: none;">');
 
 			$button.on('click', $.proxy(function(e)
 			{
@@ -2146,9 +2081,9 @@
 					this.airBindMousemoveHide();
 
 				}
-				else if (btnObject.dropdown)
+				else if (btnName === 'backcolor' || btnName === 'fontcolor' || btnObject.dropdown)
 				{
-					this.dropdownShow(e, btnName);
+					this.dropdownShow(e, $dropdown, btnName);
 				}
 
 				this.buttonActiveObserver(false, btnName);
@@ -2156,11 +2091,12 @@
 			}, this));
 
 			// dropdown
-			if (btnObject.dropdown)
+			if (btnName === 'backcolor' || btnName === 'fontcolor' || btnObject.dropdown)
 			{
-				var $dropdown = $('<div class="redactor_dropdown redactor_dropdown_box_' + btnName + '" style="display: none;">');
 				$dropdown.appendTo(this.$toolbar);
-				this.dropdownBuild($dropdown, btnObject.dropdown);
+
+				if ( btnName === 'backcolor' || btnName === 'fontcolor') this.pickerBuild($dropdown, btnName);
+				else this.dropdownBuild($dropdown, btnObject.dropdown);
 			}
 
 			return $button;
@@ -2256,18 +2192,14 @@
 			if (!this.opts.toolbar) return;
 			var btn = this.buttonBuild(key, { title: title, callback: callback, dropdown: dropdown });
 			var $btn = this.buttonGet(afterkey);
-
-			if ($btn.size() !== 0) $btn.parent().after($('<li>').append(btn));
-			else this.$toolbar.append($('<li>').append(btn));
+			$btn.parent().after($('<li>').append(btn));
 		},
 		buttonAddBefore: function(beforekey, key, title, callback, dropdown)
 		{
 			if (!this.opts.toolbar) return;
 			var btn = this.buttonBuild(key, { title: title, callback: callback, dropdown: dropdown });
 			var $btn = this.buttonGet(beforekey);
-
-			if ($btn.size() !== 0) $btn.parent().before($('<li>').append(btn));
-			else this.$toolbar.append($('<li>').append(btn));
+			$btn.parent().before($('<li>').append(btn));
 		},
 		buttonRemove: function (key, separator)
 		{
@@ -2283,10 +2215,7 @@
 
 			if (e === false && btnName !== 'html')
 			{
-				if ($.inArray(btnName, this.opts.activeButtons) != -1)
-				{
-					this.buttonActiveToggle(btnName);
-				}
+				this.buttonActiveToggle(btnName);
 				return;
 			}
 
@@ -2443,7 +2372,7 @@
 					this.document.execCommand(cmd);
 
 					var parent = this.getParent();
-					var $list = $(parent).closest('ol, ul');
+					var $list = $(parent).parents('ol, ul');
 
 					if ($list.length)
 					{
@@ -2470,14 +2399,14 @@
 				return;
 			}
 
-			if (cmd === 'unlink')
+			if (cmd === 'unlink' )
 			{
 				this.bufferSet();
 
-				var link = this.currentOrParentIs('A');
-				if (link)
+				var parent = this.getParent();
+				if (parent && $(parent)[0].tagName === 'A')
 				{
-					$(link).replaceWith($(link).text());
+					$(parent).replaceWith($(parent).text());
 
 					this.sync();
 					this.callback('execCommand', cmd, param);
@@ -2559,8 +2488,6 @@
 					{
 						var $el = false;
 
-						if (elem.tagName === 'TD') return;
-
 						if ($.inArray(elem.tagName, this.opts.alignmentTags) !== -1)
 						{
 							$el = $(elem);
@@ -2688,12 +2615,6 @@
 		},
 		cleanConvertProtected: function(html)
 		{
-			if (this.opts.templateVars)
-			{
-				html = html.replace(/\{\{(.*?)\}\}/gi, '<!-- template double $1 -->');
-				html = html.replace(/\{(.*?)\}/gi, '<!-- template $1 -->');
-			}
-
 			html = html.replace(/<script(.*?)>([\w\W]*?)<\/script>/gi, '<title type="text/javascript" style="display: none;" class="redactor-script-tag"$1>$2</title>');
 			html = html.replace(/<style(.*?)>([\w\W]*?)<\/style>/gi, '<section$1 style="display: none;" rel="redactor-style-tag">$2</section>');
 			html = html.replace(/<form(.*?)>([\w\W]*?)<\/form>/gi, '<section$1 rel="redactor-form-tag">$2</section>');
@@ -2706,12 +2627,6 @@
 		},
 		cleanReConvertProtected: function(html)
 		{
-			if (this.opts.templateVars)
-			{
-				html = html.replace(/<!-- template double (.*?) -->/gi, '{{$1}}');
-				html = html.replace(/<!-- template (.*?) -->/gi, '{$1}');
-			}
-
 			html = html.replace(/<title type="text\/javascript" style="display: none;" class="redactor-script-tag"(.*?)>([\w\W]*?)<\/title>/gi, '<script$1 type="text/javascript">$2</script>');
 			html = html.replace(/<section(.*?) style="display: none;" rel="redactor-style-tag">([\w\W]*?)<\/section>/gi, '<style$1>$2</style>');
 			html = html.replace(/<section(.*?)rel="redactor-form-tag"(.*?)>([\w\W]*?)<\/section>/gi, '<form$1$2>$3</form>');
@@ -2725,23 +2640,31 @@
 		{
 			if (buffer !== false)
 			{
-				var buffer = []
-				var matches = html.match(/<(pre|style|script|title)(.*?)>([\w\W]*?)<\/(pre|style|script|title)>/gi);
-				if (matches === null) matches = [];
-
-				if (this.opts.phpTags)
+				// save code
+				var buffer = [], z = 0, code;
+				code = html.match(/<(pre|style|script|title)(.*?)>([\w\W]*?)<\/(pre|style|script|title)>/gi);
+				if (code !== null)
 				{
-					var phpMatches = html.match(/<\?php([\w\W]*?)\?>/gi);
-					if (phpMatches) matches = $.merge(matches, phpMatches);
+					$.each(code, function(i,s)
+					{
+						z = i;
+						html = html.replace(s, 'buffer_' + z);
+						buffer.push(s);
+					});
 				}
 
-				if (matches)
+				if (this.opts.phpTags)
 				{
-					$.each(matches, function(i, s)
+					code = html.match(/<\?php([\w\W]*?)\?>/gi);
+					if (code !== null)
 					{
-						html = html.replace(s, 'buffer_' + i);
-						buffer.push(s);
-					});
+						$.each(code, function(i,s)
+						{
+							z = z + i;
+							html = html.replace(s, 'buffer_' + i);
+							buffer.push(s);
+						});
+					}
 				}
 			}
 
@@ -2750,22 +2673,26 @@
 			html = html.replace(/\n\s*\n/g, "\n");
 			html = html.replace(/^[\s\n]*/g, ' ');
 			html = html.replace(/[\s\n]*$/g, ' ');
-			html = html.replace( />\s{2,}</g, '> <'); // between inline tags can be only one space
+			html = html.replace( />\s{2,}</g, '><' ); // between inline tags can be only one space
 
-			html = this.cleanReplacer(html, buffer);
+			if (buffer !== false)
+			{
+				html = this.cleanReplacer(buffer, html);
+			}
 
 			html = html.replace(/\n\n/g, "\n");
 
 			return html;
 		},
-		cleanReplacer: function(html, buffer)
+		cleanReplacer: function(arr, html)
 		{
-			if (buffer === false) return html;
-
-			$.each(buffer, function(i,s)
+			if (arr)
 			{
-				html = html.replace('buffer_' + i, s);
-			});
+				$.each(arr, function(i,s)
+				{
+					html = html.replace('buffer_' + i, s);
+				});
+			}
 
 			return html;
 		},
@@ -2803,29 +2730,35 @@
 			html = html + "\n";
 
 			var safes = [];
+			var z = 0;
 			var matches = html.match(/<(table|div|pre|object)(.*?)>([\w\W]*?)<\/(table|div|pre|object)>/gi);
-			if (matches === null) matches = [];
 
-			var commentsMatches = html.match(/<!--([\w\W]*?)-->/gi);
-			if (commentsMatches) matches = $.merge(matches, commentsMatches);
+			if (matches)
+			{
+				$.each(matches, function(i,s)
+				{
+					z++;
+					safes[z] = s;
+					html = html.replace(s, '{replace' + z + '}\n');
+				});
+			}
 
 			if (this.opts.phpTags)
 			{
 				var phpMatches = html.match(/<section(.*?)rel="redactor-php-tag">([\w\W]*?)<\/section>/gi);
 				if (phpMatches)
 				{
-					matches = $.merge(matches, phpMatches);
+					$.each(phpMatches, function(i,s)
+					{
+						z++;
+						safes[z] = s;
+						html = html.replace(s, '{replace' + z + '}\n');
+					});
 				}
 			}
 
-			if (matches)
-			{
-				$.each(matches, function(i,s)
-				{
-					safes[i] = s;
-					html = html.replace(s, '{replace' + i + '}\n');
-				});
-			}
+			// comments safe
+			html = html.replace(/<\!\-\-([\w\W]*?)\-\->/gi, "<comment>$1</comment>");
 
 			html = html.replace(/<br \/>\s*<br \/>/gi, "\n\n");
 
@@ -2880,24 +2813,23 @@
 			html = R('<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)', 'gi', '$1');
 			html = R("\n</p>", 'gi', '</p>');
 
-			html = R('<li><p>', 'gi', '<li>');
-			html = R('</p></li>', 'gi', '</li>');
 			html = R('</li><p>', 'gi', '</li>');
 			//html = R('</ul><p>(.*?)</li>', 'gi', '</ul></li>');
-			/* html = R('</ol><p>', 'gi', '</ol>'); */
+			html = R('</ol><p>', 'gi', '</ol>');
 			html = R('<p>\t?\n?<p>', 'gi', '<p>');
 			html = R('</dt><p>', 'gi', '</dt>');
 			html = R('</dd><p>', 'gi', '</dd>');
 			html = R('<br></p></blockquote>', 'gi', '</blockquote>');
-			html = R('<p>\t*</p>', 'gi', '');
-
+			html = R('<p>    </p>', 'gi', '');
 
-			// restore safes
 			$.each(safes, function(i,s)
 			{
 				html = html.replace('{replace' + i + '}', s);
 			});
 
+			// comments safe
+			html = html.replace(/<comment>([\w\W]*?)<\/comment>/gi, '<!--$1-->');
+
 			return $.trim(html);
 		},
 		cleanConvertInlineTags: function(html)
@@ -2978,18 +2910,18 @@
 
 			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"]')
+			$elem.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)
 			{
@@ -3406,10 +3338,8 @@
 					$(wrapper).html(html);
 					this.selectionElement(wrapper);
 					var next = $(wrapper).next();
-					if (next.size() != 0 && next[0].tagName === 'BR')
-					{
-						next.remove();
-					}
+					if (next[0].tagName === 'BR') next.remove();
+
 				}
 			}
 
@@ -3530,7 +3460,7 @@
 			var range = this.getRange()
 			var el = this.getElement();
 
-			if ((range.collapsed || range.startContainer === range.endContainer) && el && !this.nodeTestBlocks(el))
+			if (range.collapsed || range.startContainer === range.endContainer && el)
 			{
 				$(el)[type](attr, value);
 			}
@@ -3637,22 +3567,15 @@
 
 			var utag = tag.toUpperCase();
 			var nodes = this.getNodes();
-			var parent = $(this.getParent()).parent();
 
 			$.each(nodes, function(i, s)
 			{
-				if (s.tagName === utag) this.inlineRemoveFormatReplace(s);
+				if (s.tagName === utag) $(s).replaceWith($(s).contents());
 			});
 
-			if (parent && parent[0].tagName === utag) this.inlineRemoveFormatReplace(parent);
-
 			this.selectionRestore();
 			this.sync();
 		},
-		inlineRemoveFormatReplace: function(el)
-		{
-			$(el).replaceWith($(el).contents());
-		},
 
 		// INSERT
 		insertHtml: function (html, sync)
@@ -3694,20 +3617,17 @@
 			}
 
 			// in the quote, we can insert text or links only
-/*
 			if (currBlock.tagName == 'BLOCKQUOTE' && html.indexOf('<a') === -1)
 			{
 				this.insertText(html);
 			}
-			else
-*/
-			if ($html.contents().length > 1 && currBlock
+			else if ($html.contents().length > 1 && currBlock
 					|| $html.contents().is('p, :header, ul, ol, div, table, blockquote, pre, address, section, header, footer, aside, article'))
 			{
-				if (this.browser('msie')) this.document.selection.createRange().pasteHTML(html);
+				if(this.browser('msie')) this.document.selection.createRange().pasteHTML(html);
 				else this.document.execCommand('inserthtml', false, html);
 			}
-			else this.insertHtmlAdvanced(html, false);
+			else this.insertHtmlAdvanced(html);
 
 			if (this.selectall)
 			{
@@ -3723,7 +3643,7 @@
 
 			if (sync !== false) this.sync();
 		},
-		insertHtmlAdvanced: function(html, sync)
+		insertHtmlAdvanced: function(html)
 		{
 			var sel = this.getSelection();
 
@@ -3751,12 +3671,6 @@
 					sel.addRange(range);
 				}
 			}
-
-			if (sync !== false)
-			{
-				this.sync();
-			}
-
 		},
 		insertText: function(html)
 		{
@@ -3787,41 +3701,11 @@
 				sel.addRange(range);
 			}
 		},
-		insertNodeToCaretPositionFromPoint: function(e, node)
-		{
-			var range;
-			var x = e.clientX, y = e.clientY;
-			if (this.document.caretPositionFromPoint)
-			{
-			    var pos = this.document.caretPositionFromPoint(x, y);
-			    range = this.getRange();
-			    range.setStart(pos.offsetNode, pos.offset);
-			    range.collapse(true);
-			    range.insertNode(node);
-			}
-			else if (this.document.caretRangeFromPoint)
-			{
-			    range = this.document.caretRangeFromPoint(x, y);
-			    range.insertNode(node);
-			}
-			else if (typeof document.body.createTextRange != "undefined")
-			{
-		        range = this.document.body.createTextRange();
-		        range.moveToPoint(x, y);
-		        var endRange = range.duplicate();
-		        endRange.moveToPoint(x, y);
-		        range.setEndPoint("EndToEnd", endRange);
-		        range.select();
-			}
-
-		},
 		insertAfterLastElement: function(element)
 		{
 			if (this.isEndOfElement())
 			{
-
-				if ($($.trim(this.$editor.html())).get(0) != $.trim(element)
-				&& this.$editor.contents().last()[0] !== element) return false;
+				if (this.$editor.contents().last()[0] !== element) return false;
 
 				this.bufferSet();
 
@@ -3860,26 +3744,10 @@
 			this.selectionStart(node);
 		},
 
-		// PASTE
-		pasteClean: function(html)
-		{
-			html = this.callback('pasteBefore', false, html);
-
-			if (this.opts.pastePlainText)
-			{
-				var tmp = this.document.createElement('div');
-
-				html = html.replace(/<br>|<\/H[1-6]>|<\/p>|<\/div>/gi, '\n');
-
-				tmp.innerHTML = html;
-				html = tmp.textContent || tmp.innerText;
-
-				html = html.replace('\n', '<br>');
-				html = this.cleanParagraphy(html);
-
-				this.pasteInsert(html);
-				return false;
-			}
+		// PASTE
+		pasteClean: function(html)
+		{
+			html = this.callback('pasteBefore', false, html);
 
 			// clean up pre
 			if (this.currentOrParentIs('PRE'))
@@ -3902,7 +3770,6 @@
 
 			// remove google docs marker
 			html = html.replace(/<b\sid="internal-source-marker(.*?)">([\w\W]*?)<\/b>/gi, "$2");
-			html = html.replace(/<b(.*?)id="docs-internal-guid(.*?)">([\w\W]*?)<\/b>/gi, "$3");
 
 			// strip tags
 			html = this.cleanStripTags(html);
@@ -3919,7 +3786,6 @@
 			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
 			html = html.replace(/ class="(.*?)"/gi, '');
@@ -3951,15 +3817,8 @@
 				html = html.replace(/<\/p><\/div>/gi, '</p>');
 			}
 
-			if (this.currentOrParentIs('LI'))
-			{
-				html = html.replace(/<p>([\w\W]*?)<\/p>/gi, '$1<br>');
-			}
-			else
-			{
-				html = this.cleanParagraphy(html);
-			}
 
+			html = this.cleanParagraphy(html);
 
 			// remove span
 			html = html.replace(/<span(.*?)>([\w\W]*?)<\/span>/gi, '$2');
@@ -3985,28 +3844,9 @@
 			// remove empty finally
 			html = html.replace(/<[^\/>][^>][^img|param|source]*>(\s*|\t*|\n*|&nbsp;|<br>)<\/[^>]+>/gi, '');
 
-			// remove safari local images
-			html = html.replace(/<img src="webkit-fake-url\:\/\/(.*?)"(.*?)>/gi, '');
-
-			// FF specific
-			this.pasteClipboardMozilla = false;
+			// FF fix
 			if (this.browser('mozilla'))
 			{
-				if (this.opts.clipboardUpload)
-				{
-					var matches = html.match(/<img src="data:image(.*?)"(.*?)>/gi);
-					if (matches !== null)
-					{
-						this.pasteClipboardMozilla = matches;
-						for (k in matches)
-						{
-							var img = matches[k].replace('<img', '<img data-mozilla-paste-image="' + k + '" ');
-							html = html.replace(matches[k], img);
-						}
-					}
-				}
-
-				// FF fix
 				while (/<br>$/gi.test(html))
 				{
 					html = html.replace(/<br>$/gi, '');
@@ -4049,97 +3889,12 @@
 			this.insertHtml(html);
 
 			this.selectall = false;
-			setTimeout($.proxy(function()
-			{
-				rtePaste = false;
-
-				// FF specific
-				if (this.browser('mozilla'))
-				{
-					this.$editor.find('p:empty').remove()
-				}
-				if (this.pasteClipboardMozilla !== false)
-				{
-					this.pasteClipboardUploadMozilla();
-				}
-
-			}, this), 100);
+			setTimeout(function() { rtePaste = false; }, 100);
 
 			if (this.opts.autoresize) $(this.document.body).scrollTop(this.saveScroll);
 			else this.$editor.scrollTop(this.saveScroll);
 		},
 
-		pasteClipboardUploadMozilla: function()
-		{
-			var imgs = this.$editor.find('img[data-mozilla-paste-image]');
-			$.each(imgs, $.proxy(function(i,s)
-			{
-				var $s = $(s);
-				var arr = s.src.split(",");
-				var data = arr[1]; // raw base64
-				var contentType = arr[0].split(";")[0].split(":")[1];
-
-				$.post(this.opts.clipboardUploadUrl, {
-				    contentType: contentType,
-				    data: data
-				},
-				$.proxy(function(data)
-				{
-					var json = $.parseJSON(data);
-		        	$s.attr('src', json.filelink);
-		        	$s.removeAttr('data-mozilla-paste-image');
-
-		        	this.sync();
-
-					// upload callback
-					this.callback('imageUpload', $s, json);
-
-				}, this));
-
-			}, this));
-		},
-		pasteClipboardUpload: function(e)
-		{
-	        var result = e.target.result;
-			var arr = result.split(",");
-			var data = arr[1]; // raw base64
-			var contentType = arr[0].split(";")[0].split(":")[1];
-
-			if (this.opts.clipboardUpload)
-			{
-				$.post(this.opts.clipboardUploadUrl, {
-				    contentType: contentType,
-				    data: data
-				},
-				$.proxy(function(data)
-				{
-					var json = $.parseJSON(data);
-
-					var html = '<img src="' + json.filelink + '" id="clipboard-image-marker" />';
-					this.execCommand('inserthtml', html, false);
-
-					var image = $(this.$editor.find('img#clipboard-image-marker'));
-
-					if (image.length) image.removeAttr('id');
-					else image = false;
-
-					this.sync();
-
-					// upload callback
-					if (image)
-					{
-						this.callback('imageUpload', image, json);
-					}
-
-
-				}, this));
-			}
-			else
-			{
-	        	this.insertHtml('<img src="' + result + '" />');
-        	}
-		},
-
 		// BUFFER
 		bufferSet: function(html)
 		{
@@ -4193,17 +3948,6 @@
 		{
 			this.observeImages();
 			this.observeTables();
-
-			if (this.opts.observeLinks) this.observeLinks();
-		},
-		observeLinks: function()
-		{
-			this.$editor.find('a').on('click', $.proxy(this.linkObserver, this));
-			this.$editor.on('click.redactor', $.proxy(function(e)
-			{
-				this.linkObserverTooltipClose(e);
-
-			}, this));
 		},
 		observeTables: function()
 		{
@@ -4220,62 +3964,6 @@
 
 			}, this));
 		},
-		linkObserver: function(e)
-		{
-			var $link = $(e.target);
-			var pos = $link.offset();
-			if (this.opts.iframe)
-			{
-				var posFrame = this.$frame.offset();
-				pos.top = posFrame.top + (pos.top - $(this.document).scrollTop());
-				pos.left += posFrame.left;
-			}
-
-			var tooltip = $('<span class="redactor-link-tooltip"></span>');
-
-			var href = $link.attr('href');
-			if (href.length > 24) href = href.substring(0,24) + '...';
-
-			var aLink = $('<a href="' + $link.attr('href') + '" target="_blank">' + href + '</a>').on('click', $.proxy(function(e)
-			{
-				this.linkObserverTooltipClose(false);
-			}, this));
-
-			var aEdit = $('<a href="#">' + this.opts.curLang.edit + '</a>').on('click', $.proxy(function(e)
-			{
-				e.preventDefault();
-				this.linkShow();
-				this.linkObserverTooltipClose(false);
-
-			}, this));
-
-			var aUnlink = $('<a href="#">' + this.opts.curLang.unlink + '</a>').on('click', $.proxy(function(e)
-			{
-				e.preventDefault();
-				this.execCommand('unlink');
-				this.linkObserverTooltipClose(false);
-
-			}, this));
-
-
-			tooltip.append(aLink);
-			tooltip.append(' | ');
-			tooltip.append(aEdit);
-			tooltip.append(' | ');
-			tooltip.append(aUnlink);
-			tooltip.css({
-				top: (pos.top + 20) + 'px',
-				left: pos.left + 'px'
-			});
-
-			$('.redactor-link-tooltip').remove();
-			$('body').append(tooltip);
-		},
-		linkObserverTooltipClose: function(e)
-		{
-			if (e !== false && e.target.tagName == 'A') return false;
-			$('.redactor-link-tooltip').remove();
-		},
 
 
 		// SELECTION
@@ -4375,7 +4063,7 @@
 		{
 			var caretOffset = 0;
 
-			var range = this.getRange();
+			var range = this.getSelection().getRangeAt(0);
 			var preCaretRange = range.cloneRange();
 			preCaretRange.selectNodeContents(element);
 			preCaretRange.setEnd(range.endContainer, range.endOffset);
@@ -4503,11 +4191,7 @@
 				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())
+				if (!this.isFocused())
 				{
 					this.$editor.focus();
 				}
@@ -4539,7 +4223,7 @@
 			{
 				$.each(this.$editor.find('span.redactor-selection-marker'), function()
 				{
-					var html = $.trim($(this).html().replace(/[^\u0000-\u1C7F]/g, ''));
+					var html = $.trim($(this).html().replace(/[^\u0000-~]/g, ''));
 					if (html == '')
 					{
 						$(this).remove();
@@ -4843,13 +4527,13 @@
 			this.selectionRestore();
 
 			var current = this.getBlock() || this.getCurrent();
-			if (current && current.tagName != 'BODY')
+			if (current)
 			{
 				$(current).after(html)
 			}
 			else
 			{
-				this.insertHtmlAdvanced(html, false);
+				this.insertHtmlAdvanced(html);
 
 			}
 
@@ -4859,7 +4543,6 @@
 			this.tableObserver(table);
 			this.buttonActiveObserver();
 
-			table.find('span#selection-marker-1').remove();
 			table.removeAttr('id');
 
 			this.sync();
@@ -5031,11 +4714,13 @@
 			this.selectionRestore();
 
 			var current = this.getBlock() || this.getCurrent();
+			if (current)
+			{
+				$(current).after(data)
+				this.sync();
+			}
+			else this.insertHtmlAdvanced(data);
 
-			if (current) $(current).after(data)
-			else this.insertHtmlAdvanced(data, false);
-
-			this.sync();
 			this.modalClose();
 		},
 
@@ -5073,13 +4758,6 @@
 				var thref = self.location.href.replace(/\/$/i, '');
 				var turl = url.replace(thref, '');
 
-				// remove host from href
-				if (this.opts.linkProtocol === false)
-				{
-					var re = new RegExp('^(http|ftp|https)://' + self.location.host, 'i');
-					turl = turl.replace(re, '');
-				}
-
 				var tabs = $('#redactor_tabs').find('a');
 
 				if (this.opts.linkEmail === false) tabs.eq(1).remove();
@@ -5166,7 +4844,6 @@
 				text = $('#redactor_link_anchor_text').val();
 			}
 
-			text = text.replace(/<|>/g, '');
 			this.linkInsert('<a href="' + link + '"' + target + '>' + text + '</a>', $.trim(text), link, targetBlank);
 
 		},
@@ -5425,10 +5102,10 @@
 			this.modalInit(this.opts.curLang.image, this.opts.modal_image, 610, callback);
 
 		},
-		imageEdit: function(image)
+		imageEdit: function(e)
 		{
-			var $el = image;
-			var parent = $el.parent().parent();
+			var $el = $(e.target);
+			var parent = $el.parent();
 
 			var callback = $.proxy(function()
 			{
@@ -5438,12 +5115,7 @@
 
 				if ($(parent).get(0).tagName === 'A')
 				{
-					$('#redactor_file_link').val($(parent).attr('href'));
-
-					if ($(parent).attr('target') == '_blank')
-					{
-						$('#redactor_link_blank').prop('checked', true);
-					}
+					$('#redactor_file_link').val($( parent ).attr('href'));
 				}
 
 				$('#redactor_image_delete_btn').click($.proxy(function()
@@ -5482,67 +5154,43 @@
 		},
 		imageSave: function(el)
 		{
-			var $el = $(el);
-			var parent = $el.parent();
+			var parent = $(el).parent();
 
-			$el.attr('alt', $('#redactor_file_alt').val());
+			$(el).attr('alt', $('#redactor_file_alt').val());
 
 			var floating = $('#redactor_form_image_align').val();
 
 			if (floating === 'left')
 			{
-				$el.css({ 'float': 'left', 'margin': '0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + ' 0' });
+				$(el).css({ 'float': 'left', 'margin': '0 10px 10px 0' });
 			}
 			else if (floating === 'right')
 			{
-				$el.css({ 'float': 'right', 'margin': '0 0 ' + this.opts.imageFloatMargin + ' ' + this.opts.imageFloatMargin + '' });
+				$(el).css({ 'float': 'right', 'margin': '0 0 10px 10px' });
 			}
 			else
 			{
-				var imageBox = $el.closest('#redactor-image-box');
-				if (imageBox.size() != 0) imageBox.css({ 'float': '', 'margin': '' });
-				$el.css({ 'float': '', 'margin': '' });
+				$(el).css({ 'float': 'none', 'margin': '0' });
 			}
 
 			// as link
 			var link = $.trim($('#redactor_file_link').val());
 			if (link !== '')
 			{
-				var target = false;
-				if ($('#redactor_link_blank').prop('checked'))
-				{
-					target = true;
-				}
-
-				if (parent.get(0).tagName !== 'A')
+				if ($(parent).get(0).tagName !== 'A')
 				{
-					var a = $('<a href="' + link + '">' + this.outerHtml(el) + '</a>');
-
-					if (target)
-					{
-						a.attr('target', '_blank');
-					}
-
-					$el.replaceWith(a);
+					$(el).replaceWith('<a href="' + link + '">' + this.outerHtml(el) + '</a>');
 				}
 				else
 				{
-					parent.attr('href', link);
-					if (target)
-					{
-						parent.attr('target', '_blank');
-					}
-					else
-					{
-						parent.removeAttr('target');
-					}
+					$(parent).attr('href', link);
 				}
 			}
 			else
 			{
-				if (parent.get(0).tagName === 'A')
+				if ($(parent).get(0).tagName === 'A')
 				{
-					parent.replaceWith(this.outerHtml(el));
+					$(parent).replaceWith(this.outerHtml(el));
 				}
 			}
 
@@ -5551,224 +5199,76 @@
 			this.sync();
 
 		},
-		imageResizeHide: function(e)
+		imageResize: function(image)
 		{
-			if (e !== false && $(e.target).parent().size() != 0 && $(e.target).parent()[0].id === 'redactor-image-box')
-			{
-				return false;
-			}
-
-			var imageBox = this.$editor.find('#redactor-image-box');
-			if (imageBox.size() == 0)
-			{
-				return false;
-			}
+			var $image = $(image),
+				clicked = false,
+				clicker = false,
+				start_x,
+				start_y,
+				ratio = $image.width() / $image.height(),
+				min_w = 10,
+				min_h = 10;
 
-			this.$editor.find('#redactor-image-editter, #redactor-image-resizer').remove();
+			$image.off('hover mousedown mouseup click mousemove');
 
-			var margin = imageBox.css('margin');
-			if (margin != '0px')
+			$image.hover(function()
 			{
-				imageBox.find('img').css('margin', margin);
-				imageBox.css('margin', '');
-			}
-
-			imageBox.find('img').css('opacity', '');
-			imageBox.replaceWith(function()
+				$image.css('cursor', 'nw-resize');
+			},
+			function()
 			{
-				return $(this).contents();
+				$image.css('cursor', '');
+				clicked = false;
 			});
 
-			$(document).off('click.redactor-image-resize-hide');
-			this.$editor.off('click.redactor-image-resize-hide');
-			this.$editor.off('keydown.redactor-image-delete');
+			$image.mousedown(function(e)
+			{
+				e.preventDefault();
 
-			this.sync()
+				ratio = $image.width() / $image.height();
 
-		},
-		imageResize: function(image)
-		{
-			var $image = $(image);
+				clicked = true;
+				clicker = true;
 
-			$image.on('mousedown', $.proxy(function()
-			{
-				this.imageResizeHide(false);
-			}, this));
+				start_x = Math.round(e.pageX - $image.eq( 0 ).offset().left);
+				start_y = Math.round(e.pageY - $image.eq( 0 ).offset().top);
+			});
 
-			$image.on('dragstart', $.proxy(function()
+			$image.mouseup( $.proxy(function(e)
 			{
-				this.$editor.on('drop.redactor-image-inside-drop', $.proxy(function()
-				{
-					setTimeout($.proxy(function()
-					{
-						this.observeImages();
-						this.$editor.off('drop.redactor-image-inside-drop');
-						this.sync();
-
-					}, this), 1);
+				clicked = false;
+				$image.css('cursor', '');
+				this.sync();
 
-				},this));
 			}, this));
 
-			$image.on('click', $.proxy(function(e)
+			$image.click( $.proxy(function(e)
 			{
-				if (this.$editor.find('#redactor-image-box').size() != 0)
-				{
-					return false;
-				}
-
-				var clicked = false,
-				start_x,
-				start_y,
-				ratio = $image.width() / $image.height(),
-				min_w = 20,
-				min_h = 10;
-
-				var imageResizer = this.imageResizeControls($image);
-
-				// resize
-				var isResizing = false;
-				imageResizer.on('mousedown', function(e)
-				{
-					isResizing = true;
-					e.preventDefault();
-
-					ratio = $image.width() / $image.height();
-
-					start_x = Math.round(e.pageX - $image.eq(0).offset().left);
-					start_y = Math.round(e.pageY - $image.eq(0).offset().top);
-
-				});
-
-				$(this.document.body).on('mousemove', $.proxy(function(e)
-				{
-					if (isResizing)
-					{
-						var mouse_x = Math.round(e.pageX - $image.eq(0).offset().left) - start_x;
-						var mouse_y = Math.round(e.pageY - $image.eq(0).offset().top) - start_y;
-
-						var div_h = $image.height();
-
-						var new_h = parseInt(div_h, 10) + mouse_y;
-						var new_w = Math.round(new_h * ratio);
-
-						if (new_w > min_w)
-						{
-							$image.width(new_w);
-
-							if (new_w < 100)
-							{
-								this.imageEditter.css({
-									marginTop: '-7px',
-									marginLeft: '-13px',
-									fontSize: '9px',
-									padding: '3px 5px'
-								});
-							}
-							else
-							{
-								this.imageEditter.css({
-									marginTop: '-11px',
-									marginLeft: '-18px',
-									fontSize: '11px',
-									padding: '7px 10px'
-								});
-							}
-						}
-
-						start_x = Math.round(e.pageX - $image.eq(0).offset().left);
-						start_y = Math.round(e.pageY - $image.eq(0).offset().top);
-
-						this.sync()
-					}
-				}, this)).on('mouseup', function()
-				{
-					isResizing = false;
-				});
+				if (clicker) this.imageEdit(e);
 
+			}, this));
 
-				this.$editor.on('keydown.redactor-image-delete', $.proxy(function(e)
+			$image.mousemove(function(e)
+			{
+				if (clicked)
 				{
-					var key = e.which;
+					clicker = false;
 
-					if (this.keyCode.BACKSPACE == key || this.keyCode.DELETE == key)
-					{
-						this.imageResizeHide(false);
-						this.imageRemove($image);
-					}
+					var mouse_x = Math.round(e.pageX - $(this).eq(0).offset().left) - start_x;
+					var mouse_y = Math.round(e.pageY - $(this).eq(0).offset().top) - start_y;
 
-				}, this));
+					var div_h = $image.height();
 
-				$(document).on('click.redactor-image-resize-hide', $.proxy(this.imageResizeHide, this));
-				this.$editor.on('click.redactor-image-resize-hide', $.proxy(this.imageResizeHide, this));
+					var new_h = parseInt(div_h, 10) + mouse_y;
+					var new_w = Math.round(new_h * ratio);
 
+					if (new_w > min_w) $image.width(new_w);
 
-			}, this));
-		},
-		imageResizeControls: function($image)
-		{
-			var imageBox = $('<span id="redactor-image-box" data-redactor="verified">');
-			imageBox.css({
-				position: 'relative',
-				display: 'inline-block',
-				lineHeight: 0,
-				outline: '1px dashed rgba(0, 0, 0, .6)',
-				'float': $image.css('float')
-			});
-			imageBox.attr('contenteditable', false);
-
-			var margin = $image.css('margin');
-			if (margin != '0px')
-			{
-				imageBox.css('margin', margin);
-				$image.css('margin', '');
-			}
-
-			$image.css('opacity', .5).after(imageBox);
-
-			// editter
-			this.imageEditter = $('<span id="redactor-image-editter" data-redactor="verified">' + this.opts.curLang.edit + '</span>');
-			this.imageEditter.css({
-				position: 'absolute',
-				zIndex: 2,
-				top: '50%',
-				left: '50%',
-				marginTop: '-11px',
-				marginLeft: '-18px',
-				lineHeight: 1,
-				backgroundColor: '#000',
-				color: '#fff',
-				fontSize: '11px',
-				padding: '7px 10px',
-				cursor: 'pointer'
-			});
-			this.imageEditter.attr('contenteditable', false);
-			this.imageEditter.on('click', $.proxy(function()
-			{
-				this.imageEdit($image);
-			}, this));
-			imageBox.append(this.imageEditter);
-
-			// resizer
-			var imageResizer = $('<span id="redactor-image-resizer" data-redactor="verified"></span>');
-			imageResizer.css({
-				position: 'absolute',
-				zIndex: 2,
-				lineHeight: 1,
-				cursor: 'nw-resize',
-				bottom: '-4px',
-				right: '-5px',
-				border: '1px solid #fff',
-				backgroundColor: '#000',
-				width: '8px',
-				height: '8px'
+					start_x = Math.round(e.pageX - $(this).eq(0).offset().left);
+					start_y = Math.round(e.pageY - $(this).eq(0).offset().top);
+				}
 			});
-			imageResizer.attr('contenteditable', false);
-			imageBox.append(imageResizer);
-
-			imageBox.append($image);
-
-			return imageResizer;
 		},
 		imageThumbClick: function(e)
 		{
@@ -5855,7 +5355,6 @@
 					+ '<input id="redactor_file_alt" class="redactor_input" />'
 					+ '<label>' + this.opts.curLang.link + '</label>'
 					+ '<input id="redactor_file_link" class="redactor_input" />'
-					+ '<label><input type="checkbox" id="redactor_link_blank"> ' + this.opts.curLang.link_new_tab + '</label>'
 					+ '<label>' + this.opts.curLang.image_position + '</label>'
 					+ '<select id="redactor_form_image_align">'
 						+ '<option value="none">' + this.opts.curLang.none + '</option>'
@@ -5864,8 +5363,8 @@
 					+ '</select>'
 				+ '</section>'
 				+ '<footer>'
-					+ '<button id="redactor_image_delete_btn" class="redactor_modal_btn">' + this.opts.curLang._delete + '</button>&nbsp;&nbsp;&nbsp;'
-					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
+					+ '<a href="#" id="redactor_image_delete_btn" class="redactor_modal_btn">' + this.opts.curLang._delete + '</a>&nbsp;&nbsp;&nbsp;'
+					+ '<a href="#" class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</a>'
 					+ '<input type="button" name="save" class="redactor_modal_btn" id="redactorSaveBtn" value="' + this.opts.curLang.save + '" />'
 				+ '</footer>',
 
@@ -5893,7 +5392,7 @@
 					+ '</div>'
 				+ '</section>'
 				+ '<footer>'
-					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
+					+ '<a href="#" class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</a>'
 					+ '<input type="button" name="upload" class="redactor_modal_btn" id="redactor_upload_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>',
 
@@ -5928,7 +5427,7 @@
 					+ '</form>'
 				+ '</section>'
 				+ '<footer>'
-					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
+					+ '<a href="#" class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</a>'
 					+ '<input type="button" class="redactor_modal_btn" id="redactor_insert_link_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>',
 
@@ -5940,7 +5439,7 @@
 					+ '<input type="text" size="5" value="3" id="redactor_table_columns" />'
 				+ '</section>'
 				+ '<footer>'
-					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
+					+ '<a href="#" class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</a>'
 					+ '<input type="button" name="upload" class="redactor_modal_btn" id="redactor_insert_table_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>',
 
@@ -5952,7 +5451,7 @@
 					+ '</form>'
 				+ '</section>'
 				+ '<footer>'
-					+ '<button class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</button>'
+					+ '<a href="javascript:void(null);" class="redactor_modal_btn redactor_btn_modal_close">' + this.opts.curLang.cancel + '</a>'
 					+ '<input type="button" class="redactor_modal_btn" id="redactor_insert_video_btn" value="' + this.opts.curLang.insert + '" />'
 				+ '</footer>'
 
@@ -6050,9 +5549,6 @@
 
 			$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.isMobile() === false)
 			{
 				$redactorModal.css({
@@ -6094,7 +5590,7 @@
 						minHeight: 'auto',
 						marginTop: '-' + (height + 10) / 2 + 'px'
 					});
-				}, 10);
+				}, 20 );
 			}
 
 		},
@@ -6123,9 +5619,6 @@
 
 				this.selectionRestore();
 
-				// restore scroll
-				if (this.opts.autoresize && this.saveModalScroll) $(this.document.body).scrollTop(this.saveModalScroll);
-
 			}, this));
 
 
@@ -6377,7 +5870,7 @@
 				}
 
 				var oldElement = this.uploadOptions.input;
-				var newElement = $(oldElement).clone();
+				var newElement = $( oldElement ).clone();
 
 				$(oldElement).attr('id', fileId).before(newElement).appendTo(this.form);
 
@@ -6486,36 +5979,28 @@
 
 				this.dropareabox.removeClass('hover').addClass('drop');
 
-				this.dragUploadAjax(this.draguploadOptions.url, e.dataTransfer.files[0], false);
+				//this.handleFileSelect(e);
+				this.draguploadUpload(e.dataTransfer.files[0]);
 
 			}, this );
 		},
-		dragUploadAjax: function(url, file, directupload, progress, e)
+		draguploadUpload: function(file)
 		{
+			var xhr = jQuery.ajaxSettings.xhr();
 
-
-			if (!directupload)
+			if (xhr.upload)
 			{
-				var xhr = $.ajaxSettings.xhr();
-				if (xhr.upload)
-				{
-					xhr.upload.addEventListener('progress', $.proxy(this.uploadProgress, this), false);
-				}
-
-				$.ajaxSetup({
-				  xhr: function () { return xhr; }
-				});
+				xhr.upload.addEventListener('progress', $.proxy(this.uploadProgress, this), false);
 			}
 
-			var fd = new FormData();
+			var provider = function () { return xhr; };
 
-			// append file data
-			fd.append('file', file);
+			var fd = new FormData();
 
 			// append hidden fields
-			if (this.opts.uploadFields !== false && typeof this.opts.uploadFields === 'object')
+			if (this.draguploadOptions.uploadFields !== false && typeof this.draguploadOptions.uploadFields === 'object')
 			{
-				$.each(this.opts.uploadFields, $.proxy(function(k, v)
+				$.each(this.draguploadOptions.uploadFields, $.proxy(function(k, v)
 				{
 					if (v != null && v.toString().indexOf('#') === 0) v = $(v).val();
 					fd.append(k, v);
@@ -6523,10 +6008,14 @@
 				}, this));
 			}
 
+			// append file data
+			fd.append('file', file);
+
 			$.ajax({
-				url: url,
+				url: this.draguploadOptions.url,
 				dataType: 'html',
 				data: fd,
+				xhr: provider,
 				cache: false,
 				contentType: false,
 				processData: false,
@@ -6538,46 +6027,19 @@
 
 					var json = $.parseJSON(data);
 
-					if (directupload)
+					if (typeof json.error == 'undefined')
 					{
-						progress.fadeOut('slow', function()
-						{
-							$(this).remove();
-						});
-
-					    var $img = $('<img>');
-						$img.attr('src', json.filelink).attr('id', 'drag-image-marker');
-
-						this.insertNodeToCaretPositionFromPoint(e, $img[0]);
-
-						var image = $(this.$editor.find('img#drag-image-marker'));
-						if (image.length) image.removeAttr('id');
-						else image = false;
-
-						this.sync();
-						this.observeImages();
-
-						// upload callback
-						if (image) this.callback('imageUpload', image, json);
-
-						// error callback
-						if (typeof json.error !== 'undefined') this.callback('imageUploadError', json);
+						this.draguploadOptions.success(json);
 					}
 					else
 					{
-						if (typeof json.error == 'undefined')
-						{
-							this.draguploadOptions.success(json);
-						}
-						else
-						{
-							this.draguploadOptions.error(this, json);
-							this.draguploadOptions.success(false);
-						}
+						this.draguploadOptions.error(this, json);
+						this.draguploadOptions.success(false);
 					}
 
 				}, this)
 			});
+
 		},
 		draguploadOndrag: function()
 		{
@@ -6618,8 +6080,7 @@
 		{
 			html = html.replace(/&#x200b;|<br>|<br\/>|&nbsp;/gi, '');
 			html = html.replace(/\s/g, '');
-			html = html.replace(/^<p>[^\W\w\D\d]*?<\/p>$/i, '');
-
+			html = html.replace(/^<p>[^\w\d]*?<\/p>$/i, '');
 
 			return html == '';
 		},
@@ -6685,7 +6146,6 @@
 			var text = $.trim($(current).text()).replace(/\n\r\n/g, '');
 
 			var len = text.length;
-
 			if (offset == len) return true;
 			else return false;
 		},
@@ -6724,13 +6184,10 @@
 	Redactor.prototype.init.prototype = Redactor.prototype;
 
 	// LINKIFY
-	$.Redactor.fn.formatLinkify = function(protocol, convertLinks, convertImageLinks, convertVideoLinks)
+	$.Redactor.fn.formatLinkify = function(protocol)
 	{
 		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+)($|\/)/;
+			url2 = /(^|&lt;|\s)(((https?|ftp):\/\/|mailto:).+?)(\s|&gt;|$)/g;
 
 		var childNodes = (this.$editor ? this.$editor.get(0) : this).childNodes, i = childNodes.length;
 		while (i--)
@@ -6739,55 +6196,23 @@
 			if (n.nodeType === 3)
 			{
 				var html = n.nodeValue;
-
-				// youtube & vimeo
-				if (convertVideoLinks && html)
+				if (html && (html.match(url1) || html.match(url2)))
 				{
-					var iframeStart = '<iframe width="500" height="281" src="',
-						iframeEnd = '" frameborder="0" allowfullscreen></iframe>';
-
-					if (html.match(urlYoutube))
-					{
-						html = html.replace(urlYoutube, iframeStart + '//www.youtube.com/embed/$2' + iframeEnd);
-						$(n).after(html).remove();
-					}
-					else if (html.match(urlVimeo))
-					{
-						html = html.replace(urlVimeo, iframeStart + '//player.vimeo.com/video/$2' + iframeEnd);
-						$(n).after(html).remove();
-					}
-				}
-
-				// image
-				if (convertImageLinks && html && html.match(urlImage))
-				{
-					html = html.replace(urlImage, '<img src="$1">');
-
-					$(n).after(html).remove();
-				}
-
-				// link
-				if (convertLinks && html && (html.match(url1) || html.match(url2)))
-				{
-					var href = (html.match(url1) || html.match(url2));
-					href = href[0];
-					if (href.length > 50) href = href.substring(0, 50) + '...';
-
 					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">$2</a>$3')
+					.replace(url2, '$1<a href="$2">$2</a>$5');
 
 					$(n).after(html).remove();
 				}
 			}
 			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);
 			}
 		}
 	};
 
+
 })(jQuery);