redactor-rails 0.1.1 → 0.2.0

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

@@ -1,4 +1,5 @@
-var RLANG = {
+var RELANG = {};
+RELANG['sq'] = {
 	html: 'HTML',
 	video: 'Video',
 	image: 'Fotografi',
@@ -6,7 +7,7 @@ var RLANG = {
 	link: 'Link',
 	link_insert: 'Lidh linq ...',
 	unlink: 'Hiq linkun',
-	styles: 'Stilet',
+	formatting: 'Stilet',
 	paragraph: 'Paragraf',
 	quote: 'Kuotë',
 	code: 'Kod',
@@ -14,16 +15,10 @@ var RLANG = {
 	header2: 'Header 2',
 	header3: 'Header 3',
 	header4: 'Header 4',
-	format: 'Formati',
 	bold:  'Te trasha / Bold',
 	italic: 'Kursive / Italic',
-	superscript: 'Superscript',
-	strikethrough: 'Strikethrough',
 	fontcolor: 'Ngjyra e shkronjave',
 	backcolor: 'Ngjyra e mbrapavisë së shkronjave',
-	removeformat: 'Fshije formatin',
-	cleanstyles: 'Pastro stilet',
-	lists: 'Listat',
 	unorderedlist: 'Liste pa renditje',
 	orderedlist: 'Liste me renditje',	
 	outdent: 'Outdent',
@@ -43,12 +38,11 @@ var RLANG = {
 	delete_column: 'Fshije kolonën',									
 	delete_row: 'Fshije rreshtin',									
 	delete_table: 'Fshije tabelën',
-	Rows: 'Rreshta',
-	Columns: 'Kolona',	
+	rows: 'Rreshta',
+	columns: 'Kolona',	
 	add_head: 'Shto titujt e tabelës',
 	delete_head: 'Fshije titujt e tabelës',	
 	title: 'Titulli',
-	image_view: 'Shiko fotografinë',
 	image_position: 'Pozita',
 	none: 'Normale',
 	left: 'Majtas',
@@ -71,6 +65,5 @@ var RLANG = {
 	horizontalrule: 'Vizë horizontale',
 	fullscreen: 'Pamje e plotë',
 	deleted: 'E fshirë',
-	none: 'None',
 	anchor: 'Anchor'
 };

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

@@ -1,4 +1,5 @@
-var RLANG = {
+var RELANG = {};
+RELANG['tr'] = {
 	html: 'HTML',
 	video: 'Video',
 	image: 'Görsel',
@@ -6,7 +7,7 @@ var RLANG = {
 	link: 'Bağlantı',
 	link_insert: 'Bağlantı Ekle ...',
 	unlink: 'Bağlantı Kaldır',
-	styles: 'Stiller',
+	formatting: 'Stiller',
 	paragraph: 'Paragraf',
 	quote: 'Alıntı',
 	code: 'Kod',
@@ -14,23 +15,14 @@ var RLANG = {
 	header2: 'Başlık 2',
 	header3: 'Başlık 3',
 	header4: 'Başlık 4',
-	format: 'Biçim',
 	bold:  'Kalın',
 	italic: 'Eğik',
-	superscript: 'Üst simge',
-	strikethrough: 'Üstü çizili',
 	fontcolor: 'Yazı rengi',
 	backcolor: 'Arkaplan rengi',
-	removeformat: 'Biçimi kaldır',
-	cleanstyles: 'Stilleri temizle',
-	lists: 'Listeler',
 	unorderedlist: 'Sırasız liste',
 	orderedlist: 'Sıralı liste',	
 	outdent: 'Girintiyi azalt',
 	indent: 'Girintiyi artır',
-	redo: 'Yeniden yap',
-	undo: 'Geri al',
-	cut: 'Kes',
 	cancel: 'İptal',	
 	insert: 'Ekle',
 	save: 'Kaydet',	
@@ -43,12 +35,11 @@ var RLANG = {
 	delete_column: 'Sütun sil',									
 	delete_row: 'Satır sil',									
 	delete_table: 'Tablo sil',
-	Rows: 'Satırlar',
-	Columns: 'Sütunlar',	
+	rows: 'Satırlar',
+	columns: 'Sütunlar',	
 	add_head: 'Başlık ekle',
 	delete_head: 'Başlık sil',	
 	title: 'Başlık',
-	image_view: 'Görseli göster',
 	image_position: 'Pozisyon',
 	none: 'hiçbiri',
 	left: 'sol',
@@ -71,6 +62,5 @@ var RLANG = {
 	horizontalrule: 'Yatay çizgi',
 	fullscreen: 'Tam ekran',
 	deleted: 'Silindi',
-	none: 'Hiçbiri',
 	anchor: 'Çapa'
 };

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

@@ -1,4 +1,5 @@
-var RLANG = {
+var RELANG = {};
+RELANG['ua'] = {
 	html: 'Код',
 	video: 'Відео',
 	image: 'Зображення',
@@ -6,7 +7,7 @@ var RLANG = {
 	link: 'Посилання',
 	link_insert: 'Вставити посилання ...',
 	unlink: 'Видалити посилання',
-	styles: 'Стилі',
+	formatting: 'Стилі',
 	paragraph: 'Звичайний текст',
 	quote: 'Цитата',
 	code: 'Код',
@@ -14,23 +15,14 @@ var RLANG = {
 	header2: 'Заголовок 2',
 	header3: 'Заголовок 3',
 	header4: 'Заголовок 4',		
-	format: 'Формат',
 	bold:  'Жирний',
 	italic: 'Похилий',
-	superscript: 'Надрядковий',
-	strikethrough: 'Закреслений',
 	fontcolor: 'Колір тексту',
 	backcolor: 'Заливка тексту',
-	removeformat: 'Видалити формат',
-	cleanstyles: 'Видалити стилі MS Word',
-	lists: 'Списки',
 	unorderedlist: 'Звичайний список',
 	orderedlist: 'Нумерований список',	
 	outdent: 'Зменшити відступ',
 	indent: 'Збільшити відступ',
-	redo: 'Повтор',
-	undo: 'Скасування',
-	cut: 'Кат / Врізка',
 	cancel: 'Скасувати',	
 	insert: 'Вставити',
 	save: 'Зберегти',	
@@ -43,8 +35,8 @@ var RLANG = {
 	delete_column: 'Видалити стовпець',									
 	delete_row: 'Видалити рядок',									
 	delete_table: 'Видалити таблицю',
-	Rows: 'Рядки',
-	Columns: 'Стовпці',	
+	rows: 'Рядки',
+	columns: 'Стовпці',	
 	add_head: 'Додати заголовок',
 	delete_head: 'Видалити заголовок',	
 	title: 'Підказка',
@@ -71,5 +63,5 @@ var RLANG = {
 	horizontalrule: 'Горизонтальная линейка',
 	fullscreen: 'Во весь экран',
 	deleted: 'Зачеркнутый',
-	none: 'Нет'							
+    anchor: 'Anchor'					
 };

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

@@ -1,5 +1,6 @@
 //@chen1706@gmail.com
-var RLANG = {
+var RELANG = {};
+RELANG['zh_cn'] = {
 	html: 'HTML代码',
 	video: '视频',
 	image: '图片',
@@ -7,7 +8,7 @@ var RLANG = {
 	link: '链接',
 	link_insert: '插入链接',
 	unlink: '取消链接',
-	styles: '样式',
+	formatting: '样式',
 	paragraph: '段落',
 	quote: '引用',
 	code: '代码',
@@ -15,23 +16,14 @@ var RLANG = {
 	header2: '二级标题',
 	header3: '三级标题',
 	header4: '四级标题',
-	format: '格式',
 	bold:  '粗体',
 	italic: '斜体',
-	superscript: '上标',
-	strikethrough: '删除线',
 	fontcolor: '字体颜色',
 	backcolor: '背景颜色',
-	removeformat: '取消格式',
-	cleanstyles: '清除样式',
-	lists: '目录',
 	unorderedlist: '项目编号',
 	orderedlist: '数字编号',	
 	outdent: '减少缩进',
 	indent: '增加缩进',
-	redo: '重做',
-	undo: '撤销',
-	cut: '剪切',
 	cancel: '取消',	
 	insert: '插入',
 	save: '保存',	
@@ -44,12 +36,11 @@ var RLANG = {
 	delete_column: '删除整列',									
 	delete_row: '删除整行',									
 	delete_table: '删除表格',
-	Rows: '行',
-	Columns: '列',	
+	rows: '行',
+	columns: '列',	
 	add_head: '添加标题',
 	delete_head: '删除标题',	
 	title: '标题',
-	image_view: '查看图片',
 	image_position: '位置',
 	none: '无',
 	left: '左',
@@ -72,6 +63,5 @@ var RLANG = {
 	horizontalrule: '水平线',
 	fullscreen: '全屏',
 	deleted: '删除',
-	none: '无',
 	anchor: '锚点'
 };

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

@@ -1,4 +1,5 @@
-var RLANG = {
+var RLANG = {};
+RELANG['zh_tw'] = {
 	html: '原始碼',
 	video: '影片',
 	image: '圖片',
@@ -6,7 +7,7 @@ var RLANG = {
 	link: '超連結',
 	link_insert: '插入超連結',
 	unlink: '取消超連結',
-	styles: '樣式',
+	formatting: '樣式',
 	paragraph: '段落',
 	quote: '引用',
 	code: '程式碼',
@@ -14,41 +15,31 @@ var RLANG = {
 	header2: '標題 2',
 	header3: '標題 3',
 	header4: '標題 4',
-	format: '格式',
-	bold:  '粗體',
+	bold: '粗體',
 	italic: '斜體',
-	superscript: '上標',
-	strikethrough: '刪除線',
 	fontcolor: '字體顏色',
 	backcolor: '背景顏色',
-	removeformat: '取消格式',
-	cleanstyles: '清除樣式',
-	lists: '列表',
 	unorderedlist: '項號編號',
-	orderedlist: '數字編號',	
+	orderedlist: '數字編號',
 	outdent: '減少縮排',
 	indent: '增加縮排',
-	redo: '取消復原',
-	undo: '復原',
-	cut: '剪下',
-	cancel: '取消',	
+	cancel: '取消',
 	insert: '貼上',
-	save: '儲存',	
+	save: '儲存',
 	_delete: '刪除',
-	insert_table: '插入表格',		
+	insert_table: '插入表格',
 	insert_row_above: '從上方插入',
 	insert_row_below: '從下方插入',
 	insert_column_left: '從左側插入',
-	insert_column_right: '從右側插入',									
-	delete_column: '刪除整列',									
-	delete_row: '刪除整行',									
+	insert_column_right: '從右側插入',
+	delete_column: '刪除整列',
+	delete_row: '刪除整行',
 	delete_table: '刪除表格',
-	Rows: '行',
-	Columns: '列',	
+	rows: '行',
+	columns: '列',
 	add_head: '新增標題',
-	delete_head: '刪除標題',	
+	delete_head: '刪除標題',
 	title: '標題',
-	image_view: '圖片內容',
 	image_position: '位置',
 	none: '無',
 	left: '左',
@@ -58,19 +49,18 @@ var RLANG = {
 	mailto: '電子郵件信箱',
 	web: '網址',
 	video_html_code: '影片嵌入程式碼',
-	file: '檔案',	
+	file: '檔案',
 	upload: '上傳',
 	download: '下載',
 	choose: '選擇',
 	or_choose: '或選擇',
 	drop_file_here: '把檔案拖曳到這邊',
-	align_left:	'靠左對齊',	
+	align_left:	'靠左對齊',
 	align_center: '文字置中',
 	align_right: '靠右對齊',
 	align_justify: '左右對齊',
 	horizontalrule: '水平線',
 	fullscreen: '全螢幕',
 	deleted: '刪除線',
-	none: '無',
 	anchor: '錨點'
 };

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

@@ -1,28 +1,105 @@
 /*
-	Redactor v7.6.3
-	Updated 31.05.2012
+	Redactor v7.7.0
+	Updated 27.06.2012
 	
 	http://redactorjs.com/
-		
+	
 	Copyright (c) 2009-2012, Imperavi Ltd.
-	Licensed under Creative Commons Attribution-NonCommercial 3.0 license. 
+	License: http://redactorjs.com/license/
 	
-	Usage: $('#content').redactor();	
+	Usage: $('#content').redactor();
 */
 
-var RTOOLBAR = {};
+if (typeof RELANG === 'undefined')
+{
+	var RELANG = {};
+}
+
+var RLANG = {
+	html: 'HTML',
+	video: 'Insert Video...',
+	image: 'Insert Image...',
+	table: 'Table',
+	link: 'Link',
+	link_insert: 'Insert Link ...',
+	unlink: 'Unlink',
+	formatting: 'Formatting',
+	paragraph: 'Paragraph',
+	quote: 'Quote',
+	code: 'Code',
+	header1: 'Header 1',
+	header2: 'Header 2',
+	header3: 'Header 3',
+	header4: 'Header 4',
+	bold:  'Bold',
+	italic: 'Italic',
+	fontcolor: 'Font Color',
+	backcolor: 'Back Color',
+	unorderedlist: 'Unordered List',
+	orderedlist: 'Ordered List',
+	outdent: 'Outdent',
+	indent: 'Indent',
+	cancel: 'Cancel',
+	insert: 'Insert',
+	save: 'Save',
+	_delete: 'Delete',
+	insert_table: 'Insert Table...',
+	insert_row_above: 'Add Row Above',
+	insert_row_below: 'Add Row Below',
+	insert_column_left: 'Add Column Left',
+	insert_column_right: 'Add Column Right',
+	delete_column: 'Delete Column',
+	delete_row: 'Delete Row',
+	delete_table: 'Delete Table',
+	rows: 'Rows',
+	columns: 'Columns',	
+	add_head: 'Add Head',
+	delete_head: 'Delete Head',	
+	title: 'Title',
+	image_position: 'Position',
+	none: 'None',
+	left: 'Left',
+	right: 'Right',
+	image_web_link: 'Image Web Link',
+	text: 'Text',
+	mailto: 'Email',
+	web: 'URL',
+	video_html_code: 'Video Embed Code',
+	file: 'Insert File...',	
+	upload: 'Upload',
+	download: 'Download',
+	choose: 'Choose',
+	or_choose: 'Or choose',
+	drop_file_here: 'Drop file here',
+	align_left:	'Align Left',	
+	align_center: 'Align Center',
+	align_right: 'Align Right',
+	align_justify: 'Justify',
+	horizontalrule: 'Insert Horizontal Rule',
+	fullscreen: 'Fullscreen',
+	deleted: 'Deleted',
+	anchor: 'Anchor'
+};
+
+
+
 
 (function($){
 	
+	"use strict";
+	
 	// Plugin
 	jQuery.fn.redactor = function(option)
 	{
 		return this.each(function() 
 		{
-			var $this = $(this);
+			var $obj = $(this);
 			
-			var data = $this.data('redactor');
-			if (!data) $this.data('redactor', (data = new Redactor(this, option)));
+			var data = $obj.data('redactor');
+			if (!data) 
+			{
+				$obj.data('redactor', (data = new Redactor(this, option)));
+			}
 		});
 	};
 	
@@ -32,28 +109,38 @@ var RTOOLBAR = {};
 	{
 		// Element
 		this.$el = $(element);
+		
+		// Lang
+		if (typeof options !== 'undefined' && typeof options.lang !== 'undefined' && options.lang !== 'en' && typeof RELANG[options.lang] !== 'undefined') 
+		{
+			RLANG = RELANG[options.lang];
+		}		
 	
 		// Options
 		this.opts = $.extend({
 	
 			lang: 'en',
-			toolbar: 'default',
+			direction: 'ltr', // ltr or rtl
 
-			load: true,
+			callback: false, // function
+			keyupCallback: false, // function
+			keydownCallback: false, // function
+			execCommandCallback: false, // function
 		
 			path: false,
 			css: 'style.css',
-			focus: true,
+			focus: false,
 			resize: true,
 			autoresize: false,
 			fixed: false,
 	
 			autoformat: true,
 			cleanUp: true,
-			convertDivs: true,
-			removeClasses: true,
 			removeStyles: false,
+			removeClasses: false,
+			convertDivs: true,
 			convertLinks: true,
+			xhtml: false,
 			
 			handler: false, // false or url
 			
@@ -63,25 +150,376 @@ var RTOOLBAR = {};
 			imageGetJson: false, // url (ex. /folder/images.json ) or false
 
 			imageUpload: false, // url
-			linkFileUpload: false, // url
+			imageUploadCallback: false, // function
+			
 			fileUpload: false, // url
+			fileUploadCallback: false, // function
 
 			visual: true,
 			fullscreen: false,
 			overlay: true, // modal overlay
-
-			colors: Array(
+			
+			buttonsCustom: {},
+			buttonsAdd: [],
+			buttons: ['html', '|', 'formatting', '|', 'bold', 'italic', 'deleted', '|', 'unorderedlist', 'orderedlist', 'outdent', 'indent', '|',
+					'image', 'video', 'file', 'table', 'link', '|',
+					'fontcolor', 'backcolor', '|', 'alignleft', 'aligncenter', 'alignright', 'justify', '|',
+					'horizontalrule', 'fullscreen'],
+
+			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'),
+				'#7f7f7f', '#0c0c0c', '#1d1b10', '#0f243e', '#244061', '#632423', '#4f6128', '#3f3151', '#31859b', '#974806', '#7f6000'],
 
 			// private
 			allEmptyHtml: '<p><br /></p>',
-			mozillaEmptyHtml: '<p>&nbsp;</p>'
-
+			mozillaEmptyHtml: '<p>&nbsp;</p>',
+						
+			// modal windows container
+			modal_file: String() + 
+				'<form id="redactorUploadFileForm" method="post" action="" enctype="multipart/form-data">' +
+					'<label>Name (optional)</label>' +
+					'<input type="text" id="redactor_filename" class="redactor_input" />' +
+					'<div style="margin-top: 7px;">' +
+						'<input type="file" id="redactor_file" name="file" />' +
+					'</div>' +
+				'</form>',
+
+			modal_image_edit: String() + 
+				'<label>' + RLANG.title + '</label>' +
+				'<input id="redactor_file_alt" class="redactor_input" />' +
+				'<label>' + RLANG.link + '</label>' +
+				'<input id="redactor_file_link" class="redactor_input" />' +
+				'<label>' + RLANG.image_position + '</label>' +
+				'<select id="redactor_form_image_align">' +
+					'<option value="none">' + RLANG.none + '</option>' +
+					'<option value="left">' + RLANG.left + '</option>' +
+					'<option value="right">' + RLANG.right + '</option>' +
+				'</select>' +
+				'<div id="redactor_modal_footer">' +
+					'<a href="javascript:void(null);" id="redactor_image_delete_btn" style="color: #000;">' + RLANG._delete + '</a>' +
+					'<span class="redactor_btns_box">' +
+						'<input type="button" name="save" id="redactorSaveBtn" value="' + RLANG.save + '" />' +
+						'<a href="javascript:void(null);" id="redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
+					'</span>' +
+				'</div>',
+
+			modal_image: String() + 
+				'<div id="redactor_tabs">' +
+					'<a href="javascript:void(null);" class="redactor_tabs_act">' + RLANG.upload + '</a>' +
+					'<a href="javascript:void(null);">' + RLANG.choose + '</a>' +
+					'<a href="javascript:void(null);">' + RLANG.link + '</a>' +
+				'</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" />' +
+					'</div>' +
+					'<div id="redactor_tab2" class="redactor_tab" style="display: none;">' +
+						'<div id="redactor_image_box"></div>' +
+					'</div>' +
+				'</form>' +
+				'<div id="redactor_tab3" class="redactor_tab" style="display: none;">' +
+					'<label>' + RLANG.image_web_link + '</label>' +
+					'<input name="redactor_file_link" id="redactor_file_link" class="redactor_input"  />' +
+				'</div>' +
+				'<div id="redactor_modal_footer">' +
+					'<span class="redactor_btns_box">' +
+						'<input type="button" name="upload" id="redactor_upload_btn" value="' + RLANG.insert + '" />' +
+						'<a href="javascript:void(null);" id="redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
+					'</span>' +
+				'</div>',
+
+			modal_link: String() + 
+				'<form id="redactorInsertLinkForm" method="post" action="">' +
+					'<div id="redactor_tabs">' +
+						'<a href="javascript:void(null);" class="redactor_tabs_act">URL</a>' +
+						'<a href="javascript:void(null);">Email</a>' +
+						'<a href="javascript:void(null);">' + RLANG.anchor + '</a>' +
+					'</div>' +
+					'<input type="hidden" id="redactor_tab_selected" value="1" />' +
+					'<div class="redactor_tab" id="redactor_tab1">' +
+						'<label>URL</label><input id="redactor_link_url" class="redactor_input"  />' +
+						'<label>' + RLANG.text + '</label><input class="redactor_input redactor_link_text" id="redactor_link_url_text" />' +
+					'</div>' +
+					'<div class="redactor_tab" id="redactor_tab2" style="display: none;">' +
+						'<label>Email</label><input id="redactor_link_mailto" class="redactor_input" />' +
+						'<label>' + RLANG.text + '</label><input class="redactor_input redactor_link_text" id="redactor_link_mailto_text" />' +
+					'</div>' +
+					'<div class="redactor_tab" id="redactor_tab3" style="display: none;">' +
+						'<label>' + RLANG.anchor + '</label><input class="redactor_input" id="redactor_link_anchor"  />' +
+						'<label>' + RLANG.text + '</label><input class="redactor_input redactor_link_text" id="redactor_link_anchor_text" />' +
+					'</div>' +
+				'</form>' +
+				'<div id="redactor_modal_footer">' +
+					'<span class="redactor_btns_box">' +
+						'<input type="button" id="redactor_insert_link_btn" value="' + RLANG.insert + '" />' +
+						'<a href="javascript:void(null);" id="redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
+					'</span>' +
+				'</div>',
+			
+			modal_table: String() + 
+					'<label>' + RLANG.rows + '</label>' +
+					'<input size="5" value="2" id="redactor_table_rows" />' +
+					'<label>' + RLANG.columns + '</label>' +
+					'<input size="5" value="3" id="redactor_table_columns" />' +
+					'<div id="redactor_modal_footer">' +
+						'<span class="redactor_btns_box">' +
+							'<input type="button" name="upload" id="redactor_insert_table_btn" value="' + RLANG.insert + '" />' +
+							'<a href="javascript:void(null);" id="redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
+						'</span>' +
+					'</div>',
+			
+			modal_video: String() + 
+				'<form id="redactorInsertVideoForm">' +
+					'<label>' + RLANG.video_html_code + '</label>' +
+					'<textarea id="redactor_insert_video_area" style="width: 99%; height: 160px;"></textarea>' +
+				'</form>' +
+				'<div id="redactor_modal_footer">' +
+					'<span class="redactor_btns_box">' +
+						'<input type="button" id="redactor_insert_video_btn" value="' + RLANG.insert + '" />' +
+						'<a href="javascript:void(null);" id="redactor_btn_modal_close">' + RLANG.cancel + '</a>' +
+					'</span>' +
+				'</div>',
+
+
+			toolbar: {
+				html:
+				{
+					title: RLANG.html,
+					func: 'toggle'
+				},
+				formatting:
+				{
+					title: RLANG.formatting,
+					func: 'show',
+					dropdown: 
+					{
+						p:
+						{
+							title: RLANG.paragraph,
+							exec: 'formatblock'
+						},
+						blockquote:
+						{
+							title: RLANG.quote,
+							exec: 'formatblock',	
+							className: 'redactor_format_blockquote'
+						},
+						pre:
+						{
+							title: RLANG.code,
+							exec: 'formatblock',
+							className: 'redactor_format_pre'
+						},
+						h1:
+						{
+							title: RLANG.header1,
+							exec: 'formatblock',
+							className: 'redactor_format_h1'
+						},
+						h2:
+						{
+							title: RLANG.header2,
+							exec: 'formatblock',
+							className: 'redactor_format_h2'
+						},
+						h3:
+						{
+							title: RLANG.header3,
+							exec: 'formatblock',
+							className: 'redactor_format_h3'
+						},
+						h4:
+						{
+							title: RLANG.header4,
+							exec: 'formatblock',
+							className: 'redactor_format_h4'
+						}
+					}
+				},
+				bold:
+				{ 
+					title: RLANG.bold,
+					exec: 'bold'	
+				}, 
+				italic:
+				{
+					title: RLANG.italic,
+					exec: 'italic'
+				},
+				deleted:
+				{
+					title: RLANG.deleted,
+					exec: 'strikethrough'
+				},	
+				unorderedlist:
+				{
+					title: '&bull; ' + RLANG.unorderedlist,
+					exec: 'insertunorderedlist'
+				},
+				orderedlist:
+				{
+					title: '1. ' + RLANG.orderedlist,
+					exec: 'insertorderedlist'
+				},
+				outdent:
+				{
+					title: '< ' + RLANG.outdent,
+					exec: 'outdent'	
+				},
+				indent:
+				{
+					title: '> ' + RLANG.indent,
+					exec: 'indent'
+				},
+				image:
+				{
+					title: RLANG.image,
+					func: 'showImage'
+				},
+				video:
+				{
+					title: RLANG.video,
+					func: 'showVideo'
+				},
+				file:
+				{
+					title: RLANG.file,
+					func: 'showFile'
+				},	
+				table:
+				{ 
+					title: RLANG.table,
+					func: 'show',
+					dropdown:
+					{
+						insert_table:	
+						{
+							title: RLANG.insert_table,
+							func: 'showTable'
+						},
+						separator_drop1:
+						{
+							name: 'separator'
+						},
+						insert_row_above:
+						{
+							title: RLANG.insert_row_above,
+							func: 'insertRowAbove'
+						},
+						insert_row_below:
+						{
+							title: RLANG.insert_row_below,
+							func: 'insertRowBelow'
+						},
+						insert_column_left:
+						{
+							title: RLANG.insert_column_left,
+							func: 'insertColumnLeft'
+						},
+						insert_column_right:
+						{
+							title: RLANG.insert_column_right,
+							func: 'insertColumnRight'
+						},
+						separator_drop2:
+						{
+							name: 'separator'
+						},
+						add_head:
+						{
+							title: RLANG.add_head,
+							func: 'addHead'
+						},
+						delete_head:
+						{
+							title: RLANG.delete_head,
+							func: 'deleteHead'
+						},
+						separator_drop3:
+						{
+							name: 'separator'
+						},
+						delete_column:
+						{
+							title: RLANG.delete_column,
+							func: 'deleteColumn'
+						},
+						delete_row:
+						{
+							title: RLANG.delete_row,
+							func: 'deleteRow'
+						},
+						delete_table:
+						{
+							title: RLANG.delete_table,
+							func: 'deleteTable'
+						}
+					}
+				},
+				link:
+				{ 
+					title: RLANG.link,
+					func: 'show',
+					dropdown:
+					{
+						link:
+						{
+							title: RLANG.link_insert,
+							func: 'showLink'
+						},
+						unlink: 
+						{
+							title: RLANG.unlink,
+							exec: 'unlink'
+						}
+					}
+				},
+				fontcolor:
+				{
+					title: RLANG.fontcolor,
+					func: 'show'
+				},	
+				backcolor:
+				{
+					title: RLANG.backcolor,
+					func: 'show'	
+				},
+				alignleft:
+				{	
+					exec: 'JustifyLeft',
+					title: RLANG.align_left
+				},					
+				aligncenter:
+				{
+					exec: 'JustifyCenter',
+					title: RLANG.align_center
+				},
+				alignright: 
+				{
+					exec: 'JustifyRight',
+					title: RLANG.align_right
+				},	
+				justify: 
+				{
+					exec: 'justifyfull',
+					title: RLANG.align_justify
+				},	
+				horizontalrule: 
+				{
+					exec: 'inserthorizontalrule',
+					title: RLANG.horizontalrule
+				},		
+				fullscreen:
+				{
+					title: RLANG.fullscreen,
+					func: 'fullscreen'
+				}	
+			}
+			
 
 		}, options, this.$el.data());
 	
@@ -94,70 +532,22 @@ var RTOOLBAR = {};
 	// Functionality
 	Redactor.prototype = {
 
-		// DYNAMICALLY LOAD
-		_loadFile: function(file, array)
-		{
-			var item = array[0];
-			array.splice(0, 1);
-
-			var callback;
-			if (typeof(item) == 'function') callback = item;
-			else callback = $.proxy(function() { this._loadFile(item, array); }, this);
-		
-			this.dynamicallyLoad(file, callback);
-		},
-		loadFiles: function(array)
-		{
-			var item = array[0];
-			array.splice(0, 1);
-
-			this._loadFile(item, array);
-		},
-		dynamicallyLoad: function (url, callback)
-		{
-			var head = document.getElementsByTagName("head")[0];
-			var script = document.createElement("script");
-			script.src = url;
-
-			var done = false;
-
-			script.onload = script.onreadystatechange = function()
-			{
-				if (!done && (!this.readyState || this.readyState == "loaded" || this.readyState == "complete"))
-				{
-					done = true;
-					if (callback) callback();
-					script.onload = script.onreadystatechange = null;
-				}
-			};
-			
-			head.appendChild(script);
-
-		},
 
 		// Initialization
 		init: function()
 		{
 			// get path to styles
 			this.getPath();
-
-			if (this.opts.load)
+			
+			if (this.opts.toolbar !== false)
 			{
-				// load files
-				var files = [];
-
-				files.push(this.opts.path + '/langs/' + this.opts.lang + '.js');
-				if (this.opts.toolbar !== false) files.push(this.opts.path + '/toolbars/' + this.opts.toolbar + '.js');
-				files.push($.proxy(this.start, this));
-
-				this.loadFiles(files);
+				$.extend(this.opts.toolbar, this.opts.buttonsCustom);
+			
+				$.each(this.opts.buttonsAdd, $.proxy(function(i,s)
+				{
+					this.opts.buttons.push(s);
+				}, this));
 			}
-			else this.start();
-
-
-		},
-		start: function()
-		{
 
 			// get dimensions
 			this.height = this.$el.css('height');
@@ -171,56 +561,59 @@ var RTOOLBAR = {};
 
 			// preformatter
 			html = this.preformater(html);
-			
-			// conver newlines to p
-			if (this.opts.autoformat) html = this.paragraphy(html);
 
 			// enable
 			this.$editor = this.enable(html);
 
 			// focus always on page
-			$(this.doc).click($.proxy(function(e) { this.$editor.focus(); }, this));
+			this.observeFocus();
 	
 			// cleanup
-			$(this.doc).bind('paste', $.proxy(function(e)
-			{ 
-				setTimeout($.proxy(function ()
-				{
-					var node = $('<span id="pastemarkerend">&nbsp;</span>');
-					this.insertNodeAtCaret(node.get(0));
-	
-					this.pasteCleanUp();
-	
-				}, this), 200);
-				
-
-
-			}, this));
-
-			// keypress
-			$(this.doc).keypress($.proxy(function(e)
+			if (this.opts.cleanUp === true)
 			{
-				var key = e.keyCode || e.which;
-
-				// safari shift key + enter
-				if (navigator.userAgent.indexOf('AppleWebKit') != -1) return this.safariShiftKeyEnter(e, key);
-
-			}, this))
+				$(this.doc).bind('paste', $.proxy(function(e)
+				{ 
+					setTimeout($.proxy(function ()
+					{
+						var marker = Math.floor(Math.random() * 99999);
+						var marker_text = '';
+						if ($.browser.mozilla) marker_text = '&nbsp;';
+						var node = $('<span rel="pastemarkerend" id="pastemarkerend' + marker + '">' + marker_text + '</span>');
+						this.insertNodeAtCaret(node.get(0));
+						
+						this.pasteCleanUp(marker);
+		
+					}, this), 100);
+	
+				}, this));
+			}
 
 			// keyup
-			.keyup($.proxy(function(e)
+			$(this.doc).keyup($.proxy(function(e)
 			{
 				var key = e.keyCode || e.which;
 				
+				// callback as you type
+				if (typeof this.opts.keyupCallback === 'function')
+				{
+					this.opts.keyupCallback(this, e);
+				}
+				
 				if (this.opts.autoformat)
 				{
 					// if empty
-					if (key == 8 || key == 46) return this.formatEmpty(e);
+					if (key === 8 || key === 46)
+					{
+						return this.formatEmpty(e);
+					}
 
 					// new line p
-					if (key == 13 && !e.shiftKey && !e.ctrlKey && !e.metaKey) return this.formatNewLine(e);
+					if (key === 13 && !e.shiftKey && !e.ctrlKey && !e.metaKey)
+					{
+						return this.formatNewLine(e);
+					}
 				}
-				//console.log(e);
+
 				this.syncCode();
 
 			}, this));
@@ -229,8 +622,14 @@ var RTOOLBAR = {};
 			this.buildToolbar();
 			
 			// resizer
-			if (this.opts.autoresize === false) this.buildResizer();
-			else this.observeAutoResize();
+			if (this.opts.autoresize === false) 
+			{
+				this.buildResizer();
+			}
+			else
+			{
+				this.observeAutoResize();
+			}
 
 			// shortcuts
 			this.shortcuts();
@@ -240,6 +639,7 @@ var RTOOLBAR = {};
 
 			// observers
 			this.observeImages();
+			this.observeTables();
 	
 			// fullscreen on start
 			if (this.opts.fullscreen) 
@@ -249,7 +649,10 @@ var RTOOLBAR = {};
 			}
 				
 			// focus
-			if (this.opts.focus) this.focus();
+			if (this.opts.focus) 
+			{
+				this.focus();
+			}
 
 			// fixed
 			if (this.opts.fixed)
@@ -257,6 +660,13 @@ var RTOOLBAR = {};
 				this.observeScroll();
 				$(document).scroll($.proxy(this.observeScroll, this));
 			}
+			
+			// callback
+			if (typeof this.opts.callback === 'function')
+			{
+				this.opts.callback(this);
+			}
+			
 		},
 		shortcuts: function()
 		{
@@ -264,40 +674,95 @@ var RTOOLBAR = {};
 			{
 				var key = e.keyCode || e.which;
 	
+				// callback keydown
+				if (typeof this.opts.keydownCallback === 'function') 
+				{
+					this.opts.keydownCallback(this, e);	
+				}
+	
 				if (e.ctrlKey) 
 				{
-					if (key == 90) this._shortcuts(e, 'undo'); // Ctrl + z
-					else if (key == 90 && e.shiftKey) this._shortcuts(e, 'redo');	// Ctrl + Shift + z
-					else if (key == 77) this._shortcuts(e, 'removeFormat'); // Ctrl + m
-					else if (key == 66) this._shortcuts(e, 'bold'); // Ctrl + b
-					else if (key == 73) this._shortcuts(e, 'italic'); // Ctrl + i
-					else if (key == 74) this._shortcuts(e, 'insertunorderedlist'); // Ctrl + j
-					else if (key == 75) this._shortcuts(e, 'insertorderedlist'); // Ctrl + k
-					else if (key == 76) this._shortcuts(e, 'superscript'); // Ctrl + l
+					if (key === 90)
+					{
+						this._shortcuts(e, 'undo'); // Ctrl + z
+					}
+					else if (key === 90 && e.shiftKey)
+					{
+						this._shortcuts(e, 'redo');	// Ctrl + Shift + z
+					}
+					else if (key === 77)
+					{
+						this._shortcuts(e, 'removeFormat'); // Ctrl + m
+					}
+					else if (key === 66)
+					{
+						this._shortcuts(e, 'bold'); // Ctrl + b
+					}
+					else if (key === 73)
+					{
+						this._shortcuts(e, 'italic'); // Ctrl + i
+					}
+					else if (key === 74) 
+					{
+						this._shortcuts(e, 'insertunorderedlist'); // Ctrl + j
+					}
+					else if (key === 75)
+					{
+						this._shortcuts(e, 'insertorderedlist'); // Ctrl + k
+					}
+					else if (key === 76)
+					{
+						this._shortcuts(e, 'superscript'); // Ctrl + l
+					}
+					else if (key === 72)
+					{
+						this._shortcuts(e, 'subscript'); // Ctrl + h
+					}					
 				}
 	
-				if (!e.shiftKey && key == 9) this._shortcuts(e, 'indent'); // Tab
-				else if (e.shiftKey && key == 9 ) this._shortcuts(e, 'outdent'); // Shift + tab
+				if (!e.shiftKey && key === 9)
+				{
+					this._shortcuts(e, 'indent'); // Tab
+				}
+				else if (e.shiftKey && key === 9 )
+				{
+					this._shortcuts(e, 'outdent'); // Shift + tab
+				}
+
+				// safari shift key + enter
+				if ($.browser.webkit && navigator.userAgent.indexOf('Chrome') === -1)
+				{
+					return this.safariShiftKeyEnter(e, key);
+				}
 
 			}, this));
 
 		},
 		_shortcuts: function(e, cmd)
 		{
-			if (e.preventDefault) e.preventDefault();
+			if (e.preventDefault) 
+			{
+				e.preventDefault();
+			}
 			this.execCommand(cmd, null);
 		},
 		getPath: function()
 		{
-			if (this.opts.path !== false) return this.opts.path;
+			if (this.opts.path !== false) 
+			{
+				return this.opts.path;
+			}
 
 			$('script').each($.proxy(function(i,s)
 			{
 				if (s.src)
 				{
-					// Match redactor.js or redactor.min.js, followed by an optional querystring (often used for cache purposes) 
+					// Match redactor.js or redactor.min.js, followed by an optional querystring (often used for cache purposes)
 					var regexp = new RegExp(/\/redactor(\.min)?\.js(\?.*)?/);
-					if (s.src.match(regexp)) this.opts.path = s.src.replace(regexp, '');
+					if (s.src.match(regexp))
+					{
+						this.opts.path = s.src.replace(regexp, '');
+					}
 				}
 			}, this));
 
@@ -330,26 +795,45 @@ var RTOOLBAR = {};
 			if (this.doc !== null)
 			{
 				this.write(this.setDoc(html));
-				if ($.browser.mozilla) this.doc.execCommand("useCSS", false, true);
+				if ($.browser.mozilla)
+				{
+					this.doc.execCommand("useCSS", false, true);
+				}
 				return $(this.doc).find('#page');
 			}
-			else return false;
+			else
+			{
+				return false;
+			}
 		},
 		setDoc: function(html)
 		{
-			var frameHtml = '<!DOCTYPE html>\n';
-			frameHtml += '<html><head><link media="all" type="text/css" href="' + this.opts.path + '/css/' + this.opts.css + '" rel="stylesheet"></head>';
-			frameHtml += '<body><div id="page" contenteditable="true">';
-			frameHtml += html;
-			frameHtml += '</div></body></html>';
+			var frameHtml = '<!DOCTYPE html>\n' +
+			'<html><head><link media="all" type="text/css" href="' + this.opts.path + '/css/' + this.opts.css + '" rel="stylesheet"></head>' +
+			'<body><div id="page" contenteditable="true" dir="' + this.opts.direction + '">' +
+			html + 
+			'</div></body></html>';
+			
 			return frameHtml;
 		},		
 		getDoc: function(frame)
 		{
-			if (frame.contentDocument) return frame.contentDocument;
-			else if (frame.contentWindow && frame.contentWindow.document) return frame.contentWindow.document;
-			else if (frame.document) return frame.document;
-			else return null;
+			if (frame.contentDocument)
+			{
+				return frame.contentDocument;
+			}
+			else if (frame.contentWindow && frame.contentWindow.document)
+			{
+				return frame.contentWindow.document;
+			}
+			else if (frame.document)
+			{
+				return frame.document;
+			}
+			else
+			{
+				return null;
+			}
 		},
 		focus: function()
 		{
@@ -357,7 +841,7 @@ var RTOOLBAR = {};
 		},
 		syncCode: function()
 		{
-			var html = this.formating(this.$editor.html());
+			var html = this.formatting(this.$editor.html());
 			this.$el.val(html);			
 		},
 		
@@ -380,6 +864,7 @@ var RTOOLBAR = {};
 		insertHtml: function(html)
 		{
 			this.execCommand('inserthtml', html);
+			this.observeImages();
 		},
 		destroy: function()
 		{
@@ -389,17 +874,18 @@ var RTOOLBAR = {};
 			this.$box.remove();
 			this.$el.val(html).show();
 			
-			this.dropdowns.forEach(function(dropdown, i)
+			for (var i = 0; i < this.dropdowns.length; i++)
 			{
-				dropdown.remove();
+				this.dropdowns[i].remove();
 				delete(this.dropdowns[i]);
-			}, this);
+			}			
+			
 		},
 		handler: function()
 		{
 			$.ajax({
 				url: this.opts.handler,
-				type: 'post',
+				type: 'POST',
 				data: 'redactor=' + escape(encodeURIComponent(this.getCode())),
 				success: $.proxy(function(data)
 				{
@@ -413,17 +899,32 @@ var RTOOLBAR = {};
 		// end API functions
 
 		// OBSERVERS
+		observeFocus: function()
+		{
+			if ($(this.doc).find('body').height() < $(this.$frame.get(0).contentWindow).height())
+			{		
+				$(this.doc).click($.proxy(function(e) { this.$editor.focus(); }, this));
+			}
+		},
 		observeImages: function()
 		{
-			if ($.browser.mozilla) this.doc.execCommand("enableObjectResizing", false, "false");
+			if ($.browser.mozilla)
+			{
+				this.doc.execCommand("enableObjectResizing", false, "false");
+			}
 			
-			$(this.doc).find('img').attr('unselectable', 'on').each($.proxy(function(i,s)
+			$(this.doc).find('img').each($.proxy(function(i,s)
 			{
+				if ($.browser.msie) $(s).attr('unselectable', 'on');
 				this.resizeImage(s);
 				
 			}, this));
 		
 		},
+		observeTables: function()
+		{
+			$(this.doc).find('body').find('table').click($.proxy(this.tableObserver, this));
+		},
 		observeScroll: function()
 		{
 			var scrolltop = $(document).scrollTop();
@@ -432,24 +933,37 @@ var RTOOLBAR = {};
 			if (scrolltop > boxtop)
 			{
 				this.fixed = true;
-				this.$toolbar.css({position: 'fixed', width: '100%'});
+				this.$toolbar.css({ position: 'fixed', width: '100%' });
 			}
 			else
 			{
 				this.fixed = false;
-				this.$toolbar.css({position: 'relative', width: 'auto'});
+				this.$toolbar.css({ position: 'relative', width: 'auto' });
 			}
 		},
 		observeAutoResize: function()
 		{
-			this.$editor.css({ 'min-height':this.$el.height()+'px' });
-			this.$frame.css({ 'overflow-x':'auto', 'overflow-y':'hidden' });
-			this.$frame.load($.proxy(this.setAutoSize, this));
+			this.$editor.css({ 'min-height': this.$el.height() + 'px' });
+			$(this.doc).find('body').css({ 'overflow': 'hidden' });
+			this.setAutoSize(false);
 			$(this.doc).keyup($.proxy(this.setAutoSize, this));
 		},
-		setAutoSize: function()
+		setAutoSize: function(e)
 		{
-			this.$frame.height(this.$editor.outerHeight(true)+30);
+			var key = false;
+			if (e !== false) 
+			{
+				key = e.keyCode || e.which;
+			}
+				
+			if (e === false || key === 13)
+			{
+				this.$frame.height(this.$editor.outerHeight(true)+30);
+			}
+			else if (key === 8 || key === 46)
+			{
+				this.$frame.height(this.$editor.outerHeight(true));
+			}
 		},
 		
 		
@@ -460,17 +974,31 @@ var RTOOLBAR = {};
 			{
 				try
 				{
-					if ($.browser.msie) this.focus();
+					if ($.browser.msie)
+					{
+						this.focus();
+					}
 
-					if (cmd == 'inserthtml' && $.browser.msie) this.doc.selection.createRange().pasteHTML(param);
-					else if (cmd == 'formatblock' && $.browser.msie) this.doc.execCommand(cmd, false, '<' +param + '>');
+					if (cmd === 'inserthtml' && $.browser.msie)
+					{
+						this.doc.selection.createRange().pasteHTML(param);
+					}
+					else if (cmd === 'formatblock' && $.browser.msie)
+					{
+						this.doc.execCommand(cmd, false, '<' +param + '>');
+					}
 					else
 					{
 						this.doc.execCommand(cmd, false, param);
 					}
 					
 					this.syncCode();
-					this.focus();
+					this.focus();					
+					
+					if (typeof this.opts.execCommandCallback === 'function')
+					{
+						this.opts.execCommandCallback(this, cmd);
+					}
 				}
 				catch (e) { }
 
@@ -481,29 +1009,38 @@ var RTOOLBAR = {};
 		formatNewLine: function(e)
 		{
 			var parent = this.getParentNode();
-			if (parent.nodeName == 'DIV' && parent.id == 'page')
+			if (parent.nodeName === 'DIV' && parent.id === 'page')
 			{
-				if (e.preventDefault) e.preventDefault();
+				if (e.preventDefault)
+				{
+					e.preventDefault();
+				}
 				
-				element = $(this.getCurrentNode());
-				if (element.get(0).tagName == 'DIV' && (element.html() == '' || element.html() == '<br>'))
+				var element = $(this.getCurrentNode());
+				if (element.get(0).tagName === 'DIV' && (element.html() === '' || element.html() === '<br>'))
 				{
-					newElement = $('<p>').append(element.clone().get(0).childNodes);
+					var newElement = $('<p>').append(element.clone().get(0).childNodes);
 					element.replaceWith(newElement);
 					newElement.html('<br />');
 					this.setFocusNode(newElement.get(0));
 
 					this.syncCode();
 					return false;
-				 }
-				 else this.syncCode();
+				}
+				else
+				{
+					this.syncCode();
+				}
 
 				// convert links
-				if (this.opts.convertLinks) this.$editor.linkify();
+				if (this.opts.convertLinks)
+				{
+					this.$editor.linkify();
+				}
 			}
 			else 
 			{
-				this.syncCode();				
+				this.syncCode();
 				return true;
 			}
 		},
@@ -511,17 +1048,22 @@ var RTOOLBAR = {};
 		// SAFARI SHIFT KEY + ENTER
 		safariShiftKeyEnter: function(e, key)
 		{
-			if (e.shiftKey && key == 13)
+			if (e.shiftKey && key === 13)
 			{
-				if (e.preventDefault) e.preventDefault();
+				e.preventDefault();
 			
 				var node1 = $('<span><br /></span>');
 				this.insertNodeAtCaret(node1.get(0));
 				this.setFocusNode(node1.get(0));
 
 				this.syncCode();
+
 				return false;
 			}
+			else
+			{
+				return true;
+			}
 		},
 		
 		// FORMAT EMPTY
@@ -529,86 +1071,53 @@ var RTOOLBAR = {};
 		{
 			var html = $.trim(this.$editor.html());
 			
-			if ($.browser.mozilla) html = html.replace(/<br>/gi, '');
+			if ($.browser.mozilla)
+			{
+				html = html.replace(/<br>/gi, '');
+			}
 			
 			if (html === '')
 			{
-				if (e.preventDefault) e.preventDefault();
+				if (e.preventDefault)
+				{
+					e.preventDefault();
+				}
 				
 				var nodehtml = this.opts.allEmptyHtml;
-				if ($.browser.mozilla) nodehtml = this.opts.mozillaEmptyHtml;
+				if ($.browser.mozilla)
+				{
+					nodehtml = this.opts.mozillaEmptyHtml;
+				}
 				
 				var node = $(nodehtml).get(0);
 				this.$editor.html(node);
 				this.setFocusNode(node);
 	
-				this.syncCode();				
+				this.syncCode();
 				return false;
 			}
-			else this.syncCode();
-		},
-
-		// PARAGRAPHY
-		paragraphy: function (str)
-		{
-			str = $.trim(str);
-			if (str === '')
+			else
 			{
-				if (!$.browser.mozilla) return this.opts.allEmptyHtml;
-				else return this.opts.mozillaEmptyHtml;
-			}
-			
-			// convert div to p
-			if (this.opts.convertDivs) str = str.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '<p>$2</p>');
-
-			// inner functions
-			var X = function(x, a, b) { return x.replace(new RegExp(a, 'g'), b); };
-			var R = function(a, b) { return X(str, a, b); };
-
-			// block elements
-			var blocks = '(table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|style|script|object|input|param|p|h[1-6])';
-		
-			str += '\n';
-
-			R('<br />\\s*<br />', '\n\n');
-			R('(<' + blocks + '[^>]*>)', '\n$1');
-			R('(</' + blocks + '>)', '$1\n\n');
-			R('\r\n|\r', '\n'); // newlines
-			R('\n\n+', '\n\n'); // remove duplicates
-			R('\n?((.|\n)+?)$', '<p>$1</p>\n'); // including one at the end
-			R('<p>\\s*?</p>', ''); // remove empty p
-			R('<p>(<div[^>]*>\\s*)', '$1<p>');
-			R('<p>([^<]+)\\s*?(</(div|address|form)[^>]*>)', '<p>$1</p>$2');
-			R('<p>\\s*(</?' + blocks + '[^>]*>)\\s*</p>', '$1');
-			R('<p>(<li.+?)</p>', '$1');
-			R('<p>\\s*(</?' + blocks + '[^>]*>)', '$1');
-			R('(</?' + blocks + '[^>]*>)\\s*</p>', '$1');
-			R('(</?' + blocks + '[^>]*>)\\s*<br />', '$1');
-			R('<br />(\\s*</?(p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)', '$1');
-
-			// pre
-			if (str.indexOf('<pre') != -1)
-			{
-				R('(<pre(.|\n)*?>)((.|\n)*?)</pre>', function(m0, m1, m2, m3)
-				{
-					return X(m1, '\\\\([\'\"\\\\])', '$1') + X(X(X(m3, '<p>', '\n'), '</p>|<br />', ''), '\\\\([\'\"\\\\])', '$1') + '</pre>';
-				});
+				this.syncCode();
 			}
-
-			return R('\n</p>$', '</p>');
 		},
 
 		// PREPARE FORMATER
 		preformater: function(html)
 		{
-			html = html.replace(/<br>/gi,'<br />');
-
-			html = html.replace(/<blockquote\b[^>]*>([\w\W]*?)<p>([\w\W]*?)<\/p>([\w\W]*?)<\/blockquote[^>]*>/gi,'<blockquote>$1$2<br />$3</blockquote>');
-
-			html = html.replace(/<strong\b[^>]*>([\w\W]*?)<\/strong[^>]*>/gi,'<b>$1</b>');
-			html = html.replace(/<em\b[^>]*>([\w\W]*?)<\/em[^>]*>/gi,'<i>$1</i>');
-			html = html.replace(/<del\b[^>]*>([\w\W]*?)<\/del[^>]*>/gi,'<strike>$1</strike>');
-
+			if (html !== null)
+			{
+				html = html.replace(/<br>/gi,'<br />');
+				//html = html.replace(/<blockquote\b[^>]*>([\w\W]*?)<p>([\w\W]*?)<\/p>([\w\W]*?)<\/blockquote[^>]*>/gi,'<blockquote>$1$2<br />$3</blockquote>');
+				html = html.replace(/<strong\b[^>]*>([\w\W]*?)<\/strong[^>]*>/gi,'<b>$1</b>');
+				html = html.replace(/<em\b[^>]*>([\w\W]*?)<\/em[^>]*>/gi,'<i>$1</i>');
+				html = html.replace(/<del\b[^>]*>([\w\W]*?)<\/del[^>]*>/gi,'<strike>$1</strike>');
+			}
+			else
+			{
+				html = '';
+			}
+			
 			return html;
 		},
 
@@ -616,7 +1125,6 @@ var RTOOLBAR = {};
 		reformater: function(html)
 		{
 			html = html.replace(/<br>/gi,'<br />');
-
 			html = html.replace(/<b\b[^>]*>([\w\W]*?)<\/b[^>]*>/gi,'<strong>$1</strong>');
 			html = html.replace(/<i\b[^>]*>([\w\W]*?)<\/i[^>]*>/gi,'<em>$1</em>');
 			html = html.replace(/<strike\b[^>]*>([\w\W]*?)<\/strike[^>]*>/gi,'<del>$1</del>');
@@ -627,121 +1135,259 @@ var RTOOLBAR = {};
 
 			return html;
 		},
-
-		// REMOVE CLASSES AND STYLES
-		cleanUpClasses: function(html)
+		
+		// REMOVE TAGS
+		stripTags: function(html) 
 		{
-			html = html.replace(/\s*class="TOC(.*?)"/gi, "" );
-			html = html.replace(/\s*class="Heading(.*?)"/gi, "" );
-			html = html.replace(/\s*class="Body(.*?)"/gi, "" );
-
-			return html;
+			var allowed = ["code", "span", "div", "label", "a", "br", "p", "b", "i", "del", "strike", "img", "video", "audio", "iframe", "object", "embed", "param", "blockquote", "mark", "cite", "small", "ul", "ol", "li", "hr", "dl", "dt", "dd", "sup", "sub", "big", "pre", "code", "figure", "figcaption", "strong", "em", "table", "tr", "td", "th", "tbody", "thead", "tfoot", "h1", "h2", "h3", "h4", "h5", "h6"];
+		    var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi;
+		    return html.replace(tags, function ($0, $1) 
+		    {
+				return $.inArray($1.toLowerCase(), allowed) > '-1' ? $0 : '';
+		    });
 		},
-		cleanUpStyles: function(html)
-		{
-
-			html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, "" );
-			html = html.replace( /\s*margin(.*?)pt\s*;/gi, "" );
-			html = html.replace( /\s*margin(.*?)cm\s*;/gi, "" );
-			html = html.replace( /\s*text-indent:(.*?)\s*;/gi, "" );
-			html = html.replace( /\s*line-height:(.*?)\s*;/gi, "" );
-			html = html.replace( /\s*page-break-before: [^\s;]+;?"/gi, "\"" );
-			html = html.replace( /\s*font-variant: [^\s;]+;?"/gi, "\"" );
-			html = html.replace( /\s*tab-stops:[^;"]*;?/gi, "" );
-			html = html.replace( /\s*tab-stops:[^"]*/gi, "" );
-			html = html.replace( /\s*face="[^"]*"/gi, "" );
-			html = html.replace( /\s*face=[^ >]*/gi, "" );
-			html = html.replace( /\s*font:(.*?);/gi, "" );
-			html = html.replace( /\s*font-size:(.*?);/gi, "" );
-			html = html.replace( /\s*font-weight:(.*?);/gi, "" );
-			html = html.replace( /\s*font-family:[^;"]*;?/gi, "" );
-			html = html.replace(/<span style="Times New Roman&quot;">\s\n<\/span>/gi, '');
-
-			return html;
-
-		},
-		cleanUp: function(html)
+		cleanStyles: function (properties, str, m)
 		{
-			// clean comments
-			html = html.replace(/(<\!\-\-([\w\W]*?)\-\->)/ig, "");
+		 	   	
+			var attr = m.split('=');
+			var prop = attr[1].split(';');
 		
-			if (this.opts.convertDivs)
-			{
-				html = html.replace(/<div(.*?)>([\w\W]*?)<\/div>/gi, '<p$1>$2</p>');
-			}
-
-			// clean dirty
-			html = html.replace(/ lang="([\w\W]*?)"/gi, '');
-			html = html.replace(/<a name="(.*?)">([\w\W]*?)<\/a>/gi, '');
-			html = html.replace(/\&nbsp;\&nbsp;\&nbsp;/gi, ' ');
-			html = html.replace(/\&nbsp;\&nbsp;/gi, ' ');
-			html = html.replace(/<o:p>(.*?)<\/o:p>/gi, '');
-
-
-			// empty style
-			html = html.replace( /\s*style="\s*"/gi, '' );
-
-			// spans
-			html = html.replace(/<span>&nbsp;<\/span>/gi, '');
-			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');
+			var t = '';
+			$.each(prop, function(z,s)
+			{	   		
+				if (typeof s == 'undefined') return true;	
+				if (s == '"' || s == "'") return true;
 			
-			return html;
-		},
-		removeTags: function(html)
-		{
-			return html.replace(/<(?!\s*\/?(code|span|div|label|a|br|p|b|i|del|strike|img|video|audio|iframe|object|embed|param|blockquote|mark|cite|small|ul|ol|li|hr|dl|dt|dd|sup|sub|big|pre|code|figure|figcaption|strong|em|table|tr|td|th|tbody|thead|tfoot|h1|h2|h3|h4|h5|h6)\b)[^>]+>/gi,"");
+				s = s.replace(/(^"|^')/,'').replace(/("$|'$)/,'').replace(/"(.*?)"/gi, '');
+				s = $.trim(s);
+		
+				var p = s.split(':');
+				
+				if (typeof p[1] !== 'undefined' && (p[1].search('pt') === -1 && p[1].search('cm') === -1)) 
+				{
+					if ($.inArray($.trim(p[0]), properties) != '-1') t += s + '; ';
+				}
+			});
+				   		
+			return str.replace(m, 'style="' + t + '"');
 		},
+	
 		
 		// PASTE CLEANUP
-		pasteCleanUp: function()
+		pasteCleanUp: function(marker)
 		{
 			var html = this.$editor.html();
 			
-			html = html.replace(/<span id="pastemarkerend">&nbsp;<\/span>/, '#marker#');
+			// remove comments and php tags
+		    html = html.replace(/<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi, '')			
+			
+			// remove formatting
+			html = this.formattingRemove(html);			
+			
+			// remove tags	
+			html = this.stripTags(html);	
 			
-			html = this.formating(html);
-			html = this.cleanUp(html);
+			// remove classes
+			if (this.opts.removeClasses)
+			{
+				html = html.replace(/ class="([\w\W]*?)"/gi, '');
+			}
+			else
+			{
+				html = html.replace(/\s*class="TOC(.*?)"/gi, "" );
+				html = html.replace(/\s*class="Heading(.*?)"/gi, "" );
+				html = html.replace(/\s*class="Body(.*?)"/gi, "" );		
+				html = html.replace(/\sclass="Nonformat"/gi, '');		
+				html = html.replace(/\sclass="Mso(.*?)"/gi, '');				
+				html = html.replace(/\sclass="Apple(.*?)"/gi, '');			
+				html = html.replace(/"Times New Roman"/gi, '');				
+			}
+			
+			var attributes = ['width', 'height', 'src', 'style', 'href', 'frameborder', 'class', 'id', 'rel', 'unselectable'];    
+			var properties = ['color', 'background-color', 'font-style', 'margin', 'margin-top', 'margin-bottom', 'margin-left', 'margin-right', 'text-align', 'width', 'height', 'cursor', 'float'];
+			
+			// remove attributes
+		   	var matches = html.match(/([\w\-.:]+)\s*=\s*("[^"]*"|'[^']*'|[\w\-.:]+)/gi);
+		   	$.each(matches, $.proxy(function(i,m)
+		   	{	  
+		   		var attr = m.split('=');
+		   		if ($.inArray(attr[0], attributes) == '-1') 
+		   		{
+		   			html = html.replace(m, '');
+		   		}
+				
+				// remove styles
+				if (this.opts.removeStyles === false && attr[0] == 'style') html = this.cleanStyles(properties, html, m);
+		   			   	
+		   	}, this));				
+		   	
+		   	// remove styles
+		   	if (this.opts.removeStyles === false)
+		   	{
+				html = html.replace(/background-color:(\s+)transparent;\s/gi, '');
+				html = html.replace(/font-style:(\s+)normal;\s/gi, '');				   	
+			}
+			else
+			{
+				html = html.replace(/ style="([\w\W]*?)"/gi, '');
+			}
 	
-			if (this.opts.removeClasses) html = html.replace(/ class="([\w\W]*?)"/gi, '');
-			else html = this.cleanUpClasses(html);
+			// remove empty styles
+			html = html.replace(/((\s{2,})?|\s)style=(""|'')/gi, '');  	
 			
-			if (this.opts.removeStyles) html = html.replace(/ style="([\w\W]*?)"/gi, '');
-			else html = this.cleanUpStyles(html);
-
-			html = this.cleanUp(html);
-			html = this.formating(html);
+			// remove nbsp
+			html = html.replace(/(&nbsp;){1,}/gi, '&nbsp;');
 			
-			html = html.replace(/<b(.*?)id="internal-source-marker(.*?)">([\w\W]*?)<\/b>/gi, "$3");
-
-			html = html.replace(/#marker#/, '<span id="pastemarkerend">&nbsp;</span>');
+			// remove empty span
+			html = html.replace(/<span(\s)?>(\s)?<\/span>/gi, ' ');	
+		
+			// remove double white spaces
+			html = html.replace(/\s{2,}/g, ' ');
+		
+			// remove span without styles
+			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');
+			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');	
+			html = html.replace(/<span(\s)?>([\w\W]*?)<\/span>/gi, '$2');	
+			
+			// empty tags
+			html = this.formattingEmptyTags(html);			
+						
+			// add formatting before
+			html = this.formattingAddBefore(html);
+			
+			// add formatting after
+			html = this.formattingAddAfter(html);		
+		
+			// indenting
+			html = this.formattingIndenting(html);  		
+		
+		   	// dirty paragraphs
+		   	html = html.replace(/<p><div>/gi, "");
+		   	html = html.replace(/<p>\s+\n+<(.*?)/gi, "<$1");
+		   	html = html.replace(/<\/(.*?)>\s+\n+<\/p>/gi, "</$1>");	
+			html = html.replace(/<p style="(.*?)">(\s)?<\/p>/gi, '');	   	
+			html = html.replace(/<p style="(.*?)"><\/p>/gi, '');			
+		
+		   	// remove google docs marker
+		 	html = html.replace(/<b\sid="internal-source-marker(.*?)">([\w\W]*?)<\/b>/gi, "$2");	
+		
+			// trim spaces
+			html = html.replace(/; ">/gi, ';">'); 			
 
+			// SET HTML
 			this.$editor.html(html);
 
-			var node = $(this.doc.body).find('#pastemarkerend').get(0);
+			// RETURN FOCUS
+			var node = $(this.doc.body).find('#pastemarkerend' + marker).get(0);
 			this.setFocusNode(node);
 
 			this.syncCode();
-			this.observeImages();
+
+			
+			setTimeout($.proxy(function()
+			{
+				// remove pastemarker
+				$(this.doc.body).find('span[rel=pastemarkerend]').remove();
+				
+				if (this.opts.autoresize === true) this.setAutoSize(false);
+				
+				this.observeImages();
+				this.observeTables();							
+				
+			}, this), 100);
+			
+			
 		},
 		
 		// TEXTAREA CODE FORMATTING
-		formating: function (html)
+		formattingRemove: function(html)
+		{
+			html = html.replace(/\s{2,}/g, ' ');
+			html = html.replace(/\n/g, ' ');	
+			html = html.replace(/[\t]*/g, '');
+			html = html.replace(/\n\s*\n/g, "\n");
+			html = html.replace(/^[\s\n]*/g, '');
+			html = html.replace(/[\s\n]*$/g, '');	
+			html = html.replace(/>\s+</g, '><');
+			
+			return html;		
+		},
+		formattingIndenting: function(html)
+		{
+			html = html.replace(/<li/g, "\t<li");
+			html = html.replace(/<tr/g, "\t<tr");
+			html = html.replace(/<td/g, "\t\t<td");
+			html = html.replace(/<\/tr>/g, "\t</tr>");	
+			
+			return html;	
+		},
+		formattingEmptyTags: function(html)		
+		{
+			var etags = ["<pre></pre>","<blockquote>\\s*</blockquote>","<em>\\s*</em>","<ul></ul>","<ol></ol>","<li></li>","<table></table>","<tr></tr>","<span>\\s*<span>", "<span>&nbsp;<span>", "<b>\\s*</b>", "<b>&nbsp;</b>", "<p>\\s*</p>", "<p>&nbsp;</p>",  "<p>\\s*<br>\\s*</p>", "<div>\\s*</div>", "<div>\\s*<br>\\s*</div>"];
+			for (var i = 0; i < etags.length; ++i)
+			{
+				var bbb = etags[i];
+				html = html.replace(new RegExp(bbb,'gi'), "");
+			}
+			
+			return html;
+		},
+		formattingAddBefore: function(html)
+		{
+			var lb = '\r\n';
+			var btags = ["<p", "<form","</ul>", '</ol>', "<fieldset","<legend","<object","<embed","<select","<option","<input","<textarea","<pre","<blockquote","<ul","<ol","<li","<dl","<dt","<dd","<table", "<thead","<tbody","<caption","</caption>","<th","<tr","<td","<figure"];
+			for (var i = 0; i < btags.length; ++i)
+			{
+				var eee = btags[i];
+				html = html.replace(new RegExp(eee,'gi'),lb+eee);
+			}
+			
+			return html;
+		},
+		formattingAddAfter: function(html)
+		{
+			var lb = '\r\n';		
+			var atags = ['</p>', '</div>', '</h1>', '</h2>', '</h3>', '</h4>', '</h5>', '</h6>', '<br>', '<br />', '</dl>', '</dt>', '</dd>', '</form>', '</blockquote>', '</pre>', '</legend>', '</fieldset>', '</object>', '</embed>', '</textarea>', '</select>', '</option>', '</table>', '</thead>', '</tbody>', '</tr>', '</td>', '</th>', '</figure>'];
+			for (var i = 0; i < atags.length; ++i)
+			{
+				var aaa = atags[i];
+				html = html.replace(new RegExp(aaa,'gi'),aaa+lb);
+			}
+			
+			return html;		
+		},
+		formatting: function(html)
 		{
 			// lowercase
 			if ($.browser.msie)
 			{
-				html = html.replace(/<*(\/ *)?(\w+)/g, function(w) { return w.toLowerCase(); });
-				html = html.replace(/style="(.*?)"/g, function(w) { return w.toLowerCase(); });
+		      	var match = html.match(/<(.*?)>/gi);
+				$.each(match, function(i,s)
+				{
+					html = html.replace(s, s.toLowerCase());
+				}) 
+				html = html.replace(/style="(.*?)"/gi, function(w) { return w.toLowerCase(); });
 				html = html.replace(/ jQuery(.*?)=\"(.*?)\"/gi, '');
 			}
 
-			html = html.replace(/<font([\w\W]*?)color="(.*?)">([\w\W]*?)<\/font\>/gi, '<span style="color: $2;">$3</span>');
+			html = html.replace(/<span([\w\W]*?)style="color:(.*?);"><span([\w\W]*?)style="background-color:(.*?);">([\w\W]*?)<\/span><\/span>/gi, '<span style="color: $2; background-color: $4;">$5</span>');
+			html = html.replace(/<span([\w\W]*?)style="background-color:(.*?);"><span([\w\W]*?)style="color:(.*?);">([\w\W]*?)<\/span><\/span>/gi, '<span style="color: $2; background-color: $4;">$5</span>');
+
+			html = html.replace(/<span([\w\W]*?)color="(.*?)">([\w\W]*?)<\/span\>/gi, '<span$1style="color: $2;">$3</span>');
+			html = html.replace(/<font([\w\W]*?)color="(.*?)">([\w\W]*?)<\/font\>/gi, '<span$1style="color: $2;">$3</span>');
+			html = html.replace(/<span style="(.*?)"\s+style="(.*?)"[\s]*>([\w\W]*?)<\/span\>/gi, '<span style="$1;$2">$3</span>');
 			html = html.replace(/<font([\w\W]*?)>([\w\W]*?)<\/font\>/gi, "<span$1>$2</span>");
-			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');
+			html = html.replace(/<span>([\w\W]*?)<\/span>/gi, '$1');			
+
+			if (this.opts.xhtml)
+			{
+				html = html.replace(/<br>/gi,'<br />');
+				html = html.replace(/<br ?\/?>$/gi,'');
+				html = html.replace(/^<br ?\/?>/gi,'');
+				html = html.replace(/(<img [^>]+[^\/])>/gi,'$1 />');
+			}
 
 			// mini clean
-			html = html.replace(/ class="Apple-style-span"/gi, '');
-			html = html.replace(/ class="Apple-tab-span"/gi, '');
 			html = html.replace(/<p><p>/g, '<p>');
 			html = html.replace(/<\/p><\/p>/g, '</p>');
 			html = html.replace(/<hr(.*?)>/g, '<hr />');
@@ -753,42 +1399,19 @@ var RTOOLBAR = {};
 			html = html.replace( /<p(.*?)>&nbsp;<\/p>/gi, '');
 
 			// remove formatting
-			html = html.replace(/[\t]*/g, '');
-			html = html.replace(/\n\s*\n/g, "\n");
-			html = html.replace(/^[\s\n]*/, '');
-			html = html.replace(/[\s\n]*$/, '');
+			html = this.formattingRemove(html);
 
 			// empty tags
-			var etags = ["<pre></pre>","<blockquote>\\s*</blockquote>","<em>\\s*</em>","<b>\\s*</b>","<ul></ul>","<ol></ol>","<li></li>","<table></table>","<tr></tr>","<span>\\s*<span>", "<span>&nbsp;<span>", "<p>\\s*</p>", "<p>&nbsp;</p>",  "<p>\\s*<br>\\s*</p>", "<div>\\s*</div>", "<div>\\s*<br>\\s*</div>"];
-			for (var i = 0; i < etags.length; ++i)
-			{
-				var bbb = etags[i];
-				html = html.replace(new RegExp(bbb,'gi'), "");
-			}
-			
-			
+			html = this.formattingEmptyTags(html);		
+						
 			// add formatting before
-			var lb = '\r\n';
-			var btags = ["<form","<fieldset","<legend","<object","<embed","<select","<option","<input","<textarea","<pre","<blockquote","<ul","<ol","<li","<dl","<dt","<dd","<table", "<thead","<tbody","<caption","</caption>","<th","<tr","<td","<figure"];
-			for (var i = 0; i < btags.length; ++i)
-			{
-				var eee = btags[i];
-				html = html.replace(new RegExp(eee,'gi'),lb+eee);
-			}
+			html = this.formattingAddBefore(html);
 			
 			// add formatting after
-			var atags = ['</p>', '</div>', '</ul>', '</ol>', '</h1>', '</h2>', '</h3>', '</h4>', '</h5>', '</h6>', '<br>', '<br />', '</dl>', '</dt>', '</dd>', '</form>', '</blockquote>', '</pre>', '</legend>', '</fieldset>', '</object>', '</embed>', '</textarea>', '</select>', '</option>', '</table>', '</thead>', '</tbody>', '</tr>', '</td>', '</th>', '</figure>'];
-			for (var i = 0; i < atags.length; ++i)
-			{
-				var aaa = atags[i];
-				html = html.replace(new RegExp(aaa,'gi'),aaa+lb);
-			}
+			html = this.formattingAddAfter(html);
 
 			// indenting
-			html = html.replace(/<li/g, "\t<li");
-			html = html.replace(/<tr/g, "\t<tr");
-			html = html.replace(/<td/g, "\t\t<td");
-			html = html.replace(/<\/tr>/g, "\t</tr>");
+			html = this.formattingIndenting(html);
 
 			return html;
 		},
@@ -803,8 +1426,8 @@ var RTOOLBAR = {};
 				this.$frame.hide();
 				
 				html = this.$editor.html();
-				html = $.trim(this.formating(html));
-				
+				html = $.trim(this.formatting(html));
+					
 				this.$el.val(html).show().focus();
 				
 				this.setBtnActive('html');
@@ -820,8 +1443,14 @@ var RTOOLBAR = {};
 
 				if (this.$editor.html() === '')
 				{
-					if (!$.browser.mozilla) html = this.opts.allEmptyHtml;
-					else html = this.opts.mozillaEmptyHtml;
+					if (!$.browser.mozilla)
+					{
+						html = this.opts.allEmptyHtml;
+					}
+					else
+					{
+						html = this.opts.mozillaEmptyHtml;
+					}
 
 					this.setCode(html);
 				}
@@ -830,14 +1459,21 @@ var RTOOLBAR = {};
 				
 				this.setBtnInactive('html');
 				this.opts.visual = true;
+				
 				this.observeImages();
+				this.observeTables();
+				
+				if (this.opts.autoresize === true) this.setAutoSize(false);
 			}
 		},
 
 		// AUTOSAVE
 		autoSave: function()
 		{
-			if (this.opts.autosave === false) return false;
+			if (this.opts.autosave === false)
+			{
+				return false;
+			}
 	
 			setInterval($.proxy(function()
 			{
@@ -849,40 +1485,66 @@ var RTOOLBAR = {};
 		// TOOLBAR
 		buildToolbar: function()
 		{
-			if (this.opts.toolbar === false) return false;
+			if (this.opts.toolbar === false)
+			{
+				return false;
+			}
 		
 			this.$toolbar = $('<ul>').addClass('redactor_toolbar');
 			this.$box.prepend(this.$toolbar);
 			
-			$.each(RTOOLBAR[this.opts.toolbar], $.proxy(function(key,s)
+			$.each(this.opts.buttons, $.proxy(function(i,key)
 			{
-				if (this.opts.fileUpload === false && key == 'file') return true;
-			
-				var li = $('<li>');
 				
-				if (key == 'fullscreen') $(li).addClass('redactor_toolbar_right');
-
-				var a = this.buildButton(key, s);
-
-				// dropdown
-				if (key == 'backcolor' || key == 'fontcolor' || typeof(s.dropdown) != 'undefined')
+				if (key !== '|' && typeof this.opts.toolbar[key] !== 'undefined') 
 				{
-					var dropdown = $('<div class="redactor_dropdown" style="display: none;">');
+					var s = this.opts.toolbar[key];
+				
+					if (this.opts.fileUpload === false && key === 'file')
+					{
+						return true;
+					}
+				
+					var li = $('<li>');
 					
-					if (key == 'backcolor' || key == 'fontcolor') dropdown = this.buildColorPicker(dropdown, key);
-					else dropdown = this.buildDropdown(dropdown, s.dropdown);
-
-					this.dropdowns.push(dropdown.appendTo($(document.body)));
-
-					// observing dropdown
-					this.hdlHideDropDown = $.proxy(function(e) { this.hideDropDown(e, dropdown, key); }, this);
-					this.hdlShowDropDown = $.proxy(function(e) { this.showDropDown(e, dropdown, key); }, this);
-
-					a.click(this.hdlShowDropDown);
+					if (key === 'fullscreen') 
+					{
+						$(li).addClass('redactor_toolbar_right');
+					}
+	
+					var a = this.buildButton(key, s);
+	
+					// dropdown
+					if (key === 'backcolor' || key === 'fontcolor' || typeof(s.dropdown) !== 'undefined')
+					{
+						var dropdown = $('<div class="redactor_dropdown" style="display: none;">');
+						
+						if (key === 'backcolor' || key === 'fontcolor')
+						{
+							dropdown = this.buildColorPicker(dropdown, key);
+						}
+						else
+						{
+							dropdown = this.buildDropdown(dropdown, s.dropdown);
+						}
+	
+						this.dropdowns.push(dropdown.appendTo($(document.body)));
+	
+						// observing dropdown
+						this.hdlHideDropDown = $.proxy(function(e) { this.hideDropDown(e, dropdown, key); }, this);
+						this.hdlShowDropDown = $.proxy(function(e) { this.showDropDown(e, dropdown, key); }, this);
+	
+						a.click(this.hdlShowDropDown);
+					}
+					
+					this.$toolbar.append($(li).append(a));
 				}
 
-				this.$toolbar.append($(li).append(a));
-				if (typeof(s.separator) != 'undefined') this.$toolbar.append($('<li class="redactor_separator"></li>'));
+				
+				if (key === '|')
+				{
+					this.$toolbar.append($('<li class="redactor_separator"></li>'));
+				}
 
 			}, this));
 
@@ -893,8 +1555,20 @@ var RTOOLBAR = {};
 		buildButton: function(key, s)
 		{
 			var button = $('<a href="javascript:void(null);" title="' + s.title + '" class="redactor_btn_' + key + '"><span>&nbsp;</span></a>');
-			if (typeof(s.func) == 'undefined') button.click($.proxy(function() { this.execCommand(s.exec, key); }, this));
-			else if (s.func != 'show') button.click($.proxy(function(e) { this[s.func](e); }, this));
+			
+			if (typeof s.func === 'undefined')
+			{
+				button.click($.proxy(function() { this.execCommand(s.exec, key); }, this));
+			}
+			else if (s.func !== 'show')
+			{
+				button.click($.proxy(function(e) { this[s.func](e); }, this));
+			}
+
+			if (typeof s.callback !== 'undefined') 
+			{
+				button.click($.proxy(function(e) { s.callback(this, e, key); }, this));
+			}
 
 			return button;
 		},
@@ -903,16 +1577,28 @@ var RTOOLBAR = {};
 			$.each(obj, $.proxy(
 				function (x, d)
 				{
-					if (typeof(d.style) == 'undefined') d.style = '';
+					if (typeof(d.className) === 'undefined')
+					{
+						d.className = '';
+					}
 					
 					var drop_a;
-					if (d.name == 'separator') drop_a = $('<a class="redactor_separator_drop">');
+					if (typeof d.name !== 'undefined' && d.name === 'separator')
+					{
+						drop_a = $('<a class="redactor_separator_drop">');
+					}
 					else
 					{
-						drop_a = $('<a href="javascript:void(null);" style="' + d.style + '">' + d.title + '</a>');
+						drop_a = $('<a href="javascript:void(null);" class="' + d.className + '">' + d.title + '</a>');
 
-						if (typeof(d.func) == 'undefined') $(drop_a).click($.proxy(function() { this.execCommand(d.exec, x); }, this));
-						else $(drop_a).click($.proxy(function(e) { this[d.func](e); }, this));
+						if (typeof(d.func) === 'undefined')
+						{
+							$(drop_a).click($.proxy(function() { this.execCommand(d.exec, x); }, this));
+						}
+						else
+						{
+							$(drop_a).click($.proxy(function(e) { this[d.func](e); }, this));
+						}
 					}
 
 					$(dropdown).append(drop_a);
@@ -926,12 +1612,21 @@ var RTOOLBAR = {};
 		buildColorPicker: function(dropdown, key)
 		{
 			var mode;
-			if (key == 'backcolor')
+			if (key === 'backcolor')
 			{
-				if ($.browser.msie) mode = 'BackColor';
-				else mode = 'hilitecolor';
+				if ($.browser.msie)
+				{
+					mode = 'BackColor';
+				}
+				else
+				{
+					mode = 'hilitecolor';
+				}
+			}
+			else
+			{
+				mode = 'forecolor';
 			}
-			else mode = 'forecolor';
 			
 			$(dropdown).width(210);
 
@@ -944,13 +1639,41 @@ var RTOOLBAR = {};
 				$(dropdown).append(swatch);
 
 				var _self = this;
-				$(swatch).click(function() { _self.execCommand(mode, $(this).attr('rel')); });
+				$(swatch).click(function() 
+				{ 
+					if ($.browser.mozilla)
+					{	
+						if (mode == 'hilitecolor')
+						{					
+							_self.execCommand('useCSS', false, false);
+							_self.execCommand(mode, $(this).attr('rel'));
+							_self.execCommand('useCSS', false, true);					
+						}
+						else
+						{
+							_self.execCommand('styleWithCSS', false, false);
+							_self.execCommand(mode, $(this).attr('rel'));
+							_self.execCommand('styleWithCSS', false, true);
+						}
+					}
+					else
+					{
+						_self.execCommand(mode, $(this).attr('rel'));
+					}
+		
+				});
 			}
 
 			var elnone = $('<a href="javascript:void(null);" class="redactor_color_none"></a>').html(RLANG.none);
 
-			if (key == 'backcolor')	elnone.click($.proxy(this.setBackgroundNone, this));
-			else elnone.click($.proxy(this.setColorNone, this));
+			if (key === 'backcolor')
+			{
+				elnone.click($.proxy(this.setBackgroundNone, this));
+			}
+			else
+			{
+				elnone.click($.proxy(this.setColorNone, this));
+			}
 
 			$(dropdown).append(elnone);
 
@@ -966,26 +1689,34 @@ var RTOOLBAR = {};
 			$(this.getParentNode()).attr('color', '').css('color', '');
 			this.syncCode();
 		},
+
 		
 		// DROPDOWNS
 		showDropDown: function(e, dropdown, key)
 		{
-			this.hideAllDropDown();
-
-			this.setBtnActive(key);
-			this.getBtn(key).addClass('dropact');
-
-			var left = this.getBtn(key).offset().left;
-			
-			
-			if (this.opts.fixed && this.fixed)
+			if (this.getBtn(key).hasClass('dropact'))
 			{
-				$(dropdown).css({ position: 'fixed', left: left + 'px', top: '30px' }).show();
+				this.hideAllDropDown();
 			}
-			else 
-			{
-				var top = this.$toolbar.offset().top + 30;
-				$(dropdown).css({ position: 'absolute', left: left + 'px', top: top + 'px' }).show();
+			else
+			{	
+				this.hideAllDropDown();
+	
+				this.setBtnActive(key);
+				this.getBtn(key).addClass('dropact');
+	
+				var left = this.getBtn(key).offset().left;
+				
+				
+				if (this.opts.fixed && this.fixed)
+				{
+					$(dropdown).css({ position: 'fixed', left: left + 'px', top: '30px' }).show();
+				}
+				else 
+				{
+					var top = this.$toolbar.offset().top + 30;
+					$(dropdown).css({ position: 'absolute', left: left + 'px', top: top + 'px' }).show();
+				}
 			}
 			
 		},
@@ -1007,18 +1738,36 @@ var RTOOLBAR = {};
 		// SELECTION AND NODE MANIPULATION
 		getSelection: function ()
 		{
-			if (this.$frame.get(0).contentWindow.getSelection) return this.$frame.get(0).contentWindow.getSelection();
-			else if (this.$frame.get(0).contentWindow.document.selection) return this.$frame.get(0).contentWindow.document.selection.createRange();
+			if (this.$frame.get(0).contentWindow.getSelection)
+			{
+				return this.$frame.get(0).contentWindow.getSelection();
+			}
+			else if (this.$frame.get(0).contentWindow.document.selection)
+			{
+				return this.$frame.get(0).contentWindow.document.selection.createRange();
+			}
 		},
 		getParentNode: function()
 		{
-			if (window.getSelection) return this.getSelection().getRangeAt(0).startContainer.parentNode;
-			else if (document.selection) return this.getSelection().parentElement();
+			if (window.getSelection)
+			{
+				return this.getSelection().getRangeAt(0).startContainer.parentNode;
+			}
+			else if (document.selection)
+			{
+				return this.getSelection().parentElement();
+			}
 		},
 		getCurrentNode: function()
 		{
-			if (window.getSelection) return this.getSelection().getRangeAt(0).startContainer;
-			else if (document.selection) return this.getSelection();
+			if (window.getSelection)
+			{
+				return this.getSelection().getRangeAt(0).startContainer;
+			}
+			else if (document.selection)
+			{
+				return this.getSelection();
+			}
 		},
 		setFocusNode: function(node, toStart)
 		{
@@ -1038,7 +1787,7 @@ var RTOOLBAR = {};
 		},
 		insertNodeAtCaret: function (node)
 		{
-			if (typeof window.getSelection != "undefined")
+			if (typeof window.getSelection !== "undefined")
 			{
 				var sel = this.getSelection();
 				if (sel.rangeCount) 
@@ -1053,9 +1802,9 @@ var RTOOLBAR = {};
 					sel.addRange(range);
 				}
 			}
-			else if (typeof document.selection != "undefined" && document.selection.type != "Control")
+			else if (typeof document.selection !== "undefined" && document.selection.type !== "Control")
 			{
-				var html = (node.nodeType == 1) ? node.outerHTML : node.data;
+				var html = (node.nodeType === 1) ? node.outerHTML : node.data;
 				var id = "marker_" + ("" + Math.random()).slice(2);
 				html += '<span id="' + id + '"></span>';
 				var textRange = this.getSelection();
@@ -1122,10 +1871,13 @@ var RTOOLBAR = {};
 				this.$editor = this.enable(html);				
 				
 				$(this.doc).click($.proxy(this.hideAllDropDown, this));
+
 				// focus always on page
-				$(this.doc).click($.proxy(function(e) { this.$editor.focus(); }, this));
+				this.observeFocus();
 				
 				this.observeImages();
+				this.observeTables();
+				
 				this.$box.find('.redactor_resizer').hide();
 
 				this.fullScreenResize();
@@ -1152,12 +1904,18 @@ var RTOOLBAR = {};
 				this.$editor = this.enable(html);
 				
 				this.observeImages();
-				this.observeAutoResize();
+				this.observeTables();
+				
+				if (this.opts.autoresize)
+				{
+					this.observeAutoResize();
+				}
 				this.$box.find('.redactor_resizer').show();
 				
 				$(this.doc).click($.proxy(this.hideAllDropDown, this));
+				
 				// focus always on page
-				$(this.doc).click($.proxy(function(e) { this.$editor.focus(); }, this));
+				this.observeFocus();
 				
 				this.syncCode();
 				
@@ -1168,13 +1926,12 @@ var RTOOLBAR = {};
 		},
 		fullScreenResize: function()
 		{
-			if (this.opts.fullscreen === false) return;
-			
-			var hfix = 42;
-			if (this.opts.air) hfix = 2;
-			
-			var height = $(window).height() - hfix;		
+			if (this.opts.fullscreen === false)
+			{
+				return false;
+			}
 			
+			var height = $(window).height() - 42;			
 			this.$box.width($(window).width() - 2);
 			this.$frame.height(height);
 			this.$el.height(height);
@@ -1183,17 +1940,22 @@ var RTOOLBAR = {};
 		// RESIZE
 		buildResizer: function()
 		{
-			if (this.opts.resize === false) return false;
+			if (this.opts.resize === false)
+			{
+				return false;
+			}
 			
 			this.$resizer = $('<div class="redactor_resizer">&mdash;</div>');
-			this.$box.append(this.$resizer);
-	
+			this.$box.append(this.$resizer);	
 			this.$resizer.mousedown($.proxy(this.initResize, this));
 
 		},
 		initResize: function(e)
 		{
-			if (e.preventDefault) e.preventDefault();
+			if (e.preventDefault)
+			{
+				e.preventDefault();
+			}
 
 			this.splitter = e.target;
 
@@ -1227,15 +1989,29 @@ var RTOOLBAR = {};
 		},
 		resize: function(e)
 		{
-			if (e.preventDefault) e.preventDefault();
+			if (e.preventDefault)
+			{
+				e.preventDefault();
+			}
 
 			var y = e.pageY;
-			if (this.null_point === false) this.null_point = y;
-			if (this.h_new === false) this.h_new = this.element_resize.height();
+			
+			if (this.null_point === false)
+			{
+				this.null_point = y;
+			}
+			
+			if (this.h_new === false)
+			{
+				this.h_new = this.element_resize.height();
+			}
 	
 			var s_new = (this.h_new + y - this.null_point) - 10;
 	
-			if (s_new <= 30) return true;
+			if (s_new <= 30)
+			{
+				return true;
+			}
 	
 			if (s_new >= 0)
 			{
@@ -1267,11 +2043,14 @@ var RTOOLBAR = {};
 			var min_w = 1;
 			var min_h = 1;
 
-			$(resize).hover(function(){$(resize).css('cursor', 'nw-resize');}, function(){$(resize).css('cursor','default');clicked=false;});
+			$(resize).hover(function() { $(resize).css('cursor', 'nw-resize'); }, function() { $(resize).css('cursor','default'); clicked=false; });
 
 			$(resize).mousedown(function(e)
 			{
-				if (e.preventDefault) e.preventDefault();
+				if (e.preventDefault)
+				{
+					e.preventDefault();
+				}
 
 				clicked = true;
 				clicker = true;
@@ -1284,11 +2063,16 @@ var RTOOLBAR = {};
 			{
 				clicked = false;
 				this.syncCode();
+				if (this.opts.autoresize === true) this.setAutoSize(false);
+				
 			}, this));
 			
 			$(resize).click($.proxy(function(e)
 			{
-				if (clicker) this.imageEdit(e);
+				if (clicker)
+				{
+					this.imageEdit(e);
+				}
 	
 			}, this));
 
@@ -1303,13 +2087,17 @@ var RTOOLBAR = {};
 					
 					var div_h = $(resize).height();
 					
-					var new_h = parseInt(div_h)+mouse_y;
+					var new_h = parseInt(div_h, 10) + mouse_y;
 					var new_w = new_h*ratio;
 					
-					
-					
-					if(x==1 || (typeof(x) == "number" && new_w < x && new_w > min_w) ){ $(resize).width(new_w); }
-					if(y==1 || (typeof(y) == "number" && new_h < y && new_h > min_h) ){ $(resize).height(new_h); }
+					if (x === 1 || (typeof(x) === "number" && new_w < x && new_w > min_w))
+					{
+						$(resize).width(new_w);
+					}
+					if (y === 1 || (typeof(y) === "number" && new_h < y && new_h > min_h))
+					{
+						$(resize).height(new_h);
+					}
 					start_x = Math.round(e.pageX - $(this).eq(0).offset().left);
 					start_y = Math.round(e.pageY - $(this).eq(0).offset().top);
 				}
@@ -1319,12 +2107,16 @@ var RTOOLBAR = {};
 		// TABLE
 		showTable: function()
 		{
-			this.modalInit(RLANG.table, this.opts.path + '/plugins/table.html', 300, $.proxy(function()
-			{
-				$('#redactor_table_rows').focus();
-				$('#redactor_insert_table_btn').click($.proxy(this.insertTable, this));
-
-			}, this));
+			this.modalInit(RLANG.table, 'table', 300, $.proxy(function()
+				{				
+					$('#redactor_insert_table_btn').click($.proxy(this.insertTable, this));
+				}, this),
+				
+				function()
+				{
+					$('#redactor_table_rows').focus();
+				}			
+			);
 		},
 		insertTable: function()
 		{
@@ -1350,14 +2142,22 @@ var RTOOLBAR = {};
 			$(table_box).append(table);
 			var html = $(table_box).html();
 			
-			if ($.browser.msie) html += '<p></p>';
-			else html += '<p>&nbsp;</p>';
+			if ($.browser.msie)
+			{
+				html += '<p></p>';
+			}
+			else
+			{
+				html += '<p>&nbsp;</p>';
+			}
 
 			this.execCommand('inserthtml', html);
 			this.modalClose();
 			
 			this.$table = $(this.doc).find('body').find('#table' + tableid);
 			this.$table.click($.proxy(this.tableObserver, this));
+			
+			if (this.opts.autoresize === true) this.setAutoSize(false);
 		},
 		tableObserver: function(e)
 		{
@@ -1400,7 +2200,10 @@ var RTOOLBAR = {};
 		},
 		addHead: function()
 		{
-			if ($(this.$table).find('thead').size() !== 0) this.deleteHead();
+			if ($(this.$table).find('thead').size() !== 0)
+			{
+				this.deleteHead();
+			}
 			else
 			{
 				var tr = $(this.$table).find('tr').first().clone();
@@ -1437,8 +2240,14 @@ var RTOOLBAR = {};
 		{
 			var new_tr = $(this.$current_tr).clone();
 			new_tr.find('td').html('&nbsp;');
-			if (type == 'after') $(this.$current_tr).after(new_tr);
-			else $(this.$current_tr).before(new_tr);
+			if (type === 'after')
+			{
+				$(this.$current_tr).after(new_tr);
+			}
+			else
+			{
+				$(this.$current_tr).before(new_tr);
+			}
 
 			this.syncCode();
 		},
@@ -1450,7 +2259,10 @@ var RTOOLBAR = {};
 
 			this.$current_tr.find('td').each(function(i,s)
 			{
-				if ($(s).hasClass('current')) index = i;
+				if ($(s).hasClass('current'))
+				{
+					index = i;
+				}
 			});
 
 			this.$table_tr.each(function(i,s)
@@ -1460,8 +2272,14 @@ var RTOOLBAR = {};
 				var td = current.clone();
 				td.html('&nbsp;');
 				
-				if (type == 'after') $(current).after(td);
-				else $(current).before(td);
+				if (type === 'after')
+				{
+					$(current).after(td);
+				}
+				else
+				{
+					$(current).before(td);
+				}
 
 			});
 
@@ -1471,27 +2289,39 @@ var RTOOLBAR = {};
 		// INSERT VIDEO
 		showVideo: function()
 		{
-			if ($.browser.msie) this.markerIE();
-
-			this.modalInit(RLANG.video, this.opts.path + '/plugins/video.html', 600, $.proxy(function()
+			if ($.browser.msie)
 			{
-				$('#redactor_insert_video_area').focus();
-				$('#redactor_insert_video_btn').click($.proxy(this.insertVideo, this));
+				this.markerIE();
+			}
 
-			}, this));
+			this.modalInit(RLANG.video, 'video', 600, $.proxy(function()
+				{
+					$('#redactor_insert_video_btn').click($.proxy(this.insertVideo, this));
+				}, this),
+				
+				function()
+				{
+					$('#redactor_insert_video_area').focus();
+				}
+			);
 		},
 		insertVideo: function()
 		{
 			var data = $('#redactor_insert_video_area').val();
+			data = this.stripTags(data);
 
 			if ($.browser.msie)
 			{
 				$(this.doc.getElementById('span' + this.spanid)).after(data).remove();
 				this.syncCode();
 			}
-			else this.execCommand('inserthtml', data);
+			else
+			{
+				this.execCommand('inserthtml', data);
+			}
 
 			this.modalClose();
+			if (this.opts.autoresize === true) this.setAutoSize(false);
 		},
 
 		// INSERT IMAGE
@@ -1506,14 +2336,17 @@ var RTOOLBAR = {};
 				$('#redactor_image_edit_src').attr('href', $el.attr('src'));
 				$('#redactor_form_image_align').val($el.css('float'));
 
-				if ($(parent).get(0).tagName == 'A') $('#redactor_file_link').val($(parent).attr('href'));
+				if ($(parent).get(0).tagName === 'A')
+				{
+					$('#redactor_file_link').val($(parent).attr('href'));
+				}
 
 				$('#redactor_image_delete_btn').click($.proxy(function() { this.imageDelete($el); }, this));
 				$('#redactorSaveBtn').click($.proxy(function() { this.imageSave($el); }, this));
 
 			}, this);
 
-			this.modalInit(RLANG.image, this.opts.path + '/plugins/image_edit.html', 380,  handler);
+			this.modalInit(RLANG.image, 'image_edit', 380,  handler);
 
 		},
 		imageDelete: function(el)
@@ -1530,15 +2363,24 @@ var RTOOLBAR = {};
 	
 			var floating = $('#redactor_form_image_align').val();
 		
-			if (floating == 'left') $(el).css({ 'float': 'left', margin: '0 10px 10px 0' });
-			else if (floating == 'right') $(el).css({ 'float': 'right', margin: '0 0 10px 10px' });
-			else $(el).css({ 'float': 'none', margin: '0' });
+			if (floating === 'left')
+			{
+				$(el).css({ 'float': 'left', margin: '0 10px 10px 0' });
+			}
+			else if (floating === 'right')
+			{
+				$(el).css({ 'float': 'right', margin: '0 0 10px 10px' });
+			}
+			else
+			{
+				$(el).css({ 'float': 'none', margin: '0' });
+			}
 			
 			// as link
 			var link = $.trim($('#redactor_file_link').val());
 			if (link !== '')
 			{
-				if ($(parent).get(0).tagName != 'A')
+				if ($(parent).get(0).tagName !== 'A')
 				{
 					$(el).replaceWith('<a href="' + link + '">' + this.outerHTML(el) + '</a>');
 				}
@@ -1555,7 +2397,10 @@ var RTOOLBAR = {};
 		},
 		showImage: function()
 		{
-			if ($.browser.msie) this.markerIE();
+			if ($.browser.msie)
+			{
+				this.markerIE();
+			}
 
 			var handler = $.proxy(function()
 			{
@@ -1606,7 +2451,7 @@ var RTOOLBAR = {};
 					{
 						var tabs = $('#redactor_tabs a');
 						tabs.eq(0).remove();
-						tabs.eq(1).addClass('redactor_tabs_act');						
+						tabs.eq(1).addClass('redactor_tabs_act');
 						$('#redactor_tab2').show();
 					}
 				}
@@ -1614,31 +2459,50 @@ var RTOOLBAR = {};
 				$('#redactor_upload_btn').click($.proxy(this.imageUploadCallbackLink, this));
 
 			}, this);
+			
+			var endCallback = $.proxy(function()
+			{
+				if (this.opts.imageUpload === false && this.opts.imageGetJson === false)
+				{
+					$('#redactor_file_link').focus();
+				}				
+			}, this);
 	
-			this.modalInit(RLANG.image, this.opts.path + '/plugins/image.html', 570, handler, true);
+			this.modalInit(RLANG.image, 'image', 570, handler, endCallback, true);
 
 		},
 		imageSetThumb: function(e)
 		{
-			this._imageSet('<img alt="" src="' + $(e.target).attr('rel') + '" />');
+			this._imageSet('<img alt="" src="' + $(e.target).attr('rel') + '" />', true);
 		},
 		imageUploadCallbackLink: function()
 		{
 			if ($('#redactor_file_link').val() !== '')
 			{
-				var data = '<img src="' + $('#redactor_file_link').val() + '" />';
-				
-				this._imageSet(data);
+				var data = '<img src="' + $('#redactor_file_link').val() + '" />';				
+				this._imageSet(data, true);
+			}
+			else
+			{
+				this.modalClose();
 			}
-			else this.modalClose();
 		},
 		imageUploadCallback: function(data)
 		{        
 			this._imageSet(data);
 		},
-		_imageSet: function(html)
+		_imageSet: function(json, link)
 		{
-			html = '<p>' + html + '</p>';
+			var html = '', data = '';
+			if (link !== true)
+			{
+				data = $.parseJSON(json);		
+				html = '<p><img src="' + data.filelink + '" /></p>';
+			}
+			else
+			{
+				html = json;
+			}
 		
 			this.focus();
 			
@@ -1652,7 +2516,16 @@ var RTOOLBAR = {};
 				this.execCommand('inserthtml', html);
 			}
 		
+			// upload image callback
+			if (link !== true && typeof this.opts.imageUploadCallback === 'function') 
+			{
+				this.opts.imageUploadCallback(this, data);
+			}
+			
 			this.modalClose();
+			
+			if (this.opts.autoresize === true) this.setAutoSize(false);
+			
 			this.observeImages();
 		},
 	
@@ -1662,106 +2535,118 @@ var RTOOLBAR = {};
 			var handler = $.proxy(function()
 			{
 				var sel = this.getSelection();
+				var url = '', text = '';
 				
 				if ($.browser.msie)
 				{
 					var parent = this.getParentNode();
-					if (parent.nodeName == 'A')
+					if (parent.nodeName === 'A')
 					{
 						this.insert_link_node = $(parent);
-						var text = this.insert_link_node.text();
-						var url = this.insert_link_node.attr('href');
+						text = this.insert_link_node.text();
+						url = this.insert_link_node.attr('href');
 					}
 					else
 					{
-						if (this.oldIE()) var text = sel.text;
-						else var text = sel.toString();
-						
-						var url = '';
-
+						if (this.oldIE())
+						{
+							text = sel.text;
+						}
+						else
+						{
+							text = sel.toString();
+						}
+	
 						this.spanid = Math.floor(Math.random() * 99999);
 		
 						var html = '<span id="span' + this.spanid + '">' + text + '</span>';
-						if (text != '') html = '<span id="span' + this.spanid + '">' + text + '</span>';
+						
+						if (text !== '')
+						{
+							html = '<span id="span' + this.spanid + '">' + text + '</span>';
+						}
+						
 						this.execCommand('inserthtml', html);
 					}
 				}
 				else
-				{
-					if (sel && sel.anchorNode.parentNode.tagName == 'A')
+				{					
+					if (sel && sel.anchorNode && sel.anchorNode.parentNode.tagName === 'A')
 					{
-						var url = sel.anchorNode.parentNode.href;
-						var text = sel.anchorNode.parentNode.text;
-						if (sel.toString() === '') this.insert_link_node = sel.anchorNode.parentNode;
+						url = sel.anchorNode.parentNode.href;
+						text = sel.anchorNode.parentNode.text;
+						if (sel.toString() === '')
+						{
+							this.insert_link_node = sel.anchorNode.parentNode;
+						}
 					}
 					else
 					{
-						var text = sel.toString();
-						var url = '';
+						text = sel.toString();
+						url = '';
 					}
 				}
 				
 				$('.redactor_link_text').val(text);
-				$('#redactor_link_url').val(url).focus();
 				
-				$('#redactor_insert_link_btn').click($.proxy(this.insertLink, this));
+				var turl = url.replace(top.location.href, '');
 				
-				if (this.opts.linkFileUpload === false)
+				if (url.search('mailto:') === 0)
 				{
-					$('#redactor_tabs a').eq(3).remove();
+					this.setModalTab(2);
+
+					$('#redactor_tab_selected').val(2);								
+					$('#redactor_link_mailto').val(url.replace('mailto:', ''));
 				}
-				else
+				else if (turl.search(/^#/gi) === 0)
 				{
-					// dragupload
-					if ($('#redactor_file').size() != 0) 
-					{
-						$('#redactor_file').dragupload(
-						{
-							url: this.opts.linkFileUpload,
-							success: $.proxy(this.insertLinkFile, this)
-						});
-					}
-	
-					// ajax upload
-					this.uploadInit('redactor_file', { auto: true, url: this.opts.linkFileUpload, success: $.proxy(this.insertLinkFile, this)  });
+					this.setModalTab(3);	
+					
+					$('#redactor_tab_selected').val(3);								
+					$('#redactor_link_anchor').val(turl.replace(/^#/gi, ''));									
 				}
+				else
+				{					
+					$('#redactor_link_url').val(url);
+				}
+				
+				$('#redactor_insert_link_btn').click($.proxy(this.insertLink, this));
+				
 
 			}, this);
 			
-			this.modalInit(RLANG.link, this.opts.path + '/plugins/link.html', 460, handler);
+			var endCallback = function(url)
+			{
+				$('#redactor_link_url').focus();
+			};
+			
+			this.modalInit(RLANG.link, 'link', 460, handler, endCallback);
 
 		},
 		insertLink: function()
 		{
 			var tab_selected = $('#redactor_tab_selected').val();
-			
 			var link = '', text = '';
 			
-			if (tab_selected == 1) // url
+			if (tab_selected === '1') // url
 			{
 				link = $('#redactor_link_url').val();
 				text = $('#redactor_link_url_text').val();
 			}
-			else if (tab_selected == 2) // mailto
+			else if (tab_selected === '2') // mailto
 			{
 				link = 'mailto:' + $('#redactor_link_mailto').val();
 				text = $('#redactor_link_mailto_text').val();
 			}
-			else if (tab_selected == 3) // anchor
+			else if (tab_selected === '3') // anchor
 			{
 				link = '#' + $('#redactor_link_anchor').val();
 				text = $('#redactor_link_anchor_text').val();
-			}
+			}			
 
 			this._insertLink('<a href="' + link + '">' +  text + '</a> ', $.trim(text), link);
 
 		},
-		insertLinkFile: function(data)
-		{
-			text = $('#redactor_link_file_text').val();
-
-			this._insertLink('<a href="' + data + '">' +  text + '</a> ', $.trim(text), data);
-		},
 		_insertLink: function(a, text, link)
 		{
 			if (text != '')
@@ -1779,7 +2664,10 @@ var RTOOLBAR = {};
 						$(this.doc.getElementById('span' + this.spanid)).replaceWith(a);
 						this.syncCode();
 					}
-					else this.execCommand('inserthtml', a);
+					else
+					{
+						this.execCommand('inserthtml', a);
+					}
 				}
 			}
 
@@ -1789,10 +2677,28 @@ var RTOOLBAR = {};
 		// INSERT FILE
 		showFile: function()
 		{
-			if ($.browser.msie) this.markerIE();
+			if ($.browser.msie)
+			{
+				this.markerIE();
+			}
 
 			var handler = $.proxy(function()
 			{
+				var sel = this.getSelection();
+			
+				var text = '';
+				
+				if (this.oldIE())
+				{
+					text = sel.text;
+				}				
+				else
+				{
+					text = sel.toString();
+				}
+
+				$('#redactor_filename').val(text);
+						
 				$('#redactor_file').dragupload(
 				{
 					url: this.opts.fileUpload, 
@@ -1809,30 +2715,60 @@ var RTOOLBAR = {};
 				}, this)});
 			}, this);
 
-			this.modalInit(RLANG.file, this.opts.path + '/plugins/file.html', 500, handler);
+			this.modalInit(RLANG.file, 'file', 500, handler);
 		},
-		fileUploadCallback: function(data)
+		fileUploadCallback: function(json)
 		{
+			var data = $.parseJSON(json);
+			var text = $('#redactor_filename').val();
+			
+			if (text === '')
+			{
+				text = data.filename;
+			}
+			
+			var link = '<a href="' + data.filelink + '">' + text + '</a>';
+		
 			// chrome fix
-			if ($.browser.webkit && !!window.chrome) data = data + '&nbsp;'; 
+			if ($.browser.webkit && !!window.chrome)
+			{
+				link = link + '&nbsp;'; 
+			}
 
 			if ($.browser.msie) 
 			{
-				$(this.doc.getElementById('span' + this.spanid)).after(data).remove();
+				if (text !== '')
+				{
+					$(this.doc.getElementById('span' + this.spanid)).replaceWith(link);
+				}
+				else
+				{
+					$(this.doc.getElementById('span' + this.spanid)).after(link).remove();
+				}
+				
 				this.syncCode();
 			}
-			else this.execCommand('inserthtml', data);
+			else
+			{
+				this.execCommand('inserthtml', link);
+			}
 
+			// file upload callback
+			if (typeof this.opts.fileUploadCallback === 'function') 
+			{
+				this.opts.fileUploadCallback(this, data);
+			}
+			
 			this.modalClose();
 		},	
 	
 		
 		
 		// MODAL
-		modalInit: function(title, url, width, handler, scroll)
+		modalInit: function(title, url, width, handler, endCallback, scroll)
 		{
 			// modal overlay
-			if ($('#redactor_modal_overlay').size() == 0)
+			if ($('#redactor_modal_overlay').size() === 0)
 			{
 				this.overlay = $('<div id="redactor_modal_overlay" style="display: none;"></div>');
 				$('body').prepend(this.overlay);
@@ -1844,7 +2780,7 @@ var RTOOLBAR = {};
 				$('#redactor_modal_overlay').click($.proxy(this.modalClose, this));
 			}
 
-			if ($('#redactor_modal').size() == 0)
+			if ($('#redactor_modal').size() === 0)
 			{
 				this.modal = $('<div id="redactor_modal" style="display: none;"><div id="redactor_modal_close">&times;</div><div id="redactor_modal_header"></div><div id="redactor_modal_inner"></div></div>');
 				$('body').append(this.modal);
@@ -1852,64 +2788,58 @@ var RTOOLBAR = {};
 
 			$('#redactor_modal_close').click($.proxy(this.modalClose, this));
 
-			this.hdlModalClose = $.proxy(function(e) { if( e.keyCode == 27) this.modalClose(); }, this);
+			this.hdlModalClose = $.proxy(function(e) { if ( e.keyCode === 27) { this.modalClose(); } }, this);
 			
 			$(document).keyup(this.hdlModalClose);
 			$(this.doc).keyup(this.hdlModalClose);
 
-			$.ajax({
-				dataType: 'html',
-				type: 'get',
-				url: url,
-				success: $.proxy(function(data)
+			$('#redactor_modal_inner').html(this.opts['modal_' + url]);
+			$('#redactor_modal_header').html(title);
+							
+			// tabs
+			if ($('#redactor_tabs').size() !== 0)
+			{
+				$('#redactor_tabs a').each(function(i,s)
 				{
-					// parse lang
-					$.each(RLANG, function(i,s)
+					i++;
+					$(s).click(function()
 					{
-						var re = new RegExp("%RLANG\." + i + "%","gi");
-						data = data.replace(re, s);
+						$('#redactor_tabs a').removeClass('redactor_tabs_act');
+						$(this).addClass('redactor_tabs_act');
+						$('.redactor_tab').hide();
+						$('#redactor_tab' + i).show();
+						$('#redactor_tab_selected').val(i);
+						
+						var height = $('#redactor_modal').outerHeight();
+						$('#redactor_modal').css('margin-top', '-' + (height+10)/2 + 'px');
 					});
+				});
+			}
 
-					$('#redactor_modal_inner').html(data);
-					$('#redactor_modal_header').html(title);
-					
-					// tabs
-					if ($('#redactor_tabs').size() != 0)
-					{
-						$('#redactor_tabs a').each(function(i,s)
-						{
-							i++;
-							$(s).click(function()
-							{
-								$('#redactor_tabs a').removeClass('redactor_tabs_act');
-								$(this).addClass('redactor_tabs_act');
-								$('.redactor_tab').hide();
-								$('#redactor_tab' + i).show();
-								$('#redactor_tab_selected').val(i);
-								
-								var height = $('#redactor_modal').outerHeight();
-								$('#redactor_modal').css('margin-top', '-' + (height+10)/2 + 'px');
-							});
-						});
-					}
+			$('#redactor_btn_modal_close').click($.proxy(this.modalClose, this));
+			
+			// callback
+			if (typeof(handler) === 'function')
+			{
+				handler();
+			}
+			
+			// setup
+			var height = $('#redactor_modal').outerHeight();
+							
+			$('#redactor_modal').css({ width: width + 'px', height: 'auto', marginTop: '-' + (height+10)/2 + 'px', marginLeft: '-' + (width+60)/2 + 'px' }).fadeIn('fast');
 
-					$('#redactor_btn_modal_close').click($.proxy(this.modalClose, this));
-					
-					// callback
-					if (typeof(handler) == 'function') handler();
-					
-					// setup
-					var height = $('#redactor_modal').outerHeight();
-									
-					$('#redactor_modal').css({ width: width + 'px', height: 'auto', marginTop: '-' + (height+10)/2 + 'px', marginLeft: '-' + (width+60)/2 + 'px' }).fadeIn('fast');
+			// end callback
+			if (typeof(endCallback) === 'function')
+			{
+				endCallback();
+			}
 
-					if (scroll === true)
-					{
-						$('#redactor_image_box').height(300).css('overflow', 'auto');
-					}					
+			if (scroll === true)
+			{
+				$('#redactor_image_box').height(300).css('overflow', 'auto');
+			}
 
-				}, this)
-			});
 		},
 		modalClose: function()
 		{
@@ -1931,6 +2861,14 @@ var RTOOLBAR = {};
 			}, this));
 
 		},
+		setModalTab: function(num)
+		{
+			$('.redactor_tab').hide();
+			var tabs = $('#redactor_tabs a');
+			tabs.removeClass('redactor_tabs_act');
+			tabs.eq(num-1).addClass('redactor_tabs_act');
+			$('#redactor_tab' + num).show();			
+		},
 
 		// UPLOAD
 		uploadInit: function(element, options)
@@ -1948,7 +2886,7 @@ var RTOOLBAR = {};
 			$.extend(this.uploadOptions, options);
 	
 			// Test input or form
-			if ($('#' + element).size() != 0 && $('#' + element).get(0).tagName == 'INPUT')
+			if ($('#' + element).size() !== 0 && $('#' + element).get(0).tagName === 'INPUT')
 			{
 				this.uploadOptions.input = $('#' + element);
 				this.element = $($('#' + element).get(0).form);
@@ -1989,7 +2927,10 @@ var RTOOLBAR = {};
 			document.body.appendChild(d);
 		
 			// Start
-			if (this.uploadOptions.start) this.uploadOptions.start();
+			if (this.uploadOptions.start)
+			{
+				this.uploadOptions.start();
+			}
 		
 			$('#' + this.id).load($.proxy(this.uploadLoaded, this));
 		
@@ -2029,15 +2970,31 @@ var RTOOLBAR = {};
 		uploadLoaded : function()
 		{
 			var i = $('#' + this.id);
-
-			if (i.contentDocument) var d = i.contentDocument;
-			else if (i.contentWindow) var d = i.contentWindow.document;
-			else var d = window.frames[this.id].document;
+			var d;
+			
+			if (i.contentDocument)
+			{
+				d = i.contentDocument;
+			}
+			else if (i.contentWindow)
+			{
+				d = i.contentWindow.document;
+			}
+			else
+			{
+				d = window.frames[this.id].document;
+			}
 			
-			if (d.location.href == "about:blank") return true;
+			if (d.location.href === "about:blank")
+			{
+				return true;
+			}
 			
 			// Success
-			if (this.uploadOptions.success) this.uploadOptions.success(d.body.innerHTML);
+			if (this.uploadOptions.success)
+			{
+				this.uploadOptions.success(d.body.innerHTML);
+			}
 		
 			this.element.attr('action', this.element_action);
 			this.element.attr('target', '');
@@ -2052,7 +3009,11 @@ var RTOOLBAR = {};
 		},
 		oldIE: function()
 		{
-			if ($.browser.msie && parseInt($.browser.version, 10) < 9) return true;
+			if ($.browser.msie && parseInt($.browser.version, 10) < 9)
+			{
+				return true;
+			}
+			
 			return false;
 		},
 		outerHTML: function(s) 
@@ -2061,7 +3022,7 @@ var RTOOLBAR = {};
 		},
 		normalize: function(str)
 		{
-			return parseInt(str.replace('px',''));
+			return parseInt(str.replace('px',''), 10);
 		}
 
 	};
@@ -2088,6 +3049,11 @@ var RTOOLBAR = {};
 		return this.data('redactor').getCode();
 	};
 	
+	$.fn.getText = function() 
+	{
+		return this.data('redactor').$editor.text();	
+	};	
+	
 	$.fn.setCode = function(html)
 	{
 		this.data('redactor').setCode(html);
@@ -2103,7 +3069,7 @@ var RTOOLBAR = {};
 		this.data('redactor').destroy();
 		this.removeData('redactor');
 	};
-	
+
 	$.fn.setFocus = function()
 	{
 		this.data('redactor').focus();
@@ -2123,6 +3089,8 @@ var RTOOLBAR = {};
 */
 (function($){
 	
+	"use strict";
+	
 	// Initialization	
 	$.fn.dragupload = function(options)
 	{		
@@ -2171,6 +3139,22 @@ var RTOOLBAR = {};
 				// drag leave
 				this.dropareabox.bind('dragleave', $.proxy(function() { return this.ondragleave(); }, this));
 		
+				var uploadProgress = $.proxy(function(e) 
+				{ 
+					var percent = parseInt(e.loaded / e.total * 100, 10);
+					this.dropareabox.text('Loading ' + percent + '%');
+					
+				}, this);
+		
+				var xhr = jQuery.ajaxSettings.xhr();
+				
+				if (xhr.upload)
+				{
+					xhr.upload.addEventListener('progress', uploadProgress, false);
+				}
+				
+				var provider = function () { return xhr; };
+		
 				// drop
 				this.dropareabox.get(0).ondrop = $.proxy(function(event)
 				{
@@ -2187,15 +3171,23 @@ var RTOOLBAR = {};
 						dataType: 'html',
 						url: this.opts.url,
 						data: fd,
-						//xhr: provider,
+						xhr: provider,
 						cache: false,
 						contentType: false,
 						processData: false,
 						type: 'POST',
 						success: $.proxy(function(data)
 						{
-							if (this.opts.success !== false) this.opts.success(data);
-							if (this.opts.preview === true) this.dropareabox.html(data);
+							if (this.opts.success !== false)
+							{
+								this.opts.success(data);
+							}
+							
+							if (this.opts.preview === true)
+							{
+								this.dropareabox.html(data);
+							}
+							
 						}, this)
 					});
 
@@ -2220,6 +3212,8 @@ var RTOOLBAR = {};
 // Define: Linkify plugin from stackoverflow
 (function($){
 
+	"use strict";
+
 	var url1 = /(^|&lt;|\s)(www\..+?\..+?)(\s|&gt;|$)/g,
 	url2 = /(^|&lt;|\s)(((https?|ftp):\/\/|mailto:).+?)(\s|&gt;|$)/g,
 
@@ -2230,7 +3224,7 @@ var RTOOLBAR = {};
 			while(i--)
 			{
 				var n = childNodes[i];
-				if (n.nodeType == 3) 
+				if (n.nodeType === 3) 
 				{
 					var html = n.nodeValue;
 					if (html)
@@ -2244,7 +3238,7 @@ var RTOOLBAR = {};
 						$(n).after(html).remove();
 					}
 				}
-				else if (n.nodeType == 1  &&  !/^(a|button|textarea)$/i.test(n.tagName))
+				else if (n.nodeType === 1  &&  !/^(a|button|textarea)$/i.test(n.tagName))
 				{
 					linkifyThis.call(n);
 				}