Update to TinyMCE 3.5.6

21 files changed, 3817 insertions, 3776 deletions

diff --git a/program/js/tiny_mce/plugins/advimage/js/image.js b/program/js/tiny_mce/plugins/advimage/js/image.js
index 546b69c0d..f0b7c6eef 100644
--- a/program/js/tiny_mce/plugins/advimage/js/image.js
+++ b/program/js/tiny_mce/plugins/advimage/js/image.js
@@ -395,12 +395,14 @@ var ImageDialog = {
 					if (v == '0')

 						img.style.border = isIE ? '0' : '0 none none';

 					else {

-						if (b.length == 3 && b[isIE ? 2 : 1])

-							bStyle = b[isIE ? 2 : 1];

+						var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);

+

+						if (b.length == 3 && b[isOldIE ? 2 : 1])

+							bStyle = b[isOldIE ? 2 : 1];

 						else if (!bStyle || bStyle == 'none')

 							bStyle = 'solid';

 						if (b.length == 3 && b[isIE ? 0 : 2])

-							bColor = b[isIE ? 0 : 2];

+							bColor = b[isOldIE ? 0 : 2];

 						else if (!bColor || bColor == 'none')

 							bColor = 'black';

 						img.style.border = v + 'px ' + bStyle + ' ' + bColor;

diff --git a/program/js/tiny_mce/plugins/autolink/editor_plugin.js b/program/js/tiny_mce/plugins/autolink/editor_plugin.js
index 9662b50bc..d1c3502ac 100644
--- a/program/js/tiny_mce/plugins/autolink/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/autolink/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);i.nodeChanged();if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}if(n.nodeType==3){a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);i.nodeChanged();if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/autolink/editor_plugin_src.js b/program/js/tiny_mce/plugins/autolink/editor_plugin_src.js
index 0c5ea1c82..c05fbbc09 100644
--- a/program/js/tiny_mce/plugins/autolink/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/autolink/editor_plugin_src.js
@@ -1,181 +1,184 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2011, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function() {

-	tinymce.create('tinymce.plugins.AutolinkPlugin', {

-	/**

-	* Initializes the plugin, this will be executed after the plugin has been created.

-	* This call is done before the editor instance has finished it's initialization so use the onInit event

-	* of the editor instance to intercept that event.

-	*

-	* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

-	* @param {string} url Absolute URL to where the plugin is located.

-	*/

-

-	init : function(ed, url) {

-		var t = this;

-

-		// Add a key down handler

-		ed.onKeyDown.addToTop(function(ed, e) {

-			if (e.keyCode == 13)

-				return t.handleEnter(ed);

-		});

-

-		// Internet Explorer has built-in automatic linking for most cases

-		if (tinyMCE.isIE)

-			return;

-

-		ed.onKeyPress.add(function(ed, e) {

-			if (e.which == 41)

-				return t.handleEclipse(ed);

-		});

-

-		// Add a key up handler

-		ed.onKeyUp.add(function(ed, e) {

-			if (e.keyCode == 32)

-				return t.handleSpacebar(ed);

-			});

-	       },

-

-		handleEclipse : function(ed) {

-			this.parseCurrentLine(ed, -1, '(', true);

-		},

-

-		handleSpacebar : function(ed) {

-			 this.parseCurrentLine(ed, 0, '', true);

-		 },

-

-		handleEnter : function(ed) {

-			this.parseCurrentLine(ed, -1, '', false);

-		},

-

-		parseCurrentLine : function(ed, end_offset, delimiter, goback) {

-			var r, end, start, endContainer, bookmark, text, matches, prev, len;

-

-			// We need at least five characters to form a URL,

-			// hence, at minimum, five characters from the beginning of the line.

-			r = ed.selection.getRng(true).cloneRange();

-			if (r.startOffset < 5) {

-				// During testing, the caret is placed inbetween two text nodes. 

-				// The previous text node contains the URL.

-				prev = r.endContainer.previousSibling;

-				if (prev == null) {

-					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)

-						return;

-

-					prev = r.endContainer.firstChild.nextSibling;

-				}

-				len = prev.length;

-				r.setStart(prev, len);

-				r.setEnd(prev, len);

-

-				if (r.endOffset < 5)

-					return;

-

-				end = r.endOffset;

-				endContainer = prev;

-			} else {

-				endContainer = r.endContainer;

-

-				// Get a text node

-				if (endContainer.nodeType != 3 && endContainer.firstChild) {

-					while (endContainer.nodeType != 3 && endContainer.firstChild)

-						endContainer = endContainer.firstChild;

-

-					r.setStart(endContainer, 0);

-					r.setEnd(endContainer, endContainer.nodeValue.length);

-				}

-

-				if (r.endOffset == 1)

-					end = 2;

-				else

-					end = r.endOffset - 1 - end_offset;

-			}

-

-			start = end;

-

-			do

-			{

-				// Move the selection one character backwards.

-				r.setStart(endContainer, end - 2);

-				r.setEnd(endContainer, end - 1);

-				end -= 1;

-

-				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0

-			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);

-

-			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {

-				r.setStart(endContainer, end);

-				r.setEnd(endContainer, start);

-				end += 1;

-			} else if (r.startOffset == 0) {

-				r.setStart(endContainer, 0);

-				r.setEnd(endContainer, start);

-			}

-			else {

-				r.setStart(endContainer, end);

-				r.setEnd(endContainer, start);

-			}

-

-			// Exclude last . from word like "www.site.com."

-			var text = r.toString();

-			if (text.charAt(text.length - 1) == '.') {

-				r.setEnd(endContainer, start - 1);

-			}

-

-			text = r.toString();

-			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);

-

-			if (matches) {

-				if (matches[1] == 'www.') {

-					matches[1] = 'http://www.';

-				} else if (/@$/.test(matches[1]) && !/^mailto:/.test(matches[1])) {

-					matches[1] = 'mailto:' + matches[1];

-				}

-

-				bookmark = ed.selection.getBookmark();

-

-				ed.selection.setRng(r);

-				tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);

-				ed.selection.moveToBookmark(bookmark);

-				ed.nodeChanged();

-

-				// TODO: Determine if this is still needed.

-				if (tinyMCE.isWebKit) {

-					// move the caret to its original position

-					ed.selection.collapse(false);

-					var max = Math.min(endContainer.length, start + 1);

-					r.setStart(endContainer, max);

-					r.setEnd(endContainer, max);

-					ed.selection.setRng(r);

-				}

-			}

-		},

-

-		/**

-		* Returns information about the plugin as a name/value array.

-		* The current keys are longname, author, authorurl, infourl and version.

-		*

-		* @return {Object} Name/value array containing information about the plugin.

-		*/

-		getInfo : function() {

-			return {

-				longname : 'Autolink',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);

-})();

+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AutolinkPlugin', {
+	/**
+	* Initializes the plugin, this will be executed after the plugin has been created.
+	* This call is done before the editor instance has finished it's initialization so use the onInit event
+	* of the editor instance to intercept that event.
+	*
+	* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+	* @param {string} url Absolute URL to where the plugin is located.
+	*/
+
+	init : function(ed, url) {
+		var t = this;
+
+		// Add a key down handler
+		ed.onKeyDown.addToTop(function(ed, e) {
+			if (e.keyCode == 13)
+				return t.handleEnter(ed);
+		});
+
+		// Internet Explorer has built-in automatic linking for most cases
+		if (tinyMCE.isIE)
+			return;
+
+		ed.onKeyPress.add(function(ed, e) {
+			if (e.which == 41)
+				return t.handleEclipse(ed);
+		});
+
+		// Add a key up handler
+		ed.onKeyUp.add(function(ed, e) {
+			if (e.keyCode == 32)
+				return t.handleSpacebar(ed);
+			});
+	       },
+
+		handleEclipse : function(ed) {
+			this.parseCurrentLine(ed, -1, '(', true);
+		},
+
+		handleSpacebar : function(ed) {
+			 this.parseCurrentLine(ed, 0, '', true);
+		 },
+
+		handleEnter : function(ed) {
+			this.parseCurrentLine(ed, -1, '', false);
+		},
+
+		parseCurrentLine : function(ed, end_offset, delimiter, goback) {
+			var r, end, start, endContainer, bookmark, text, matches, prev, len;
+
+			// We need at least five characters to form a URL,
+			// hence, at minimum, five characters from the beginning of the line.
+			r = ed.selection.getRng(true).cloneRange();
+			if (r.startOffset < 5) {
+				// During testing, the caret is placed inbetween two text nodes. 
+				// The previous text node contains the URL.
+				prev = r.endContainer.previousSibling;
+				if (prev == null) {
+					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
+						return;
+
+					prev = r.endContainer.firstChild.nextSibling;
+				}
+				len = prev.length;
+				r.setStart(prev, len);
+				r.setEnd(prev, len);
+
+				if (r.endOffset < 5)
+					return;
+
+				end = r.endOffset;
+				endContainer = prev;
+			} else {
+				endContainer = r.endContainer;
+
+				// Get a text node
+				if (endContainer.nodeType != 3 && endContainer.firstChild) {
+					while (endContainer.nodeType != 3 && endContainer.firstChild)
+						endContainer = endContainer.firstChild;
+
+					// Move range to text node
+					if (endContainer.nodeType == 3) {
+						r.setStart(endContainer, 0);
+						r.setEnd(endContainer, endContainer.nodeValue.length);
+					}
+				}
+
+				if (r.endOffset == 1)
+					end = 2;
+				else
+					end = r.endOffset - 1 - end_offset;
+			}
+
+			start = end;
+
+			do
+			{
+				// Move the selection one character backwards.
+				r.setStart(endContainer, end - 2);
+				r.setEnd(endContainer, end - 1);
+				end -= 1;
+
+				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0
+			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
+
+			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
+				r.setStart(endContainer, end);
+				r.setEnd(endContainer, start);
+				end += 1;
+			} else if (r.startOffset == 0) {
+				r.setStart(endContainer, 0);
+				r.setEnd(endContainer, start);
+			}
+			else {
+				r.setStart(endContainer, end);
+				r.setEnd(endContainer, start);
+			}
+
+			// Exclude last . from word like "www.site.com."
+			var text = r.toString();
+			if (text.charAt(text.length - 1) == '.') {
+				r.setEnd(endContainer, start - 1);
+			}
+
+			text = r.toString();
+			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);
+
+			if (matches) {
+				if (matches[1] == 'www.') {
+					matches[1] = 'http://www.';
+				} else if (/@$/.test(matches[1]) && !/^mailto:/.test(matches[1])) {
+					matches[1] = 'mailto:' + matches[1];
+				}
+
+				bookmark = ed.selection.getBookmark();
+
+				ed.selection.setRng(r);
+				tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);
+				ed.selection.moveToBookmark(bookmark);
+				ed.nodeChanged();
+
+				// TODO: Determine if this is still needed.
+				if (tinyMCE.isWebKit) {
+					// move the caret to its original position
+					ed.selection.collapse(false);
+					var max = Math.min(endContainer.length, start + 1);
+					r.setStart(endContainer, max);
+					r.setEnd(endContainer, max);
+					ed.selection.setRng(r);
+				}
+			}
+		},
+
+		/**
+		* Returns information about the plugin as a name/value array.
+		* The current keys are longname, author, authorurl, infourl and version.
+		*
+		* @return {Object} Name/value array containing information about the plugin.
+		*/
+		getInfo : function() {
+			return {
+				longname : 'Autolink',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
+})();
diff --git a/program/js/tiny_mce/plugins/autoresize/editor_plugin_src.js b/program/js/tiny_mce/plugins/autoresize/editor_plugin_src.js
index 998c147eb..7673bcff8 100644
--- a/program/js/tiny_mce/plugins/autoresize/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/autoresize/editor_plugin_src.js
@@ -1,119 +1,119 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function() {

-	/**

-	 * Auto Resize

-	 *

-	 * This plugin automatically resizes the content area to fit its content height.

-	 * It will retain a minimum height, which is the height of the content area when

-	 * it's initialized.

-	 */

-	tinymce.create('tinymce.plugins.AutoResizePlugin', {

-		/**

-		 * Initializes the plugin, this will be executed after the plugin has been created.

-		 * This call is done before the editor instance has finished it's initialization so use the onInit event

-		 * of the editor instance to intercept that event.

-		 *

-		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

-		 * @param {string} url Absolute URL to where the plugin is located.

-		 */

-		init : function(ed, url) {

-			var t = this, oldSize = 0;

-

-			if (ed.getParam('fullscreen_is_enabled'))

-				return;

-

-			/**

-			 * This method gets executed each time the editor needs to resize.

-			 */

-			function resize() {

-				var deltaSize, d = ed.getDoc(), body = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;

-

-				// Get height differently depending on the browser used

-				myHeight = tinymce.isIE ? body.scrollHeight : (tinymce.isWebKit && body.clientHeight == 0 ? 0 : body.offsetHeight);

-

-				// Don't make it smaller than the minimum height

-				if (myHeight > t.autoresize_min_height)

-					resizeHeight = myHeight;

-

-				// If a maximum height has been defined don't exceed this height

-				if (t.autoresize_max_height && myHeight > t.autoresize_max_height) {

-					resizeHeight = t.autoresize_max_height;

-					body.style.overflowY = "auto";

-					de.style.overflowY = "auto"; // Old IE

-				} else {

-					body.style.overflowY = "hidden";

-					de.style.overflowY = "hidden"; // Old IE

-					body.scrollTop = 0;

-				}

-

-				// Resize content element

-				if (resizeHeight !== oldSize) {

-					deltaSize = resizeHeight - oldSize;

-					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');

-					oldSize = resizeHeight;

-

-					// WebKit doesn't decrease the size of the body element until the iframe gets resized

-					// So we need to continue to resize the iframe down until the size gets fixed

-					if (tinymce.isWebKit && deltaSize < 0)

-						resize();

-				}

-			};

-

-			t.editor = ed;

-

-			// Define minimum height

-			t.autoresize_min_height = parseInt(ed.getParam('autoresize_min_height', ed.getElement().offsetHeight));

-

-			// Define maximum height

-			t.autoresize_max_height = parseInt(ed.getParam('autoresize_max_height', 0));

-

-			// Add padding at the bottom for better UX

-			ed.onInit.add(function(ed){

-				ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');

-			});

-

-			// Add appropriate listeners for resizing content area

-			ed.onChange.add(resize);

-			ed.onSetContent.add(resize);

-			ed.onPaste.add(resize);

-			ed.onKeyUp.add(resize);

-			ed.onPostRender.add(resize);

-

-			if (ed.getParam('autoresize_on_init', true)) {

-				ed.onLoad.add(resize);

-				ed.onLoadContent.add(resize);

-			}

-

-			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');

-			ed.addCommand('mceAutoResize', resize);

-		},

-

-		/**

-		 * Returns information about the plugin as a name/value array.

-		 * The current keys are longname, author, authorurl, infourl and version.

-		 *

-		 * @return {Object} Name/value array containing information about the plugin.

-		 */

-		getInfo : function() {

-			return {

-				longname : 'Auto Resize',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);

-})();

+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	/**
+	 * Auto Resize
+	 *
+	 * This plugin automatically resizes the content area to fit its content height.
+	 * It will retain a minimum height, which is the height of the content area when
+	 * it's initialized.
+	 */
+	tinymce.create('tinymce.plugins.AutoResizePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			var t = this, oldSize = 0;
+
+			if (ed.getParam('fullscreen_is_enabled'))
+				return;
+
+			/**
+			 * This method gets executed each time the editor needs to resize.
+			 */
+			function resize() {
+				var deltaSize, d = ed.getDoc(), body = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
+
+				// Get height differently depending on the browser used
+				myHeight = tinymce.isIE ? body.scrollHeight : (tinymce.isWebKit && body.clientHeight == 0 ? 0 : body.offsetHeight);
+
+				// Don't make it smaller than the minimum height
+				if (myHeight > t.autoresize_min_height)
+					resizeHeight = myHeight;
+
+				// If a maximum height has been defined don't exceed this height
+				if (t.autoresize_max_height && myHeight > t.autoresize_max_height) {
+					resizeHeight = t.autoresize_max_height;
+					body.style.overflowY = "auto";
+					de.style.overflowY = "auto"; // Old IE
+				} else {
+					body.style.overflowY = "hidden";
+					de.style.overflowY = "hidden"; // Old IE
+					body.scrollTop = 0;
+				}
+
+				// Resize content element
+				if (resizeHeight !== oldSize) {
+					deltaSize = resizeHeight - oldSize;
+					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+					oldSize = resizeHeight;
+
+					// WebKit doesn't decrease the size of the body element until the iframe gets resized
+					// So we need to continue to resize the iframe down until the size gets fixed
+					if (tinymce.isWebKit && deltaSize < 0)
+						resize();
+				}
+			};
+
+			t.editor = ed;
+
+			// Define minimum height
+			t.autoresize_min_height = parseInt(ed.getParam('autoresize_min_height', ed.getElement().offsetHeight));
+
+			// Define maximum height
+			t.autoresize_max_height = parseInt(ed.getParam('autoresize_max_height', 0));
+
+			// Add padding at the bottom for better UX
+			ed.onInit.add(function(ed){
+				ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');
+			});
+
+			// Add appropriate listeners for resizing content area
+			ed.onChange.add(resize);
+			ed.onSetContent.add(resize);
+			ed.onPaste.add(resize);
+			ed.onKeyUp.add(resize);
+			ed.onPostRender.add(resize);
+
+			if (ed.getParam('autoresize_on_init', true)) {
+				ed.onLoad.add(resize);
+				ed.onLoadContent.add(resize);
+			}
+
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceAutoResize', resize);
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Auto Resize',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
+})();
diff --git a/program/js/tiny_mce/plugins/directionality/editor_plugin.js b/program/js/tiny_mce/plugins/directionality/editor_plugin.js
index bce8e7399..90847e78e 100644
--- a/program/js/tiny_mce/plugins/directionality/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/directionality/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceDirectionLTR",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="ltr"){a.dom.setAttrib(d,"dir","ltr")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addCommand("mceDirectionRTL",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="rtl"){a.dom.setAttrib(d,"dir","rtl")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});a.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});a.onNodeChange.add(c._nodeChange,c)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(b,c){var d=this;d.editor=b;function a(e){var h=b.dom,g,f=b.selection.getSelectedBlocks();if(f.length){g=h.getAttrib(f[0],"dir");tinymce.each(f,function(i){if(!h.getParent(i.parentNode,"*[dir='"+e+"']",h.getRoot())){if(g!=e){h.setAttrib(i,"dir",e)}else{h.setAttrib(i,"dir",null)}}});b.nodeChanged()}}b.addCommand("mceDirectionLTR",function(){a("ltr")});b.addCommand("mceDirectionRTL",function(){a("rtl")});b.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});b.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});b.onNodeChange.add(d._nodeChange,d)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/directionality/editor_plugin_src.js b/program/js/tiny_mce/plugins/directionality/editor_plugin_src.js
index 4444959bf..b13401412 100644
--- a/program/js/tiny_mce/plugins/directionality/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/directionality/editor_plugin_src.js
@@ -15,30 +15,33 @@
 

 			t.editor = ed;

 

-			ed.addCommand('mceDirectionLTR', function() {

-				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);

-

-				if (e) {

-					if (ed.dom.getAttrib(e, "dir") != "ltr")

-						ed.dom.setAttrib(e, "dir", "ltr");

-					else

-						ed.dom.setAttrib(e, "dir", "");

+			function setDir(dir) {

+				var dom = ed.dom, curDir, blocks = ed.selection.getSelectedBlocks();

+

+				if (blocks.length) {

+					curDir = dom.getAttrib(blocks[0], "dir");

+

+					tinymce.each(blocks, function(block) {

+						// Add dir to block if the parent block doesn't already have that dir

+						if (!dom.getParent(block.parentNode, "*[dir='" + dir + "']", dom.getRoot())) {

+							if (curDir != dir) {

+								dom.setAttrib(block, "dir", dir);

+							} else {

+								dom.setAttrib(block, "dir", null);

+							}

+						}

+					});

+

+					ed.nodeChanged();

 				}

+			}

 

-				ed.nodeChanged();

+			ed.addCommand('mceDirectionLTR', function() {

+				setDir("ltr");

 			});

 

 			ed.addCommand('mceDirectionRTL', function() {

-				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);

-

-				if (e) {

-					if (ed.dom.getAttrib(e, "dir") != "rtl")

-						ed.dom.setAttrib(e, "dir", "rtl");

-					else

-						ed.dom.setAttrib(e, "dir", "");

-				}

-

-				ed.nodeChanged();

+				setDir("rtl");

 			});

 

 			ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});

diff --git a/program/js/tiny_mce/plugins/example_dependency/editor_plugin_src.js b/program/js/tiny_mce/plugins/example_dependency/editor_plugin_src.js
index f761441ea..e1c55e41b 100644
--- a/program/js/tiny_mce/plugins/example_dependency/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/example_dependency/editor_plugin_src.js
@@ -1,50 +1,50 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function() {

-

-	tinymce.create('tinymce.plugins.ExampleDependencyPlugin', {

-		/**

-		 * Initializes the plugin, this will be executed after the plugin has been created.

-		 * This call is done before the editor instance has finished it's initialization so use the onInit event

-		 * of the editor instance to intercept that event.

-		 *

-		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

-		 * @param {string} url Absolute URL to where the plugin is located.

-		 */

-		init : function(ed, url) {

-		},

-

-

-		/**

-		 * Returns information about the plugin as a name/value array.

-		 * The current keys are longname, author, authorurl, infourl and version.

-		 *

-		 * @return {Object} Name/value array containing information about the plugin.

-		 */

-		getInfo : function() {

-			return {

-				longname : 'Example Dependency plugin',

-				author : 'Some author',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency',

-				version : "1.0"

-			};

-		}

-	});

-

-	/**

-	 * Register the plugin, specifying the list of the plugins that this plugin depends on.  They are specified in a list, with the list loaded in order.

-	 * plugins in this list will be initialised when this plugin is initialized. (before the init method is called).

-	 * plugins in a depends list should typically be specified using the short name).  If neccesary this can be done

-	 * with an object which has the url to the plugin and the shortname.

-	 */

-	tinymce.PluginManager.add('example_dependency', tinymce.plugins.ExampleDependencyPlugin, ['example']);

-})();

+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+
+	tinymce.create('tinymce.plugins.ExampleDependencyPlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+		},
+
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Example Dependency plugin',
+				author : 'Some author',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency',
+				version : "1.0"
+			};
+		}
+	});
+
+	/**
+	 * Register the plugin, specifying the list of the plugins that this plugin depends on.  They are specified in a list, with the list loaded in order.
+	 * plugins in this list will be initialised when this plugin is initialized. (before the init method is called).
+	 * plugins in a depends list should typically be specified using the short name).  If neccesary this can be done
+	 * with an object which has the url to the plugin and the shortname.
+	 */
+	tinymce.PluginManager.add('example_dependency', tinymce.plugins.ExampleDependencyPlugin, ['example']);
+})();
diff --git a/program/js/tiny_mce/plugins/fullpage/langs/he_dlg.js b/program/js/tiny_mce/plugins/fullpage/langs/he_dlg.js
index 341e5bb4c..69faae39a 100644
--- a/program/js/tiny_mce/plugins/fullpage/langs/he_dlg.js
+++ b/program/js/tiny_mce/plugins/fullpage/langs/he_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('he.fullpage_dlg',{title:"\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05e1\u05de\u05da","meta_tab":"\u05db\u05dc\u05dc\u05d9","appearance_tab":"\u05de\u05e8\u05d0\u05d4","advanced_tab":"\u05de\u05ea\u05e7\u05d3\u05dd","meta_props":"\u05ea\u05d2\u05d9 \u05de\u05d8\u05d4",langprops:"\u05e9\u05e4\u05d4 \u05d5\u05e7\u05d9\u05d3\u05d5\u05d3","meta_title":"\u05db\u05d5\u05ea\u05e8\u05ea","meta_keywords":"\u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7","meta_description":"\u05ea\u05d9\u05d0\u05d5\u05e8","meta_robots":"\u05e8\u05d5\u05d1\u05d5\u05d8\u05d9\u05dd",doctypes:"Doctype",langcode:"\u05e7\u05d5\u05d3 \u05d4\u05e9\u05e4\u05d4",langdir:"\u05db\u05d9\u05d5\u05d5\u05df \u05d4\u05e9\u05e4\u05d4",ltr:"\u05de\u05e9\u05de\u05d0\u05dc \u05dc\u05d9\u05de\u05d9\u05df",rtl:"\u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc","xml_pi":"XML declaration",encoding:"\u05e7\u05d9\u05d3\u05d5\u05d3 \u05ea\u05d5\u05d5\u05d9\u05dd","appearance_bgprops":"\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e8\u05e7\u05e2","appearance_marginprops":"Body margins","appearance_linkprops":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd","appearance_textprops":"Text properties",bgcolor:"\u05e6\u05d1\u05e2 \u05e8\u05e7\u05e2",bgimage:"\u05ea\u05de\u05d5\u05e0\u05ea \u05e8\u05e7\u05e2","left_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e9\u05de\u05d0\u05dc\u05d9\u05d9\u05dd","right_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05d9\u05de\u05e0\u05d9\u05d9\u05dd","top_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e2\u05dc\u05d9\u05d5\u05e0\u05d9\u05dd","bottom_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05ea\u05d7\u05ea\u05d9\u05d9\u05dd","text_color":"\u05e6\u05d1\u05e2 \u05d8\u05e7\u05e1\u05d8","font_size":"\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df","font_face":"\u05e1\u05d5\u05d2 \u05d2\u05d5\u05e4\u05df","link_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8","hover_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05d1\u05de\u05e2\u05d1\u05e8 \u05e2\u05db\u05d1\u05e8","visited_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05e9\u05e0\u05e6\u05e4\u05d4","active_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05e4\u05e2\u05d9\u05dc",textcolor:"\u05e6\u05d1\u05e2",fontsize:"\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df",fontface:"\u05d2\u05d5\u05e4\u05df","meta_index_follow":"Index and follow the links","meta_index_nofollow":"Index and don\'t follow the links","meta_noindex_follow":"Do not index but follow the links","meta_noindex_nofollow":"Do not index and don\\\'t follow the links","appearance_style":"Stylesheet and style properties",stylesheet:"\u05e1\u05d2\u05e0\u05d5\u05df \u05e2\u05d9\u05e6\u05d5\u05d1",style:"\u05e2\u05d9\u05e6\u05d5\u05d1",author:"\u05db\u05d5\u05ea\u05d1",copyright:"\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05d9\u05d5\u05e6\u05e8\u05d9\u05dd",add:"Add new element",remove:"Remove selected element",moveup:"Move selected element up",movedown:"Move selected element down","head_elements":"Head elements",info:"\u05de\u05d9\u05d3\u05e2","add_title":"Title element","add_meta":"Meta element","add_script":"Script element","add_style":"Style element","add_link":"Link element","add_base":"Base element","add_comment":"Comment node","title_element":"Title element","script_element":"Script element","style_element":"Style element","base_element":"Base element","link_element":"Link element","meta_element":"Meta element","comment_element":"\u05ea\u05d2\u05d5\u05d1\u05d4",src:"\u05db\u05ea\u05d5\u05d1\u05ea \u05de\u05e7\u05d5\u05e8",language:"\u05e9\u05e4\u05d4",href:"Href",target:"\u05d9\u05e2\u05d3",type:"\u05e1\u05d5\u05d2",charset:"\u05e7\u05d9\u05d3\u05d5\u05d3",defer:"Defer",media:"\u05de\u05d3\u05d9\u05d4",properties:"\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd",name:"\u05e9\u05dd",value:"\u05e2\u05e8\u05da",content:"\u05ea\u05d5\u05db\u05df",rel:"Rel",rev:"Rev",hreflang:"Href lang","general_props":"\u05db\u05dc\u05dc\u05d9","advanced_props":"\u05de\u05ea\u05e7\u05d3\u05dd"});
\ No newline at end of file
+tinyMCE.addI18n('he.fullpage_dlg',{title:"\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05e1\u05de\u05da","meta_tab":"\u05db\u05dc\u05dc\u05d9","appearance_tab":"\u05de\u05e8\u05d0\u05d4","advanced_tab":"\u05de\u05ea\u05e7\u05d3\u05dd","meta_props":"\u05ea\u05d2\u05d9 \u05de\u05d8\u05d4",langprops:"\u05e9\u05e4\u05d4 \u05d5\u05e7\u05d9\u05d3\u05d5\u05d3","meta_title":"\u05db\u05d5\u05ea\u05e8\u05ea","meta_keywords":"\u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7","meta_description":"\u05ea\u05d9\u05d0\u05d5\u05e8","meta_robots":"\u05e8\u05d5\u05d1\u05d5\u05d8\u05d9\u05dd",doctypes:"Doctype",langcode:"\u05e7\u05d5\u05d3 \u05d4\u05e9\u05e4\u05d4",langdir:"\u05db\u05d9\u05d5\u05d5\u05df \u05d4\u05e9\u05e4\u05d4",ltr:"\u05de\u05e9\u05de\u05d0\u05dc \u05dc\u05d9\u05de\u05d9\u05df",rtl:"\u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc","xml_pi":"XML declaration",encoding:"\u05e7\u05d9\u05d3\u05d5\u05d3 \u05ea\u05d5\u05d5\u05d9\u05dd","appearance_bgprops":"\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e8\u05e7\u05e2","appearance_marginprops":"Body margins","appearance_linkprops":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd","appearance_textprops":"Text properties",bgcolor:"\u05e6\u05d1\u05e2 \u05e8\u05e7\u05e2",bgimage:"\u05ea\u05de\u05d5\u05e0\u05ea \u05e8\u05e7\u05e2","left_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e9\u05de\u05d0\u05dc\u05d9\u05d9\u05dd","right_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05d9\u05de\u05e0\u05d9\u05d9\u05dd","top_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e2\u05dc\u05d9\u05d5\u05e0\u05d9\u05dd","bottom_margin":"\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05ea\u05d7\u05ea\u05d9\u05d9\u05dd","text_color":"\u05e6\u05d1\u05e2 \u05d8\u05e7\u05e1\u05d8","font_size":"\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df","font_face":"\u05e1\u05d5\u05d2 \u05d2\u05d5\u05e4\u05df","link_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8","hover_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05d1\u05de\u05e2\u05d1\u05e8 \u05e2\u05db\u05d1\u05e8","visited_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05e9\u05e0\u05e6\u05e4\u05d4","active_color":"\u05e6\u05d1\u05e2 \u05e7\u05d9\u05e9\u05d5\u05e8 \u05e4\u05e2\u05d9\u05dc",textcolor:"\u05e6\u05d1\u05e2",fontsize:"\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df",fontface:"\u05d2\u05d5\u05e4\u05df","meta_index_follow":"Index and follow the links","meta_index_nofollow":"Index and don\'t follow the links","meta_noindex_follow":"Do not index but follow the links","meta_noindex_nofollow":"Do not index and don\\\'t follow the links","appearance_style":"Stylesheet and style properties",stylesheet:"\u05e1\u05d2\u05e0\u05d5\u05df \u05e2\u05d9\u05e6\u05d5\u05d1",style:"\u05e2\u05d9\u05e6\u05d5\u05d1",author:"\u05db\u05d5\u05ea\u05d1",copyright:"\u05d6\u05db\u05d5\u05d9\u05d5\u05ea \u05d9\u05d5\u05e6\u05e8\u05d9\u05dd",add:"\u05d4\u05d5\u05e1\u05e3 \u05d0\u05dc\u05de\u05e0\u05d8 \u05d7\u05d3\u05e9",remove:"Remove selected element",moveup:"Move selected element up",movedown:"Move selected element down","head_elements":"Head elements",info:"\u05de\u05d9\u05d3\u05e2","add_title":"Title element","add_meta":"Meta element","add_script":"Script element","add_style":"Style element","add_link":"Link element","add_base":"Base element","add_comment":"Comment node","title_element":"Title element","script_element":"Script element","style_element":"\u05d0\u05dc\u05de\u05e0\u05d8 \u05e2\u05d9\u05e6\u05d5\u05d1","base_element":"\u05d0\u05dc\u05de\u05e0\u05d8 \u05d1\u05e1\u05d9\u05e1","link_element":"\u05d0\u05dc\u05de\u05e0\u05d8 \u05e7\u05d9\u05e9\u05d5\u05e8","meta_element":"Meta element","comment_element":"\u05ea\u05d2\u05d5\u05d1\u05d4",src:"\u05db\u05ea\u05d5\u05d1\u05ea \u05de\u05e7\u05d5\u05e8",language:"\u05e9\u05e4\u05d4",href:"HREF",target:"\u05d9\u05e2\u05d3",type:"\u05e1\u05d5\u05d2",charset:"\u05e7\u05d9\u05d3\u05d5\u05d3",defer:"Defer",media:"\u05de\u05d3\u05d9\u05d4",properties:"\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd",name:"\u05e9\u05dd",value:"\u05e2\u05e8\u05da",content:"\u05ea\u05d5\u05db\u05df",rel:"Rel",rev:"Rev",hreflang:"Href lang","general_props":"\u05db\u05dc\u05dc\u05d9","advanced_props":"\u05de\u05ea\u05e7\u05d3\u05dd"});
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/fullscreen/editor_plugin.js b/program/js/tiny_mce/plugins/fullscreen/editor_plugin.js
index 7b65e733c..a2eb03483 100644
--- a/program/js/tiny_mce/plugins/fullscreen/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().getElementsByTagName("table")[0]);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index 6622f924a..524b487aa 100644
--- a/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -65,7 +65,7 @@
 

 					// Fixes an IE bug where the scrollbars doesn't reappear

 					if (tinymce.isIE && (s.fullscreen_html_overflow == 'visible' || s.fullscreen_html_overflow == 'scroll'))

-						s.fullscreen_html_overflow = 'auto'; 

+						s.fullscreen_html_overflow = 'auto';

 

 					if (s.fullscreen_overflow == '0px')

 						s.fullscreen_overflow = '';

@@ -85,7 +85,7 @@
 						posCss = 'fixed;top:0';

 

 					n = DOM.add(DOM.doc.body, 'div', {

-						id : 'mce_fullscreen_container', 

+						id : 'mce_fullscreen_container',

 						style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});

 					DOM.add(n, 'div', {id : 'mce_fullscreen'});

 

@@ -127,7 +127,7 @@
 						var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;

 

 						// Get outer/inner size to get a delta size that can be used to calc the new iframe size

-						outerSize = fed.dom.getSize(fed.getContainer().firstChild);

+						outerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('table')[0]);

 						innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);

 

 						fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);

@@ -156,4 +156,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);

-})();
\ No newline at end of file
+})();

diff --git a/program/js/tiny_mce/plugins/lists/editor_plugin.js b/program/js/tiny_mce/plugins/lists/editor_plugin.js
index 507331fbf..ec21b256e 100644
--- a/program/js/tiny_mce/plugins/lists/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/lists/editor_plugin.js
@@ -1 +1 @@
-(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var J="ESCAPE";var z="PARAGRAPH";var N="UNKNOWN";var x=N;function E(U){return U.keyCode===tinymce.VK.TAB&&!(U.altKey||U.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function w(){var U=B();var W=U.parentNode.parentNode;var V=U.parentNode.lastChild===U;return V&&!t(W)&&P(U)}function t(U){if(n(U)){return U.parentNode&&U.parentNode.tagName==="LI"}else{return U.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&P(B())}function B(){var U=y.selection.getStart();return((U.tagName=="BR"||U.tagName=="")&&U.parentNode.tagName=="LI")?U.parentNode:U}function P(U){var V=U.childNodes.length;if(U.tagName==="LI"){return V==0?true:V==1&&(U.firstChild.tagName==""||U.firstChild.tagName=="BR"||H(U))}return false}function H(U){var V=tinymce.grep(U.parentNode.childNodes,function(Y){return Y.tagName=="LI"});var W=U==V[V.length-1];var X=U.firstChild;return tinymce.isIE9&&W&&(X.nodeValue==String.fromCharCode(160)||X.nodeValue==String.fromCharCode(32))}function T(U){return U.keyCode===tinymce.VK.ENTER}function A(U){return T(U)&&!U.shiftKey}function M(U){if(E(U)){return v}else{if(A(U)&&w()){return N}else{if(A(U)&&F()){return s}else{return N}}}}function D(U,V){if(x==v||x==s||tinymce.isGecko&&x==J){r.cancel(V)}}function C(){var U=y.selection.getRng(true);var V=U.startContainer;if(V.nodeType==3){var W=V.nodeValue;if(tinymce.isIE9&&W.length>1&&W.charCodeAt(W.length-1)==32){return(U.endOffset==W.length-1)}else{return(U.endOffset==W.length)}}else{if(V.nodeType==1){return U.endOffset==V.childNodes.length}}return false}function I(){var W=y.selection.getNode();var V="h1,h2,h3,h4,h5,h6,p,div";var U=y.dom.is(W,V)&&W.parentNode.tagName==="LI"&&W.parentNode.lastChild===W;return y.selection.isCollapsed()&&U&&C()}function K(W,Y){if(A(Y)&&I()){var X=W.selection.getNode();var V=W.dom.create("li");var U=W.dom.getParent(X,"li");W.dom.insertAfter(V,U);if(tinymce.isIE6||tinymce.isIE7||tinyMCE.isIE8){W.selection.setCursorLocation(V,1)}else{W.selection.setCursorLocation(V,0)}Y.preventDefault()}}function u(X,Z){var ac;if(!tinymce.isGecko){return}var V=X.selection.getStart();if(Z.keyCode!=tinymce.VK.BACKSPACE||V.tagName!=="IMG"){return}function W(ag){var ah=ag.firstChild;var af=null;do{if(!ah){break}if(ah.tagName==="LI"){af=ah}}while(ah=ah.nextSibling);return af}function ae(ag,af){while(ag.childNodes.length>0){af.appendChild(ag.childNodes[0])}}ac=V.parentNode.previousSibling;if(!ac){return}var aa;if(ac.tagName==="UL"||ac.tagName==="OL"){aa=ac}else{if(ac.previousSibling&&(ac.previousSibling.tagName==="UL"||ac.previousSibling.tagName==="OL")){aa=ac.previousSibling}else{return}}var ad=W(aa);var U=X.dom.createRng();U.setStart(ad,1);U.setEnd(ad,1);X.selection.setRng(U);X.selection.collapse(true);var Y=X.selection.getBookmark();var ab=V.parentNode.cloneNode(true);if(ab.tagName==="P"||ab.tagName==="DIV"){ae(ab,ad)}else{ad.appendChild(ab)}V.parentNode.parentNode.removeChild(V.parentNode);X.selection.moveToBookmark(Y)}function G(U){var V=y.dom.getParent(U,"ol,ul");if(V!=null){var W=V.lastChild;y.selection.setCursorLocation(W,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var V=y.selection,W=y.dom;function U(X){X=W.getParent(X,W.isBlock);return X&&(parseInt(y.dom.getStyle(X,"margin-left")||0,10)+parseInt(y.dom.getStyle(X,"padding-left")||0,10))>0}return U(V.getStart())||U(V.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(V,W){if(x==v){V.execCommand(W.shiftKey?"Outdent":"Indent",true,null);x=N;return r.cancel(W)}else{if(x==s){var U=B();var Y=V.settings.list_outdent_on_enter===true||W.shiftKey;V.execCommand(Y?"Outdent":"Indent",true,null);if(tinymce.isIE){G(U)}return r.cancel(W)}else{if(x==J){if(tinymce.isIE6||tinymce.isIE7||tinymce.isIE8){var X=V.getDoc().createTextNode("\uFEFF");V.selection.getNode().appendChild(X)}else{if(tinymce.isIE9||tinymce.isGecko){V.execCommand("Outdent");return r.cancel(W)}}}}}});function L(V,U){var W=y.getDoc().createTextNode("\uFEFF");V.insertBefore(W,U);y.selection.setCursorLocation(W,0);y.execCommand("mceRepaint")}function R(V,X){if(T(X)){var U=B();if(U){var W=U.parentNode;var Y=W&&W.parentNode;if(Y&&Y.nodeName=="LI"&&Y.firstChild==W&&U==W.firstChild){L(Y,W)}}}}function S(V,X){if(T(X)){var U=B();if(V.dom.select("ul li",U).length===1){var W=U.firstChild;L(U,W)}}}function Q(V,Z){function W(ad,aa){var ac=[];var ae=new tinymce.dom.TreeWalker(aa,ad);for(var ab=ae.current();ab;ab=ae.next()){if(V.dom.is(ab,"ol,ul,li")){ac.push(ab)}}return ac}if(Z.keyCode==tinymce.VK.BACKSPACE){var U=B();if(U){var Y=V.dom.getParent(U,"ol,ul");if(Y&&Y.firstChild===U){var X=W(Y,U);V.execCommand("Outdent",false,X);V.undoManager.add();return r.cancel(Z)}}}}function O(V,X){var U=B();if(X.keyCode===tinymce.VK.BACKSPACE&&V.dom.is(U,"li")&&U.parentNode.firstChild!==U){if(V.dom.select("ul,ol",U).length===1){var Z=U.previousSibling;V.dom.remove(V.dom.select("br",U));V.dom.remove(U,true);var W=tinymce.grep(Z.childNodes,function(aa){return aa.nodeType===3});if(W.length===1){var Y=W[0];V.selection.setCursorLocation(Y,Y.length)}V.undoManager.add();return r.cancel(X)}}}y.onKeyDown.add(function(U,V){x=M(V)});y.onKeyDown.add(D);y.onKeyDown.add(u);y.onKeyDown.add(K);if(tinymce.isGecko){y.onKeyUp.add(R)}if(tinymce.isIE8){y.onKeyUp.add(S)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(Q)}if(tinymce.isWebKit){y.onKeyDown.add(O)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks(),processEvenIfEmpty:true}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||!y.processEvenIfEmpty&&E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(t,s){if(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent))){this.classBasedEach(t,s)}else{e(t,s)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed;var t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
+(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var J="ESCAPE";var z="PARAGRAPH";var N="UNKNOWN";var x=N;function E(U){return U.keyCode===tinymce.VK.TAB&&!(U.altKey||U.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function w(){var U=B();var W=U.parentNode.parentNode;var V=U.parentNode.lastChild===U;return V&&!t(W)&&P(U)}function t(U){if(n(U)){return U.parentNode&&U.parentNode.tagName==="LI"}else{return U.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&P(B())}function B(){var U=y.selection.getStart();return((U.tagName=="BR"||U.tagName=="")&&U.parentNode.tagName=="LI")?U.parentNode:U}function P(U){var V=U.childNodes.length;if(U.tagName==="LI"){return V==0?true:V==1&&(U.firstChild.tagName==""||U.firstChild.tagName=="BR"||H(U))}return false}function H(U){var V=tinymce.grep(U.parentNode.childNodes,function(Y){return Y.tagName=="LI"});var W=U==V[V.length-1];var X=U.firstChild;return tinymce.isIE9&&W&&(X.nodeValue==String.fromCharCode(160)||X.nodeValue==String.fromCharCode(32))}function T(U){return U.keyCode===tinymce.VK.ENTER}function A(U){return T(U)&&!U.shiftKey}function M(U){if(E(U)){return v}else{if(A(U)&&w()){return N}else{if(A(U)&&F()){return s}else{return N}}}}function D(U,V){if(x==v||x==s||tinymce.isGecko&&x==J){r.cancel(V)}}function C(){var U=y.selection.getRng(true);var V=U.startContainer;if(V.nodeType==3){var W=V.nodeValue;if(tinymce.isIE9&&W.length>1&&W.charCodeAt(W.length-1)==32){return(U.endOffset==W.length-1)}else{return(U.endOffset==W.length)}}else{if(V.nodeType==1){return U.endOffset==V.childNodes.length}}return false}function I(){var W=y.selection.getNode();var V="h1,h2,h3,h4,h5,h6,p,div";var U=y.dom.is(W,V)&&W.parentNode.tagName==="LI"&&W.parentNode.lastChild===W;return y.selection.isCollapsed()&&U&&C()}function K(W,Y){if(A(Y)&&I()){var X=W.selection.getNode();var V=W.dom.create("li");var U=W.dom.getParent(X,"li");W.dom.insertAfter(V,U);if(tinymce.isIE6||tinymce.isIE7||tinyMCE.isIE8){W.selection.setCursorLocation(V,1)}else{W.selection.setCursorLocation(V,0)}Y.preventDefault()}}function u(X,Z){var ac;if(!tinymce.isGecko){return}var V=X.selection.getStart();if(Z.keyCode!=tinymce.VK.BACKSPACE||V.tagName!=="IMG"){return}function W(ag){var ah=ag.firstChild;var af=null;do{if(!ah){break}if(ah.tagName==="LI"){af=ah}}while(ah=ah.nextSibling);return af}function ae(ag,af){while(ag.childNodes.length>0){af.appendChild(ag.childNodes[0])}}ac=V.parentNode.previousSibling;if(!ac){return}var aa;if(ac.tagName==="UL"||ac.tagName==="OL"){aa=ac}else{if(ac.previousSibling&&(ac.previousSibling.tagName==="UL"||ac.previousSibling.tagName==="OL")){aa=ac.previousSibling}else{return}}var ad=W(aa);var U=X.dom.createRng();U.setStart(ad,1);U.setEnd(ad,1);X.selection.setRng(U);X.selection.collapse(true);var Y=X.selection.getBookmark();var ab=V.parentNode.cloneNode(true);if(ab.tagName==="P"||ab.tagName==="DIV"){ae(ab,ad)}else{ad.appendChild(ab)}V.parentNode.parentNode.removeChild(V.parentNode);X.selection.moveToBookmark(Y)}function G(U){var V=y.dom.getParent(U,"ol,ul");if(V!=null){var W=V.lastChild;y.selection.setCursorLocation(W,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var V=y.selection,W=y.dom;function U(X){X=W.getParent(X,W.isBlock);return X&&(parseInt(y.dom.getStyle(X,"margin-left")||0,10)+parseInt(y.dom.getStyle(X,"padding-left")||0,10))>0}return U(V.getStart())||U(V.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(V,W){if(x==v){V.execCommand(W.shiftKey?"Outdent":"Indent",true,null);x=N;return r.cancel(W)}else{if(x==s){var U=B();var Y=V.settings.list_outdent_on_enter===true||W.shiftKey;V.execCommand(Y?"Outdent":"Indent",true,null);if(tinymce.isIE){G(U)}return r.cancel(W)}else{if(x==J){if(tinymce.isIE6||tinymce.isIE7||tinymce.isIE8){var X=V.getDoc().createTextNode("\uFEFF");V.selection.getNode().appendChild(X)}else{if(tinymce.isIE9||tinymce.isGecko){V.execCommand("Outdent");return r.cancel(W)}}}}}});function L(V,U){var W=y.getDoc().createTextNode("\uFEFF");V.insertBefore(W,U);y.selection.setCursorLocation(W,0);y.execCommand("mceRepaint")}function R(V,X){if(T(X)){var U=B();if(U){var W=U.parentNode;var Y=W&&W.parentNode;if(Y&&Y.nodeName=="LI"&&Y.firstChild==W&&U==W.firstChild){L(Y,W)}}}}function S(V,X){if(T(X)){var U=B();if(V.dom.select("ul li",U).length===1){var W=U.firstChild;L(U,W)}}}function Q(W,aa){function X(ab){var ad=[];var ae=new tinymce.dom.TreeWalker(ab.firstChild,ab);for(var ac=ae.current();ac;ac=ae.next()){if(W.dom.is(ac,"ol,ul,li")){ad.push(ac)}}return ad}if(aa.keyCode==tinymce.VK.BACKSPACE){var U=B();if(U){var Z=W.dom.getParent(U,"ol,ul"),V=W.selection.getRng();if(Z&&Z.firstChild===U&&V.startOffset==0){var Y=X(U);Y.unshift(U);W.execCommand("Outdent",false,Y);W.undoManager.add();return r.cancel(aa)}}}}function O(V,X){var U=B();if(X.keyCode===tinymce.VK.BACKSPACE&&V.dom.is(U,"li")&&U.parentNode.firstChild!==U){if(V.dom.select("ul,ol",U).length===1){var Z=U.previousSibling;V.dom.remove(V.dom.select("br",U));V.dom.remove(U,true);var W=tinymce.grep(Z.childNodes,function(aa){return aa.nodeType===3});if(W.length===1){var Y=W[0];V.selection.setCursorLocation(Y,Y.length)}V.undoManager.add();return r.cancel(X)}}}y.onKeyDown.add(function(U,V){x=M(V)});y.onKeyDown.add(D);y.onKeyDown.add(u);y.onKeyDown.add(K);if(tinymce.isGecko){y.onKeyUp.add(R)}if(tinymce.isIE8){y.onKeyUp.add(S)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(Q)}if(tinymce.isWebKit){y.onKeyDown.add(O)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks(),processEvenIfEmpty:true}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||!y.processEvenIfEmpty&&E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x,true)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(u,t,s){if(s||(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent)))){this.classBasedEach(u,t)}else{e(u,t)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed,t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/lists/editor_plugin_src.js b/program/js/tiny_mce/plugins/lists/editor_plugin_src.js
index c5712dced..1000ef745 100644
--- a/program/js/tiny_mce/plugins/lists/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/lists/editor_plugin_src.js
@@ -1,952 +1,955 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2011, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function() {

-	var each = tinymce.each, Event = tinymce.dom.Event, bookmark;

-

-	// Skips text nodes that only contain whitespace since they aren't semantically important.

-	function skipWhitespaceNodes(e, next) {

-		while (e && (e.nodeType === 8 || (e.nodeType === 3 && /^[ \t\n\r]*$/.test(e.nodeValue)))) {

-			e = next(e);

-		}

-		return e;

-	}

-

-	function skipWhitespaceNodesBackwards(e) {

-		return skipWhitespaceNodes(e, function(e) {

-			return e.previousSibling;

-		});

-	}

-

-	function skipWhitespaceNodesForwards(e) {

-		return skipWhitespaceNodes(e, function(e) {

-			return e.nextSibling;

-		});

-	}

-

-	function hasParentInList(ed, e, list) {

-		return ed.dom.getParent(e, function(p) {

-			return tinymce.inArray(list, p) !== -1;

-		});

-	}

-

-	function isList(e) {

-		return e && (e.tagName === 'OL' || e.tagName === 'UL');

-	}

-

-	function splitNestedLists(element, dom) {

-		var tmp, nested, wrapItem;

-		tmp = skipWhitespaceNodesBackwards(element.lastChild);

-		while (isList(tmp)) {

-			nested = tmp;

-			tmp = skipWhitespaceNodesBackwards(nested.previousSibling);

-		}

-		if (nested) {

-			wrapItem = dom.create('li', { style: 'list-style-type: none;'});

-			dom.split(element, nested);

-			dom.insertAfter(wrapItem, nested);

-			wrapItem.appendChild(nested);

-			wrapItem.appendChild(nested);

-			element = wrapItem.previousSibling;

-		}

-		return element;

-	}

-

-	function attemptMergeWithAdjacent(e, allowDifferentListStyles, mergeParagraphs) {

-		e = attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs);

-		return attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs);

-	}

-

-	function attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs) {

-		var prev = skipWhitespaceNodesBackwards(e.previousSibling);

-		if (prev) {

-			return attemptMerge(prev, e, allowDifferentListStyles ? prev : false, mergeParagraphs);

-		} else {

-			return e;

-		}

-	}

-

-	function attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs) {

-		var next = skipWhitespaceNodesForwards(e.nextSibling);

-		if (next) {

-			return attemptMerge(e, next, allowDifferentListStyles ? next : false, mergeParagraphs);

-		} else {

-			return e;

-		}

-	}

-

-	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {

-		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {

-			return merge(e1, e2, differentStylesMasterElement);

-		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {

-			// Fix invalidly nested lists.

-			e1.appendChild(e2);

-		}

-		return e2;

-	}

-

-	function canMerge(e1, e2, allowDifferentListStyles, mergeParagraphs) {

-		if (!e1 || !e2) {

-			return false;

-		} else if (e1.tagName === 'LI' && e2.tagName === 'LI') {

-			return e2.style.listStyleType === 'none' || containsOnlyAList(e2);

-		} else if (isList(e1)) {

-			return (e1.tagName === e2.tagName && (allowDifferentListStyles || e1.style.listStyleType === e2.style.listStyleType)) || isListForIndent(e2);

-		} else return mergeParagraphs && e1.tagName === 'P' && e2.tagName === 'P';

-	}

-

-	function isListForIndent(e) {

-		var firstLI = skipWhitespaceNodesForwards(e.firstChild), lastLI = skipWhitespaceNodesBackwards(e.lastChild);

-		return firstLI && lastLI && isList(e) && firstLI === lastLI && (isList(firstLI) || firstLI.style.listStyleType === 'none' || containsOnlyAList(firstLI));

-	}

-

-	function containsOnlyAList(e) {

-		var firstChild = skipWhitespaceNodesForwards(e.firstChild), lastChild = skipWhitespaceNodesBackwards(e.lastChild);

-		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);

-	}

-

-	function merge(e1, e2, masterElement) {

-		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);

-		if (e1.tagName === 'P') {

-			e1.appendChild(e1.ownerDocument.createElement('br'));

-		}

-		while (e2.firstChild) {

-			e1.appendChild(e2.firstChild);

-		}

-		if (masterElement) {

-			e1.style.listStyleType = masterElement.style.listStyleType;

-		}

-		e2.parentNode.removeChild(e2);

-		attemptMerge(lastOriginal, firstNew, false);

-		return e1;

-	}

-

-	function findItemToOperateOn(e, dom) {

-		var item;

-		if (!dom.is(e, 'li,ol,ul')) {

-			item = dom.getParent(e, 'li');

-			if (item) {

-				e = item;

-			}

-		}

-		return e;

-	}

-

-	tinymce.create('tinymce.plugins.Lists', {

-		init: function(ed) {

-			var LIST_TABBING = 'TABBING';

-			var LIST_EMPTY_ITEM = 'EMPTY';

-			var LIST_ESCAPE = 'ESCAPE';

-			var LIST_PARAGRAPH = 'PARAGRAPH';

-			var LIST_UNKNOWN = 'UNKNOWN';

-			var state = LIST_UNKNOWN;

-

-			function isTabInList(e) {

-				// Don't indent on Ctrl+Tab or Alt+Tab

-				return e.keyCode === tinymce.VK.TAB && !(e.altKey || e.ctrlKey) &&

-					(ed.queryCommandState('InsertUnorderedList') || ed.queryCommandState('InsertOrderedList'));

-			}

-

-			function isOnLastListItem() {

-				var li = getLi();

-				var grandParent = li.parentNode.parentNode;

-				var isLastItem = li.parentNode.lastChild === li;

-				return isLastItem && !isNestedList(grandParent) && isEmptyListItem(li);

-			}

-

-			function isNestedList(grandParent) {

-				if (isList(grandParent)) {

-					return grandParent.parentNode && grandParent.parentNode.tagName === 'LI';

-				} else {

-					return  grandParent.tagName === 'LI';

-				}

-			}

-

-			function isInEmptyListItem() {

-				return ed.selection.isCollapsed() && isEmptyListItem(getLi());

-			}

-

-			function getLi() {

-				var n = ed.selection.getStart();

-				// Get start will return BR if the LI only contains a BR or an empty element as we use these to fix caret position

-				return ((n.tagName == 'BR' || n.tagName == '') && n.parentNode.tagName == 'LI') ? n.parentNode : n;

-			}

-

-			function isEmptyListItem(li) {

-				var numChildren = li.childNodes.length;

-				if (li.tagName === 'LI') {

-					return numChildren == 0 ? true : numChildren == 1 && (li.firstChild.tagName == '' || li.firstChild.tagName == 'BR' || isEmptyIE9Li(li));

-				}

-				return false;

-			}

-

-			function isEmptyIE9Li(li) {

-				// only consider this to be last item if there is no list item content or that content is nbsp or space since IE9 creates these

-				var lis = tinymce.grep(li.parentNode.childNodes, function(n) {return n.tagName == 'LI'});

-				var isLastLi = li == lis[lis.length - 1];

-				var child = li.firstChild;

-				return tinymce.isIE9 && isLastLi && (child.nodeValue == String.fromCharCode(160) || child.nodeValue == String.fromCharCode(32));

-			}

-

-			function isEnter(e) {

-				return e.keyCode === tinymce.VK.ENTER;

-			}

-

-			function isEnterWithoutShift(e) {

-				return isEnter(e) && !e.shiftKey;

-			}

-

-			function getListKeyState(e) {

-				if (isTabInList(e)) {

-					return LIST_TABBING;

-				} else if (isEnterWithoutShift(e) && isOnLastListItem()) {

-					// Returns LIST_UNKNOWN since breaking out of lists is handled by the EnterKey.js logic now

-					//return LIST_ESCAPE;

-					return LIST_UNKNOWN;

-				} else if (isEnterWithoutShift(e) && isInEmptyListItem()) {

-					return LIST_EMPTY_ITEM;

-				} else {

-					return LIST_UNKNOWN;

-				}

-			}

-

-			function cancelDefaultEvents(ed, e) {

-				// list escape is done manually using outdent as it does not create paragraphs correctly in td's

-				if (state == LIST_TABBING || state == LIST_EMPTY_ITEM || tinymce.isGecko && state == LIST_ESCAPE) {

-					Event.cancel(e);

-				}

-			}

-

-			function isCursorAtEndOfContainer() {

-				var range = ed.selection.getRng(true);

-				var startContainer = range.startContainer;

-				if (startContainer.nodeType == 3) {

-					var value = startContainer.nodeValue;

-					if (tinymce.isIE9 && value.length > 1 && value.charCodeAt(value.length-1) == 32) {

-						// IE9 places a space on the end of the text in some cases so ignore last char

-						return (range.endOffset == value.length-1);

-					} else {

-						return (range.endOffset == value.length);

-					}

-				} else if (startContainer.nodeType == 1) {

-					return range.endOffset == startContainer.childNodes.length;

-				}

-				return false;

-			}

-

-			/*

-			 	If we are at the end of a list item surrounded with an element, pressing enter should create a

-			 	new list item instead without splitting the element e.g. don't want to create new P or H1 tag

-			  */

-			function isEndOfListItem() {

-				var node = ed.selection.getNode();

-				var validElements = 'h1,h2,h3,h4,h5,h6,p,div';

-				var isLastParagraphOfLi = ed.dom.is(node, validElements) && node.parentNode.tagName === 'LI' && node.parentNode.lastChild === node;

-				return ed.selection.isCollapsed() && isLastParagraphOfLi && isCursorAtEndOfContainer();

-			}

-

-			// Creates a new list item after the current selection's list item parent

-			function createNewLi(ed, e) {

-				if (isEnterWithoutShift(e) && isEndOfListItem()) {

-					var node = ed.selection.getNode();

-					var li = ed.dom.create("li");

-					var parentLi = ed.dom.getParent(node, 'li');

-					ed.dom.insertAfter(li, parentLi);

-

-					// Move caret to new list element.

-					if (tinymce.isIE6 || tinymce.isIE7 || tinyMCE.isIE8) {

-						// Removed this line since it would create an odd <&nbsp;> tag and placing the caret inside an empty LI is handled and should be handled by the selection logic

-						//li.appendChild(ed.dom.create("&nbsp;")); // IE needs an element within the bullet point

-						ed.selection.setCursorLocation(li, 1);

-					} else {

-						ed.selection.setCursorLocation(li, 0);

-					}

-					e.preventDefault();

-				}

-			}

-

-			function imageJoiningListItem(ed, e) {

-				var prevSibling;

-

-				if (!tinymce.isGecko)

-					return;

-

-				var n = ed.selection.getStart();

-				if (e.keyCode != tinymce.VK.BACKSPACE || n.tagName !== 'IMG')

-					return;

-

-				function lastLI(node) {

-					var child = node.firstChild;

-					var li = null;

-					do {

-						if (!child)

-							break;

-

-						if (child.tagName === 'LI')

-							li = child;

-					} while (child = child.nextSibling);

-

-					return li;

-				}

-

-				function addChildren(parentNode, destination) {

-					while (parentNode.childNodes.length > 0)

-						destination.appendChild(parentNode.childNodes[0]);

-				}

-

-				// Check if there is a previous sibling

-				prevSibling = n.parentNode.previousSibling;

-				if (!prevSibling)

-					return;

-

-				var ul;

-				if (prevSibling.tagName === 'UL' || prevSibling.tagName === 'OL')

-					ul = prevSibling;

-				else if (prevSibling.previousSibling && (prevSibling.previousSibling.tagName === 'UL' || prevSibling.previousSibling.tagName === 'OL'))

-					ul = prevSibling.previousSibling;

-				else

-					return;

-

-				var li = lastLI(ul);

-

-				// move the caret to the end of the list item

-				var rng = ed.dom.createRng();

-				rng.setStart(li, 1);

-				rng.setEnd(li, 1);

-				ed.selection.setRng(rng);

-				ed.selection.collapse(true);

-

-				// save a bookmark at the end of the list item

-				var bookmark = ed.selection.getBookmark();

-

-				// copy the image an its text to the list item

-				var clone = n.parentNode.cloneNode(true);

-				if (clone.tagName === 'P' || clone.tagName === 'DIV')

-					addChildren(clone, li);

-				else

-					li.appendChild(clone);

-

-				// remove the old copy of the image

-				n.parentNode.parentNode.removeChild(n.parentNode);

-

-				// move the caret where we saved the bookmark

-				ed.selection.moveToBookmark(bookmark);

-			}

-

-			// fix the cursor position to ensure it is correct in IE

-			function setCursorPositionToOriginalLi(li) {

-				var list = ed.dom.getParent(li, 'ol,ul');

-				if (list != null) {

-					var lastLi = list.lastChild;

-					// Removed this line since IE9 would report an DOM character error and placing the caret inside an empty LI is handled and should be handled by the selection logic

-					//lastLi.appendChild(ed.getDoc().createElement(''));

-					ed.selection.setCursorLocation(lastLi, 0);

-				}

-			}

-

-			this.ed = ed;

-			ed.addCommand('Indent', this.indent, this);

-			ed.addCommand('Outdent', this.outdent, this);

-			ed.addCommand('InsertUnorderedList', function() {

-				this.applyList('UL', 'OL');

-			}, this);

-			ed.addCommand('InsertOrderedList', function() {

-				this.applyList('OL', 'UL');

-			}, this);

-

-			ed.onInit.add(function() {

-				ed.editorCommands.addCommands({

-					'outdent': function() {

-						var sel = ed.selection, dom = ed.dom;

-

-						function hasStyleIndent(n) {

-							n = dom.getParent(n, dom.isBlock);

-							return n && (parseInt(ed.dom.getStyle(n, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(n, 'padding-left') || 0, 10)) > 0;

-						}

-

-						return hasStyleIndent(sel.getStart()) || hasStyleIndent(sel.getEnd()) || ed.queryCommandState('InsertOrderedList') || ed.queryCommandState('InsertUnorderedList');

-					}

-				}, 'state');

-			});

-

-			ed.onKeyUp.add(function(ed, e) {

-				if (state == LIST_TABBING) {

-					ed.execCommand(e.shiftKey ? 'Outdent' : 'Indent', true, null);

-					state = LIST_UNKNOWN;

-					return Event.cancel(e);

-				} else if (state == LIST_EMPTY_ITEM) {

-					var li = getLi();

-					var shouldOutdent =  ed.settings.list_outdent_on_enter === true || e.shiftKey;

-					ed.execCommand(shouldOutdent ? 'Outdent' : 'Indent', true, null);

-					if (tinymce.isIE) {

-						setCursorPositionToOriginalLi(li);

-					}

-

-					return Event.cancel(e);

-				} else if (state == LIST_ESCAPE) {

-					if (tinymce.isIE6 || tinymce.isIE7 || tinymce.isIE8) {

-						// append a zero sized nbsp so that caret is positioned correctly in IE after escaping and applying formatting.

-						// if there is no text then applying formatting for e.g a H1 to the P tag immediately following list after

-						// escaping from it will cause the caret to be positioned on the last li instead of staying the in P tag.

-						var n = ed.getDoc().createTextNode('\uFEFF');

-						ed.selection.getNode().appendChild(n);

-					} else if (tinymce.isIE9 || tinymce.isGecko) {

-						// IE9 does not escape the list so we use outdent to do this and cancel the default behaviour

-						// Gecko does not create a paragraph outdenting inside a TD so default behaviour is cancelled and we outdent ourselves

-						ed.execCommand('Outdent');

-						return Event.cancel(e);

-					}

-				}

-			});

-

-			function fixListItem(parent, reference) {

-				// a zero-sized non-breaking space is placed in the empty list item so that the nested list is

-				// displayed on the below line instead of next to it

-				var n = ed.getDoc().createTextNode('\uFEFF');

-				parent.insertBefore(n, reference);

-				ed.selection.setCursorLocation(n, 0);

-				// repaint to remove rendering artifact. only visible when creating new list

-				ed.execCommand('mceRepaint');

-			}

-

-			function fixIndentedListItemForGecko(ed, e) {

-				if (isEnter(e)) {

-					var li = getLi();

-					if (li) {

-						var parent = li.parentNode;

-						var grandParent = parent && parent.parentNode;

-						if (grandParent && grandParent.nodeName == 'LI' && grandParent.firstChild == parent && li == parent.firstChild) {

-							fixListItem(grandParent, parent);

-						}

-					}

-				}

-			}

-

-			function fixIndentedListItemForIE8(ed, e) {

-				if (isEnter(e)) {

-					var li = getLi();

-					if (ed.dom.select('ul li', li).length === 1) {

-						var list = li.firstChild;

-						fixListItem(li, list);

-					}

-				}

-			}

-

-			function fixDeletingFirstCharOfList(ed, e) {

-				function listElements(list, li) {

-					var elements = [];

-					var walker = new tinymce.dom.TreeWalker(li, list);

-					for (var node = walker.current(); node; node = walker.next()) {

-						if (ed.dom.is(node, 'ol,ul,li')) {

-							elements.push(node);

-						}

-					}

-					return elements;

-				}

-

-				if (e.keyCode == tinymce.VK.BACKSPACE) {

-					var li = getLi();

-					if (li) {

-						var list = ed.dom.getParent(li, 'ol,ul');

-						if (list && list.firstChild === li) {

-							var elements = listElements(list, li);

-							ed.execCommand("Outdent", false, elements);

-							ed.undoManager.add();

-							return Event.cancel(e);

-						}

-					}

-				}

-			}

-

-			function fixDeletingEmptyLiInWebkit(ed, e) {

-				var li = getLi();

-				if (e.keyCode === tinymce.VK.BACKSPACE && ed.dom.is(li, 'li') && li.parentNode.firstChild!==li) {

-					if (ed.dom.select('ul,ol', li).length === 1) {

-						var prevLi = li.previousSibling;

-						ed.dom.remove(ed.dom.select('br', li));

-						ed.dom.remove(li, true);

-						var textNodes = tinymce.grep(prevLi.childNodes, function(n){ return n.nodeType === 3 });

-						if (textNodes.length === 1) {

-							var textNode = textNodes[0]

-							ed.selection.setCursorLocation(textNode, textNode.length);

-						}

-						ed.undoManager.add();

-						return Event.cancel(e);

-					}

-				}

-			}

-

-			ed.onKeyDown.add(function(_, e) { state = getListKeyState(e); });

-			ed.onKeyDown.add(cancelDefaultEvents);

-			ed.onKeyDown.add(imageJoiningListItem);

-			ed.onKeyDown.add(createNewLi);

-

-			if (tinymce.isGecko) {

-				ed.onKeyUp.add(fixIndentedListItemForGecko);

-			}

-			if (tinymce.isIE8) {

-				ed.onKeyUp.add(fixIndentedListItemForIE8);

-			}

-			if (tinymce.isGecko || tinymce.isWebKit) {

-				ed.onKeyDown.add(fixDeletingFirstCharOfList);

-			}

-			if (tinymce.isWebKit) {

-				ed.onKeyDown.add(fixDeletingEmptyLiInWebkit);

-			}

-		},

-

-		applyList: function(targetListType, oppositeListType) {

-			var t = this, ed = t.ed, dom = ed.dom, applied = [], hasSameType = false, hasOppositeType = false, hasNonList = false, actions,

-					selectedBlocks = ed.selection.getSelectedBlocks();

-

-			function cleanupBr(e) {

-				if (e && e.tagName === 'BR') {

-					dom.remove(e);

-				}

-			}

-

-			function makeList(element) {

-				var list = dom.create(targetListType), li;

-

-				function adjustIndentForNewList(element) {

-					// If there's a margin-left, outdent one level to account for the extra list margin.

-					if (element.style.marginLeft || element.style.paddingLeft) {

-						t.adjustPaddingFunction(false)(element);

-					}

-				}

-

-				if (element.tagName === 'LI') {

-					// No change required.

-				} else if (element.tagName === 'P' || element.tagName === 'DIV' || element.tagName === 'BODY') {

-					processBrs(element, function(startSection, br) {

-						doWrapList(startSection, br, element.tagName === 'BODY' ? null : startSection.parentNode);

-						li = startSection.parentNode;

-						adjustIndentForNewList(li);

-						cleanupBr(br);

-					});

-					if (li) {

-						if (li.tagName === 'LI' && (element.tagName === 'P' || selectedBlocks.length > 1)) {

-							dom.split(li.parentNode.parentNode, li.parentNode);

-						}

-						attemptMergeWithAdjacent(li.parentNode, true);

-					}

-					return;

-				} else {

-					// Put the list around the element.

-					li = dom.create('li');

-					dom.insertAfter(li, element);

-					li.appendChild(element);

-					adjustIndentForNewList(element);

-					element = li;

-				}

-				dom.insertAfter(list, element);

-				list.appendChild(element);

-				attemptMergeWithAdjacent(list, true);

-				applied.push(element);

-			}

-

-			function doWrapList(start, end, template) {

-				var li, n = start, tmp;

-				while (!dom.isBlock(start.parentNode) && start.parentNode !== dom.getRoot()) {

-					start = dom.split(start.parentNode, start.previousSibling);

-					start = start.nextSibling;

-					n = start;

-				}

-				if (template) {

-					li = template.cloneNode(true);

-					start.parentNode.insertBefore(li, start);

-					while (li.firstChild) dom.remove(li.firstChild);

-					li = dom.rename(li, 'li');

-				} else {

-					li = dom.create('li');

-					start.parentNode.insertBefore(li, start);

-				}

-				while (n && n != end) {

-					tmp = n.nextSibling;

-					li.appendChild(n);

-					n = tmp;

-				}

-				if (li.childNodes.length === 0) {

-					li.innerHTML = '<br _mce_bogus="1" />';

-				}

-				makeList(li);

-			}

-

-			function processBrs(element, callback) {

-				var startSection, previousBR, END_TO_START = 3, START_TO_END = 1,

-						breakElements = 'br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl';

-

-				function isAnyPartSelected(start, end) {

-					var r = dom.createRng(), sel;

-					bookmark.keep = true;

-					ed.selection.moveToBookmark(bookmark);

-					bookmark.keep = false;

-					sel = ed.selection.getRng(true);

-					if (!end) {

-						end = start.parentNode.lastChild;

-					}

-					r.setStartBefore(start);

-					r.setEndAfter(end);

-					return !(r.compareBoundaryPoints(END_TO_START, sel) > 0 || r.compareBoundaryPoints(START_TO_END, sel) <= 0);

-				}

-

-				function nextLeaf(br) {

-					if (br.nextSibling)

-						return br.nextSibling;

-					if (!dom.isBlock(br.parentNode) && br.parentNode !== dom.getRoot())

-						return nextLeaf(br.parentNode);

-				}

-

-				// Split on BRs within the range and process those.

-				startSection = element.firstChild;

-				// First mark the BRs that have any part of the previous section selected.

-				var trailingContentSelected = false;

-				each(dom.select(breakElements, element), function(br) {

-					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {

-						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.

-					}

-					if (isAnyPartSelected(startSection, br)) {

-						dom.addClass(br, '_mce_tagged_br');

-						startSection = nextLeaf(br);

-					}

-				});

-				trailingContentSelected = (startSection && isAnyPartSelected(startSection, undefined));

-				startSection = element.firstChild;

-				each(dom.select(breakElements, element), function(br) {

-					// Got a section from start to br.

-					var tmp = nextLeaf(br);

-					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {

-						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.

-					}

-					if (dom.hasClass(br, '_mce_tagged_br')) {

-						callback(startSection, br, previousBR);

-						previousBR = null;

-					} else {

-						previousBR = br;

-					}

-					startSection = tmp;

-				});

-				if (trailingContentSelected) {

-					callback(startSection, undefined, previousBR);

-				}

-			}

-

-			function wrapList(element) {

-				processBrs(element, function(startSection, br, previousBR) {

-					// Need to indent this part

-					doWrapList(startSection, br);

-					cleanupBr(br);

-					cleanupBr(previousBR);

-				});

-			}

-

-			function changeList(element) {

-				if (tinymce.inArray(applied, element) !== -1) {

-					return;

-				}

-				if (element.parentNode.tagName === oppositeListType) {

-					dom.split(element.parentNode, element);

-					makeList(element);

-					attemptMergeWithNext(element.parentNode, false);

-				}

-				applied.push(element);

-			}

-

-			function convertListItemToParagraph(element) {

-				var child, nextChild, mergedElement, splitLast;

-				if (tinymce.inArray(applied, element) !== -1) {

-					return;

-				}

-				element = splitNestedLists(element, dom);

-				while (dom.is(element.parentNode, 'ol,ul,li')) {

-					dom.split(element.parentNode, element);

-				}

-				// Push the original element we have from the selection, not the renamed one.

-				applied.push(element);

-				element = dom.rename(element, 'p');

-				mergedElement = attemptMergeWithAdjacent(element, false, ed.settings.force_br_newlines);

-				if (mergedElement === element) {

-					// Now split out any block elements that can't be contained within a P.

-					// Manually iterate to ensure we handle modifications correctly (doesn't work with tinymce.each)

-					child = element.firstChild;

-					while (child) {

-						if (dom.isBlock(child)) {

-							child = dom.split(child.parentNode, child);

-							splitLast = true;

-							nextChild = child.nextSibling && child.nextSibling.firstChild;

-						} else {

-							nextChild = child.nextSibling;

-							if (splitLast && child.tagName === 'BR') {

-								dom.remove(child);

-							}

-							splitLast = false;

-						}

-						child = nextChild;

-					}

-				}

-			}

-

-			each(selectedBlocks, function(e) {

-				e = findItemToOperateOn(e, dom);

-				if (e.tagName === oppositeListType || (e.tagName === 'LI' && e.parentNode.tagName === oppositeListType)) {

-					hasOppositeType = true;

-				} else if (e.tagName === targetListType || (e.tagName === 'LI' && e.parentNode.tagName === targetListType)) {

-					hasSameType = true;

-				} else {

-					hasNonList = true;

-				}

-			});

-

-			if (hasNonList &&!hasSameType || hasOppositeType || selectedBlocks.length === 0) {

-				actions = {

-					'LI': changeList,

-					'H1': makeList,

-					'H2': makeList,

-					'H3': makeList,

-					'H4': makeList,

-					'H5': makeList,

-					'H6': makeList,

-					'P': makeList,

-					'BODY': makeList,

-					'DIV': selectedBlocks.length > 1 ? makeList : wrapList,

-					defaultAction: wrapList,

-					elements: this.selectedBlocks()

-				};

-			} else {

-				actions = {

-					defaultAction: convertListItemToParagraph,

-					elements: this.selectedBlocks(),

-					processEvenIfEmpty: true

-				};

-			}

-			this.process(actions);

-		},

-

-		indent: function() {

-			var ed = this.ed, dom = ed.dom, indented = [];

-

-			function createWrapItem(element) {

-				var wrapItem = dom.create('li', { style: 'list-style-type: none;'});

-				dom.insertAfter(wrapItem, element);

-				return wrapItem;

-			}

-

-			function createWrapList(element) {

-				var wrapItem = createWrapItem(element),

-						list = dom.getParent(element, 'ol,ul'),

-						listType = list.tagName,

-						listStyle = dom.getStyle(list, 'list-style-type'),

-						attrs = {},

-						wrapList;

-				if (listStyle !== '') {

-					attrs.style = 'list-style-type: ' + listStyle + ';';

-				}

-				wrapList = dom.create(listType, attrs);

-				wrapItem.appendChild(wrapList);

-				return wrapList;

-			}

-

-			function indentLI(element) {

-				if (!hasParentInList(ed, element, indented)) {

-					element = splitNestedLists(element, dom);

-					var wrapList = createWrapList(element);

-					wrapList.appendChild(element);

-					attemptMergeWithAdjacent(wrapList.parentNode, false);

-					attemptMergeWithAdjacent(wrapList, false);

-					indented.push(element);

-				}

-			}

-

-			this.process({

-				'LI': indentLI,

-				defaultAction: this.adjustPaddingFunction(true),

-				elements: this.selectedBlocks()

-			});

-

-		},

-

-		outdent: function(ui, elements) {

-			var t = this, ed = t.ed, dom = ed.dom, outdented = [];

-

-			function outdentLI(element) {

-				var listElement, targetParent, align;

-				if (!hasParentInList(ed, element, outdented)) {

-					if (dom.getStyle(element, 'margin-left') !== '' || dom.getStyle(element, 'padding-left') !== '') {

-						return t.adjustPaddingFunction(false)(element);

-					}

-					align = dom.getStyle(element, 'text-align', true);

-					if (align === 'center' || align === 'right') {

-						dom.setStyle(element, 'text-align', 'left');

-						return;

-					}

-					element = splitNestedLists(element, dom);

-					listElement = element.parentNode;

-					targetParent = element.parentNode.parentNode;

-					if (targetParent.tagName === 'P') {

-						dom.split(targetParent, element.parentNode);

-					} else {

-						dom.split(listElement, element);

-						if (targetParent.tagName === 'LI') {

-							// Nested list, need to split the LI and go back out to the OL/UL element.

-							dom.split(targetParent, element);

-						} else if (!dom.is(targetParent, 'ol,ul')) {

-							dom.rename(element, 'p');

-						}

-					}

-					outdented.push(element);

-				}

-			}

-

-			var listElements = elements && tinymce.is(elements, 'array') ? elements : this.selectedBlocks();

-			this.process({

-				'LI': outdentLI,

-				defaultAction: this.adjustPaddingFunction(false),

-				elements: listElements

-			});

-

-			each(outdented, attemptMergeWithAdjacent);

-		},

-

-		process: function(actions) {

-			var t = this, sel = t.ed.selection, dom = t.ed.dom, selectedBlocks, r;

-

-			function isEmptyElement(element) {

-				var excludeBrsAndBookmarks = tinymce.grep(element.childNodes, function(n) {

-					return !(n.nodeName === 'BR' || n.nodeName === 'SPAN' && dom.getAttrib(n, 'data-mce-type') == 'bookmark'

-							|| n.nodeType == 3 && (n.nodeValue == String.fromCharCode(160) || n.nodeValue == ''));

-				});

-				return excludeBrsAndBookmarks.length === 0;

-			}

-

-			function processElement(element) {

-				dom.removeClass(element, '_mce_act_on');

-				if (!element || element.nodeType !== 1 || ! actions.processEvenIfEmpty && selectedBlocks.length > 1 && isEmptyElement(element)) {

-					return;

-				}

-				element = findItemToOperateOn(element, dom);

-				var action = actions[element.tagName];

-				if (!action) {

-					action = actions.defaultAction;

-				}

-				action(element);

-			}

-

-			function recurse(element) {

-				t.splitSafeEach(element.childNodes, processElement);

-			}

-

-			function brAtEdgeOfSelection(container, offset) {

-				return offset >= 0 && container.hasChildNodes() && offset < container.childNodes.length &&

-						container.childNodes[offset].tagName === 'BR';

-			}

-

-			function isInTable() {

-				var n = sel.getNode();

-				var p = dom.getParent(n, 'td');

-				return p !== null;

-			}

-

-			selectedBlocks = actions.elements;

-

-			r = sel.getRng(true);

-			if (!r.collapsed) {

-				if (brAtEdgeOfSelection(r.endContainer, r.endOffset - 1)) {

-					r.setEnd(r.endContainer, r.endOffset - 1);

-					sel.setRng(r);

-				}

-				if (brAtEdgeOfSelection(r.startContainer, r.startOffset)) {

-					r.setStart(r.startContainer, r.startOffset + 1);

-					sel.setRng(r);

-				}

-			}

-

-

-			if (tinymce.isIE8) {

-				// append a zero sized nbsp so that caret is restored correctly using bookmark

-				var s = t.ed.selection.getNode();

-				if (s.tagName === 'LI' && !(s.parentNode.lastChild === s)) {

-					var i = t.ed.getDoc().createTextNode('\uFEFF');

-					s.appendChild(i);

-				}

-			}

-

-			bookmark = sel.getBookmark();

-			actions.OL = actions.UL = recurse;

-			t.splitSafeEach(selectedBlocks, processElement);

-			sel.moveToBookmark(bookmark);

-			bookmark = null;

-

-			// we avoid doing repaint in a table as this will move the caret out of the table in Firefox 3.6

-			if (!isInTable()) {

-				// Avoids table or image handles being left behind in Firefox.

-				t.ed.execCommand('mceRepaint');

-			}

-		},

-

-		splitSafeEach: function(elements, f) {

-			if (tinymce.isGecko && (/Firefox\/[12]\.[0-9]/.test(navigator.userAgent) ||

-					/Firefox\/3\.[0-4]/.test(navigator.userAgent))) {

-				this.classBasedEach(elements, f);

-			} else {

-				each(elements, f);

-			}

-		},

-

-		classBasedEach: function(elements, f) {

-			var dom = this.ed.dom, nodes, element;

-			// Mark nodes

-			each(elements, function(element) {

-				dom.addClass(element, '_mce_act_on');

-			});

-			nodes = dom.select('._mce_act_on');

-			while (nodes.length > 0) {

-				element = nodes.shift();

-				dom.removeClass(element, '_mce_act_on');

-				f(element);

-				nodes = dom.select('._mce_act_on');

-			}

-		},

-

-		adjustPaddingFunction: function(isIndent) {

-			var indentAmount, indentUnits, ed = this.ed;

-			indentAmount = ed.settings.indentation;

-			indentUnits = /[a-z%]+/i.exec(indentAmount);

-			indentAmount = parseInt(indentAmount, 10);

-			return function(element) {

-				var currentIndent, newIndentAmount;

-				currentIndent = parseInt(ed.dom.getStyle(element, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(element, 'padding-left') || 0, 10);

-				if (isIndent) {

-					newIndentAmount = currentIndent + indentAmount;

-				} else {

-					newIndentAmount = currentIndent - indentAmount;

-				}

-				ed.dom.setStyle(element, 'padding-left', '');

-				ed.dom.setStyle(element, 'margin-left', newIndentAmount > 0 ? newIndentAmount + indentUnits : '');

-			};

-		},

-

-		selectedBlocks: function() {

-			var ed = this.ed

-			var selectedBlocks = ed.selection.getSelectedBlocks();

-			return selectedBlocks.length == 0 ? [ ed.dom.getRoot() ] : selectedBlocks;

-		},

-

-		getInfo: function() {

-			return {

-				longname : 'Lists',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		}

-	});

-	tinymce.PluginManager.add("lists", tinymce.plugins.Lists);

-}());

+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each, Event = tinymce.dom.Event, bookmark;
+
+	// Skips text nodes that only contain whitespace since they aren't semantically important.
+	function skipWhitespaceNodes(e, next) {
+		while (e && (e.nodeType === 8 || (e.nodeType === 3 && /^[ \t\n\r]*$/.test(e.nodeValue)))) {
+			e = next(e);
+		}
+		return e;
+	}
+
+	function skipWhitespaceNodesBackwards(e) {
+		return skipWhitespaceNodes(e, function(e) {
+			return e.previousSibling;
+		});
+	}
+
+	function skipWhitespaceNodesForwards(e) {
+		return skipWhitespaceNodes(e, function(e) {
+			return e.nextSibling;
+		});
+	}
+
+	function hasParentInList(ed, e, list) {
+		return ed.dom.getParent(e, function(p) {
+			return tinymce.inArray(list, p) !== -1;
+		});
+	}
+
+	function isList(e) {
+		return e && (e.tagName === 'OL' || e.tagName === 'UL');
+	}
+
+	function splitNestedLists(element, dom) {
+		var tmp, nested, wrapItem;
+		tmp = skipWhitespaceNodesBackwards(element.lastChild);
+		while (isList(tmp)) {
+			nested = tmp;
+			tmp = skipWhitespaceNodesBackwards(nested.previousSibling);
+		}
+		if (nested) {
+			wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+			dom.split(element, nested);
+			dom.insertAfter(wrapItem, nested);
+			wrapItem.appendChild(nested);
+			wrapItem.appendChild(nested);
+			element = wrapItem.previousSibling;
+		}
+		return element;
+	}
+
+	function attemptMergeWithAdjacent(e, allowDifferentListStyles, mergeParagraphs) {
+		e = attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs);
+		return attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs);
+	}
+
+	function attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs) {
+		var prev = skipWhitespaceNodesBackwards(e.previousSibling);
+		if (prev) {
+			return attemptMerge(prev, e, allowDifferentListStyles ? prev : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+
+	function attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs) {
+		var next = skipWhitespaceNodesForwards(e.nextSibling);
+		if (next) {
+			return attemptMerge(e, next, allowDifferentListStyles ? next : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+
+	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {
+		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {
+			return merge(e1, e2, differentStylesMasterElement);
+		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {
+			// Fix invalidly nested lists.
+			e1.appendChild(e2);
+		}
+		return e2;
+	}
+
+	function canMerge(e1, e2, allowDifferentListStyles, mergeParagraphs) {
+		if (!e1 || !e2) {
+			return false;
+		} else if (e1.tagName === 'LI' && e2.tagName === 'LI') {
+			return e2.style.listStyleType === 'none' || containsOnlyAList(e2);
+		} else if (isList(e1)) {
+			return (e1.tagName === e2.tagName && (allowDifferentListStyles || e1.style.listStyleType === e2.style.listStyleType)) || isListForIndent(e2);
+		} else return mergeParagraphs && e1.tagName === 'P' && e2.tagName === 'P';
+	}
+
+	function isListForIndent(e) {
+		var firstLI = skipWhitespaceNodesForwards(e.firstChild), lastLI = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstLI && lastLI && isList(e) && firstLI === lastLI && (isList(firstLI) || firstLI.style.listStyleType === 'none' || containsOnlyAList(firstLI));
+	}
+
+	function containsOnlyAList(e) {
+		var firstChild = skipWhitespaceNodesForwards(e.firstChild), lastChild = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);
+	}
+
+	function merge(e1, e2, masterElement) {
+		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);
+		if (e1.tagName === 'P') {
+			e1.appendChild(e1.ownerDocument.createElement('br'));
+		}
+		while (e2.firstChild) {
+			e1.appendChild(e2.firstChild);
+		}
+		if (masterElement) {
+			e1.style.listStyleType = masterElement.style.listStyleType;
+		}
+		e2.parentNode.removeChild(e2);
+		attemptMerge(lastOriginal, firstNew, false);
+		return e1;
+	}
+
+	function findItemToOperateOn(e, dom) {
+		var item;
+		if (!dom.is(e, 'li,ol,ul')) {
+			item = dom.getParent(e, 'li');
+			if (item) {
+				e = item;
+			}
+		}
+		return e;
+	}
+
+	tinymce.create('tinymce.plugins.Lists', {
+		init: function(ed) {
+			var LIST_TABBING = 'TABBING';
+			var LIST_EMPTY_ITEM = 'EMPTY';
+			var LIST_ESCAPE = 'ESCAPE';
+			var LIST_PARAGRAPH = 'PARAGRAPH';
+			var LIST_UNKNOWN = 'UNKNOWN';
+			var state = LIST_UNKNOWN;
+
+			function isTabInList(e) {
+				// Don't indent on Ctrl+Tab or Alt+Tab
+				return e.keyCode === tinymce.VK.TAB && !(e.altKey || e.ctrlKey) &&
+					(ed.queryCommandState('InsertUnorderedList') || ed.queryCommandState('InsertOrderedList'));
+			}
+
+			function isOnLastListItem() {
+				var li = getLi();
+				var grandParent = li.parentNode.parentNode;
+				var isLastItem = li.parentNode.lastChild === li;
+				return isLastItem && !isNestedList(grandParent) && isEmptyListItem(li);
+			}
+
+			function isNestedList(grandParent) {
+				if (isList(grandParent)) {
+					return grandParent.parentNode && grandParent.parentNode.tagName === 'LI';
+				} else {
+					return  grandParent.tagName === 'LI';
+				}
+			}
+
+			function isInEmptyListItem() {
+				return ed.selection.isCollapsed() && isEmptyListItem(getLi());
+			}
+
+			function getLi() {
+				var n = ed.selection.getStart();
+				// Get start will return BR if the LI only contains a BR or an empty element as we use these to fix caret position
+				return ((n.tagName == 'BR' || n.tagName == '') && n.parentNode.tagName == 'LI') ? n.parentNode : n;
+			}
+
+			function isEmptyListItem(li) {
+				var numChildren = li.childNodes.length;
+				if (li.tagName === 'LI') {
+					return numChildren == 0 ? true : numChildren == 1 && (li.firstChild.tagName == '' || li.firstChild.tagName == 'BR' || isEmptyIE9Li(li));
+				}
+				return false;
+			}
+
+			function isEmptyIE9Li(li) {
+				// only consider this to be last item if there is no list item content or that content is nbsp or space since IE9 creates these
+				var lis = tinymce.grep(li.parentNode.childNodes, function(n) {return n.tagName == 'LI'});
+				var isLastLi = li == lis[lis.length - 1];
+				var child = li.firstChild;
+				return tinymce.isIE9 && isLastLi && (child.nodeValue == String.fromCharCode(160) || child.nodeValue == String.fromCharCode(32));
+			}
+
+			function isEnter(e) {
+				return e.keyCode === tinymce.VK.ENTER;
+			}
+
+			function isEnterWithoutShift(e) {
+				return isEnter(e) && !e.shiftKey;
+			}
+
+			function getListKeyState(e) {
+				if (isTabInList(e)) {
+					return LIST_TABBING;
+				} else if (isEnterWithoutShift(e) && isOnLastListItem()) {
+					// Returns LIST_UNKNOWN since breaking out of lists is handled by the EnterKey.js logic now
+					//return LIST_ESCAPE;
+					return LIST_UNKNOWN;
+				} else if (isEnterWithoutShift(e) && isInEmptyListItem()) {
+					return LIST_EMPTY_ITEM;
+				} else {
+					return LIST_UNKNOWN;
+				}
+			}
+
+			function cancelDefaultEvents(ed, e) {
+				// list escape is done manually using outdent as it does not create paragraphs correctly in td's
+				if (state == LIST_TABBING || state == LIST_EMPTY_ITEM || tinymce.isGecko && state == LIST_ESCAPE) {
+					Event.cancel(e);
+				}
+			}
+
+			function isCursorAtEndOfContainer() {
+				var range = ed.selection.getRng(true);
+				var startContainer = range.startContainer;
+				if (startContainer.nodeType == 3) {
+					var value = startContainer.nodeValue;
+					if (tinymce.isIE9 && value.length > 1 && value.charCodeAt(value.length-1) == 32) {
+						// IE9 places a space on the end of the text in some cases so ignore last char
+						return (range.endOffset == value.length-1);
+					} else {
+						return (range.endOffset == value.length);
+					}
+				} else if (startContainer.nodeType == 1) {
+					return range.endOffset == startContainer.childNodes.length;
+				}
+				return false;
+			}
+
+			/*
+			 	If we are at the end of a list item surrounded with an element, pressing enter should create a
+			 	new list item instead without splitting the element e.g. don't want to create new P or H1 tag
+			  */
+			function isEndOfListItem() {
+				var node = ed.selection.getNode();
+				var validElements = 'h1,h2,h3,h4,h5,h6,p,div';
+				var isLastParagraphOfLi = ed.dom.is(node, validElements) && node.parentNode.tagName === 'LI' && node.parentNode.lastChild === node;
+				return ed.selection.isCollapsed() && isLastParagraphOfLi && isCursorAtEndOfContainer();
+			}
+
+			// Creates a new list item after the current selection's list item parent
+			function createNewLi(ed, e) {
+				if (isEnterWithoutShift(e) && isEndOfListItem()) {
+					var node = ed.selection.getNode();
+					var li = ed.dom.create("li");
+					var parentLi = ed.dom.getParent(node, 'li');
+					ed.dom.insertAfter(li, parentLi);
+
+					// Move caret to new list element.
+					if (tinymce.isIE6 || tinymce.isIE7 || tinyMCE.isIE8) {
+						// Removed this line since it would create an odd <&nbsp;> tag and placing the caret inside an empty LI is handled and should be handled by the selection logic
+						//li.appendChild(ed.dom.create("&nbsp;")); // IE needs an element within the bullet point
+						ed.selection.setCursorLocation(li, 1);
+					} else {
+						ed.selection.setCursorLocation(li, 0);
+					}
+					e.preventDefault();
+				}
+			}
+
+			function imageJoiningListItem(ed, e) {
+				var prevSibling;
+
+				if (!tinymce.isGecko)
+					return;
+
+				var n = ed.selection.getStart();
+				if (e.keyCode != tinymce.VK.BACKSPACE || n.tagName !== 'IMG')
+					return;
+
+				function lastLI(node) {
+					var child = node.firstChild;
+					var li = null;
+					do {
+						if (!child)
+							break;
+
+						if (child.tagName === 'LI')
+							li = child;
+					} while (child = child.nextSibling);
+
+					return li;
+				}
+
+				function addChildren(parentNode, destination) {
+					while (parentNode.childNodes.length > 0)
+						destination.appendChild(parentNode.childNodes[0]);
+				}
+
+				// Check if there is a previous sibling
+				prevSibling = n.parentNode.previousSibling;
+				if (!prevSibling)
+					return;
+
+				var ul;
+				if (prevSibling.tagName === 'UL' || prevSibling.tagName === 'OL')
+					ul = prevSibling;
+				else if (prevSibling.previousSibling && (prevSibling.previousSibling.tagName === 'UL' || prevSibling.previousSibling.tagName === 'OL'))
+					ul = prevSibling.previousSibling;
+				else
+					return;
+
+				var li = lastLI(ul);
+
+				// move the caret to the end of the list item
+				var rng = ed.dom.createRng();
+				rng.setStart(li, 1);
+				rng.setEnd(li, 1);
+				ed.selection.setRng(rng);
+				ed.selection.collapse(true);
+
+				// save a bookmark at the end of the list item
+				var bookmark = ed.selection.getBookmark();
+
+				// copy the image an its text to the list item
+				var clone = n.parentNode.cloneNode(true);
+				if (clone.tagName === 'P' || clone.tagName === 'DIV')
+					addChildren(clone, li);
+				else
+					li.appendChild(clone);
+
+				// remove the old copy of the image
+				n.parentNode.parentNode.removeChild(n.parentNode);
+
+				// move the caret where we saved the bookmark
+				ed.selection.moveToBookmark(bookmark);
+			}
+
+			// fix the cursor position to ensure it is correct in IE
+			function setCursorPositionToOriginalLi(li) {
+				var list = ed.dom.getParent(li, 'ol,ul');
+				if (list != null) {
+					var lastLi = list.lastChild;
+					// Removed this line since IE9 would report an DOM character error and placing the caret inside an empty LI is handled and should be handled by the selection logic
+					//lastLi.appendChild(ed.getDoc().createElement(''));
+					ed.selection.setCursorLocation(lastLi, 0);
+				}
+			}
+
+			this.ed = ed;
+			ed.addCommand('Indent', this.indent, this);
+			ed.addCommand('Outdent', this.outdent, this);
+			ed.addCommand('InsertUnorderedList', function() {
+				this.applyList('UL', 'OL');
+			}, this);
+			ed.addCommand('InsertOrderedList', function() {
+				this.applyList('OL', 'UL');
+			}, this);
+
+			ed.onInit.add(function() {
+				ed.editorCommands.addCommands({
+					'outdent': function() {
+						var sel = ed.selection, dom = ed.dom;
+
+						function hasStyleIndent(n) {
+							n = dom.getParent(n, dom.isBlock);
+							return n && (parseInt(ed.dom.getStyle(n, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(n, 'padding-left') || 0, 10)) > 0;
+						}
+
+						return hasStyleIndent(sel.getStart()) || hasStyleIndent(sel.getEnd()) || ed.queryCommandState('InsertOrderedList') || ed.queryCommandState('InsertUnorderedList');
+					}
+				}, 'state');
+			});
+
+			ed.onKeyUp.add(function(ed, e) {
+				if (state == LIST_TABBING) {
+					ed.execCommand(e.shiftKey ? 'Outdent' : 'Indent', true, null);
+					state = LIST_UNKNOWN;
+					return Event.cancel(e);
+				} else if (state == LIST_EMPTY_ITEM) {
+					var li = getLi();
+					var shouldOutdent =  ed.settings.list_outdent_on_enter === true || e.shiftKey;
+					ed.execCommand(shouldOutdent ? 'Outdent' : 'Indent', true, null);
+					if (tinymce.isIE) {
+						setCursorPositionToOriginalLi(li);
+					}
+
+					return Event.cancel(e);
+				} else if (state == LIST_ESCAPE) {
+					if (tinymce.isIE6 || tinymce.isIE7 || tinymce.isIE8) {
+						// append a zero sized nbsp so that caret is positioned correctly in IE after escaping and applying formatting.
+						// if there is no text then applying formatting for e.g a H1 to the P tag immediately following list after
+						// escaping from it will cause the caret to be positioned on the last li instead of staying the in P tag.
+						var n = ed.getDoc().createTextNode('\uFEFF');
+						ed.selection.getNode().appendChild(n);
+					} else if (tinymce.isIE9 || tinymce.isGecko) {
+						// IE9 does not escape the list so we use outdent to do this and cancel the default behaviour
+						// Gecko does not create a paragraph outdenting inside a TD so default behaviour is cancelled and we outdent ourselves
+						ed.execCommand('Outdent');
+						return Event.cancel(e);
+					}
+				}
+			});
+
+			function fixListItem(parent, reference) {
+				// a zero-sized non-breaking space is placed in the empty list item so that the nested list is
+				// displayed on the below line instead of next to it
+				var n = ed.getDoc().createTextNode('\uFEFF');
+				parent.insertBefore(n, reference);
+				ed.selection.setCursorLocation(n, 0);
+				// repaint to remove rendering artifact. only visible when creating new list
+				ed.execCommand('mceRepaint');
+			}
+
+			function fixIndentedListItemForGecko(ed, e) {
+				if (isEnter(e)) {
+					var li = getLi();
+					if (li) {
+						var parent = li.parentNode;
+						var grandParent = parent && parent.parentNode;
+						if (grandParent && grandParent.nodeName == 'LI' && grandParent.firstChild == parent && li == parent.firstChild) {
+							fixListItem(grandParent, parent);
+						}
+					}
+				}
+			}
+
+			function fixIndentedListItemForIE8(ed, e) {
+				if (isEnter(e)) {
+					var li = getLi();
+					if (ed.dom.select('ul li', li).length === 1) {
+						var list = li.firstChild;
+						fixListItem(li, list);
+					}
+				}
+			}
+
+			function fixDeletingFirstCharOfList(ed, e) {
+				function listElements(li) {
+					var elements = [];
+					var walker = new tinymce.dom.TreeWalker(li.firstChild, li);
+					for (var node = walker.current(); node; node = walker.next()) {
+						if (ed.dom.is(node, 'ol,ul,li')) {
+							elements.push(node);
+						}
+					}
+					return elements;
+				}
+
+				if (e.keyCode == tinymce.VK.BACKSPACE) {
+					var li = getLi();
+					if (li) {
+						var list = ed.dom.getParent(li, 'ol,ul'),
+							rng  = ed.selection.getRng();
+						if (list && list.firstChild === li && rng.startOffset == 0) {
+							var elements = listElements(li);
+							elements.unshift(li);
+							ed.execCommand("Outdent", false, elements);
+							ed.undoManager.add();
+							return Event.cancel(e);
+						}
+					}
+				}
+			}
+
+			function fixDeletingEmptyLiInWebkit(ed, e) {
+				var li = getLi();
+				if (e.keyCode === tinymce.VK.BACKSPACE && ed.dom.is(li, 'li') && li.parentNode.firstChild!==li) {
+					if (ed.dom.select('ul,ol', li).length === 1) {
+						var prevLi = li.previousSibling;
+						ed.dom.remove(ed.dom.select('br', li));
+						ed.dom.remove(li, true);
+						var textNodes = tinymce.grep(prevLi.childNodes, function(n){ return n.nodeType === 3 });
+						if (textNodes.length === 1) {
+							var textNode = textNodes[0];
+							ed.selection.setCursorLocation(textNode, textNode.length);
+						}
+						ed.undoManager.add();
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			ed.onKeyDown.add(function(_, e) { state = getListKeyState(e); });
+			ed.onKeyDown.add(cancelDefaultEvents);
+			ed.onKeyDown.add(imageJoiningListItem);
+			ed.onKeyDown.add(createNewLi);
+
+			if (tinymce.isGecko) {
+				ed.onKeyUp.add(fixIndentedListItemForGecko);
+			}
+			if (tinymce.isIE8) {
+				ed.onKeyUp.add(fixIndentedListItemForIE8);
+			}
+			if (tinymce.isGecko || tinymce.isWebKit) {
+				ed.onKeyDown.add(fixDeletingFirstCharOfList);
+			}
+			if (tinymce.isWebKit) {
+				ed.onKeyDown.add(fixDeletingEmptyLiInWebkit);
+			}
+		},
+
+		applyList: function(targetListType, oppositeListType) {
+			var t = this, ed = t.ed, dom = ed.dom, applied = [], hasSameType = false, hasOppositeType = false, hasNonList = false, actions,
+					selectedBlocks = ed.selection.getSelectedBlocks();
+
+			function cleanupBr(e) {
+				if (e && e.tagName === 'BR') {
+					dom.remove(e);
+				}
+			}
+
+			function makeList(element) {
+				var list = dom.create(targetListType), li;
+
+				function adjustIndentForNewList(element) {
+					// If there's a margin-left, outdent one level to account for the extra list margin.
+					if (element.style.marginLeft || element.style.paddingLeft) {
+						t.adjustPaddingFunction(false)(element);
+					}
+				}
+
+				if (element.tagName === 'LI') {
+					// No change required.
+				} else if (element.tagName === 'P' || element.tagName === 'DIV' || element.tagName === 'BODY') {
+					processBrs(element, function(startSection, br) {
+						doWrapList(startSection, br, element.tagName === 'BODY' ? null : startSection.parentNode);
+						li = startSection.parentNode;
+						adjustIndentForNewList(li);
+						cleanupBr(br);
+					});
+					if (li) {
+						if (li.tagName === 'LI' && (element.tagName === 'P' || selectedBlocks.length > 1)) {
+							dom.split(li.parentNode.parentNode, li.parentNode);
+						}
+						attemptMergeWithAdjacent(li.parentNode, true);
+					}
+					return;
+				} else {
+					// Put the list around the element.
+					li = dom.create('li');
+					dom.insertAfter(li, element);
+					li.appendChild(element);
+					adjustIndentForNewList(element);
+					element = li;
+				}
+				dom.insertAfter(list, element);
+				list.appendChild(element);
+				attemptMergeWithAdjacent(list, true);
+				applied.push(element);
+			}
+
+			function doWrapList(start, end, template) {
+				var li, n = start, tmp;
+				while (!dom.isBlock(start.parentNode) && start.parentNode !== dom.getRoot()) {
+					start = dom.split(start.parentNode, start.previousSibling);
+					start = start.nextSibling;
+					n = start;
+				}
+				if (template) {
+					li = template.cloneNode(true);
+					start.parentNode.insertBefore(li, start);
+					while (li.firstChild) dom.remove(li.firstChild);
+					li = dom.rename(li, 'li');
+				} else {
+					li = dom.create('li');
+					start.parentNode.insertBefore(li, start);
+				}
+				while (n && n != end) {
+					tmp = n.nextSibling;
+					li.appendChild(n);
+					n = tmp;
+				}
+				if (li.childNodes.length === 0) {
+					li.innerHTML = '<br _mce_bogus="1" />';
+				}
+				makeList(li);
+			}
+
+			function processBrs(element, callback) {
+				var startSection, previousBR, END_TO_START = 3, START_TO_END = 1,
+						breakElements = 'br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl';
+
+				function isAnyPartSelected(start, end) {
+					var r = dom.createRng(), sel;
+					bookmark.keep = true;
+					ed.selection.moveToBookmark(bookmark);
+					bookmark.keep = false;
+					sel = ed.selection.getRng(true);
+					if (!end) {
+						end = start.parentNode.lastChild;
+					}
+					r.setStartBefore(start);
+					r.setEndAfter(end);
+					return !(r.compareBoundaryPoints(END_TO_START, sel) > 0 || r.compareBoundaryPoints(START_TO_END, sel) <= 0);
+				}
+
+				function nextLeaf(br) {
+					if (br.nextSibling)
+						return br.nextSibling;
+					if (!dom.isBlock(br.parentNode) && br.parentNode !== dom.getRoot())
+						return nextLeaf(br.parentNode);
+				}
+
+				// Split on BRs within the range and process those.
+				startSection = element.firstChild;
+				// First mark the BRs that have any part of the previous section selected.
+				var trailingContentSelected = false;
+				each(dom.select(breakElements, element), function(br) {
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (isAnyPartSelected(startSection, br)) {
+						dom.addClass(br, '_mce_tagged_br');
+						startSection = nextLeaf(br);
+					}
+				});
+				trailingContentSelected = (startSection && isAnyPartSelected(startSection, undefined));
+				startSection = element.firstChild;
+				each(dom.select(breakElements, element), function(br) {
+					// Got a section from start to br.
+					var tmp = nextLeaf(br);
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (dom.hasClass(br, '_mce_tagged_br')) {
+						callback(startSection, br, previousBR);
+						previousBR = null;
+					} else {
+						previousBR = br;
+					}
+					startSection = tmp;
+				});
+				if (trailingContentSelected) {
+					callback(startSection, undefined, previousBR);
+				}
+			}
+
+			function wrapList(element) {
+				processBrs(element, function(startSection, br, previousBR) {
+					// Need to indent this part
+					doWrapList(startSection, br);
+					cleanupBr(br);
+					cleanupBr(previousBR);
+				});
+			}
+
+			function changeList(element) {
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				if (element.parentNode.tagName === oppositeListType) {
+					dom.split(element.parentNode, element);
+					makeList(element);
+					attemptMergeWithNext(element.parentNode, false);
+				}
+				applied.push(element);
+			}
+
+			function convertListItemToParagraph(element) {
+				var child, nextChild, mergedElement, splitLast;
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				element = splitNestedLists(element, dom);
+				while (dom.is(element.parentNode, 'ol,ul,li')) {
+					dom.split(element.parentNode, element);
+				}
+				// Push the original element we have from the selection, not the renamed one.
+				applied.push(element);
+				element = dom.rename(element, 'p');
+				mergedElement = attemptMergeWithAdjacent(element, false, ed.settings.force_br_newlines);
+				if (mergedElement === element) {
+					// Now split out any block elements that can't be contained within a P.
+					// Manually iterate to ensure we handle modifications correctly (doesn't work with tinymce.each)
+					child = element.firstChild;
+					while (child) {
+						if (dom.isBlock(child)) {
+							child = dom.split(child.parentNode, child);
+							splitLast = true;
+							nextChild = child.nextSibling && child.nextSibling.firstChild;
+						} else {
+							nextChild = child.nextSibling;
+							if (splitLast && child.tagName === 'BR') {
+								dom.remove(child);
+							}
+							splitLast = false;
+						}
+						child = nextChild;
+					}
+				}
+			}
+
+			each(selectedBlocks, function(e) {
+				e = findItemToOperateOn(e, dom);
+				if (e.tagName === oppositeListType || (e.tagName === 'LI' && e.parentNode.tagName === oppositeListType)) {
+					hasOppositeType = true;
+				} else if (e.tagName === targetListType || (e.tagName === 'LI' && e.parentNode.tagName === targetListType)) {
+					hasSameType = true;
+				} else {
+					hasNonList = true;
+				}
+			});
+
+			if (hasNonList &&!hasSameType || hasOppositeType || selectedBlocks.length === 0) {
+				actions = {
+					'LI': changeList,
+					'H1': makeList,
+					'H2': makeList,
+					'H3': makeList,
+					'H4': makeList,
+					'H5': makeList,
+					'H6': makeList,
+					'P': makeList,
+					'BODY': makeList,
+					'DIV': selectedBlocks.length > 1 ? makeList : wrapList,
+					defaultAction: wrapList,
+					elements: this.selectedBlocks()
+				};
+			} else {
+				actions = {
+					defaultAction: convertListItemToParagraph,
+					elements: this.selectedBlocks(),
+					processEvenIfEmpty: true
+				};
+			}
+			this.process(actions);
+		},
+
+		indent: function() {
+			var ed = this.ed, dom = ed.dom, indented = [];
+
+			function createWrapItem(element) {
+				var wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+				dom.insertAfter(wrapItem, element);
+				return wrapItem;
+			}
+
+			function createWrapList(element) {
+				var wrapItem = createWrapItem(element),
+						list = dom.getParent(element, 'ol,ul'),
+						listType = list.tagName,
+						listStyle = dom.getStyle(list, 'list-style-type'),
+						attrs = {},
+						wrapList;
+				if (listStyle !== '') {
+					attrs.style = 'list-style-type: ' + listStyle + ';';
+				}
+				wrapList = dom.create(listType, attrs);
+				wrapItem.appendChild(wrapList);
+				return wrapList;
+			}
+
+			function indentLI(element) {
+				if (!hasParentInList(ed, element, indented)) {
+					element = splitNestedLists(element, dom);
+					var wrapList = createWrapList(element);
+					wrapList.appendChild(element);
+					attemptMergeWithAdjacent(wrapList.parentNode, false);
+					attemptMergeWithAdjacent(wrapList, false);
+					indented.push(element);
+				}
+			}
+
+			this.process({
+				'LI': indentLI,
+				defaultAction: this.adjustPaddingFunction(true),
+				elements: this.selectedBlocks()
+			});
+
+		},
+
+		outdent: function(ui, elements) {
+			var t = this, ed = t.ed, dom = ed.dom, outdented = [];
+
+			function outdentLI(element) {
+				var listElement, targetParent, align;
+				if (!hasParentInList(ed, element, outdented)) {
+					if (dom.getStyle(element, 'margin-left') !== '' || dom.getStyle(element, 'padding-left') !== '') {
+						return t.adjustPaddingFunction(false)(element);
+					}
+					align = dom.getStyle(element, 'text-align', true);
+					if (align === 'center' || align === 'right') {
+						dom.setStyle(element, 'text-align', 'left');
+						return;
+					}
+					element = splitNestedLists(element, dom);
+					listElement = element.parentNode;
+					targetParent = element.parentNode.parentNode;
+					if (targetParent.tagName === 'P') {
+						dom.split(targetParent, element.parentNode);
+					} else {
+						dom.split(listElement, element);
+						if (targetParent.tagName === 'LI') {
+							// Nested list, need to split the LI and go back out to the OL/UL element.
+							dom.split(targetParent, element);
+						} else if (!dom.is(targetParent, 'ol,ul')) {
+							dom.rename(element, 'p');
+						}
+					}
+					outdented.push(element);
+				}
+			}
+
+			var listElements = elements && tinymce.is(elements, 'array') ? elements : this.selectedBlocks();
+			this.process({
+				'LI': outdentLI,
+				defaultAction: this.adjustPaddingFunction(false),
+				elements: listElements
+			});
+
+			each(outdented, attemptMergeWithAdjacent);
+		},
+
+		process: function(actions) {
+			var t = this, sel = t.ed.selection, dom = t.ed.dom, selectedBlocks, r;
+
+			function isEmptyElement(element) {
+				var excludeBrsAndBookmarks = tinymce.grep(element.childNodes, function(n) {
+					return !(n.nodeName === 'BR' || n.nodeName === 'SPAN' && dom.getAttrib(n, 'data-mce-type') == 'bookmark'
+							|| n.nodeType == 3 && (n.nodeValue == String.fromCharCode(160) || n.nodeValue == ''));
+				});
+				return excludeBrsAndBookmarks.length === 0;
+			}
+
+			function processElement(element) {
+				dom.removeClass(element, '_mce_act_on');
+				if (!element || element.nodeType !== 1 || ! actions.processEvenIfEmpty && selectedBlocks.length > 1 && isEmptyElement(element)) {
+					return;
+				}
+				element = findItemToOperateOn(element, dom);
+				var action = actions[element.tagName];
+				if (!action) {
+					action = actions.defaultAction;
+				}
+				action(element);
+			}
+
+			function recurse(element) {
+				t.splitSafeEach(element.childNodes, processElement, true);
+			}
+
+			function brAtEdgeOfSelection(container, offset) {
+				return offset >= 0 && container.hasChildNodes() && offset < container.childNodes.length &&
+						container.childNodes[offset].tagName === 'BR';
+			}
+
+			function isInTable() {
+				var n = sel.getNode();
+				var p = dom.getParent(n, 'td');
+				return p !== null;
+			}
+
+			selectedBlocks = actions.elements;
+
+			r = sel.getRng(true);
+			if (!r.collapsed) {
+				if (brAtEdgeOfSelection(r.endContainer, r.endOffset - 1)) {
+					r.setEnd(r.endContainer, r.endOffset - 1);
+					sel.setRng(r);
+				}
+				if (brAtEdgeOfSelection(r.startContainer, r.startOffset)) {
+					r.setStart(r.startContainer, r.startOffset + 1);
+					sel.setRng(r);
+				}
+			}
+
+
+			if (tinymce.isIE8) {
+				// append a zero sized nbsp so that caret is restored correctly using bookmark
+				var s = t.ed.selection.getNode();
+				if (s.tagName === 'LI' && !(s.parentNode.lastChild === s)) {
+					var i = t.ed.getDoc().createTextNode('\uFEFF');
+					s.appendChild(i);
+				}
+			}
+
+			bookmark = sel.getBookmark();
+			actions.OL = actions.UL = recurse;
+			t.splitSafeEach(selectedBlocks, processElement);
+			sel.moveToBookmark(bookmark);
+			bookmark = null;
+
+			// we avoid doing repaint in a table as this will move the caret out of the table in Firefox 3.6
+			if (!isInTable()) {
+				// Avoids table or image handles being left behind in Firefox.
+				t.ed.execCommand('mceRepaint');
+			}
+		},
+
+		splitSafeEach: function(elements, f, forceClassBase) {
+			if (forceClassBase ||
+				(tinymce.isGecko &&
+					(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent) ||
+					 /Firefox\/3\.[0-4]/.test(navigator.userAgent)))) {
+				this.classBasedEach(elements, f);
+			} else {
+				each(elements, f);
+			}
+		},
+
+		classBasedEach: function(elements, f) {
+			var dom = this.ed.dom, nodes, element;
+			// Mark nodes
+			each(elements, function(element) {
+				dom.addClass(element, '_mce_act_on');
+			});
+			nodes = dom.select('._mce_act_on');
+			while (nodes.length > 0) {
+				element = nodes.shift();
+				dom.removeClass(element, '_mce_act_on');
+				f(element);
+				nodes = dom.select('._mce_act_on');
+			}
+		},
+
+		adjustPaddingFunction: function(isIndent) {
+			var indentAmount, indentUnits, ed = this.ed;
+			indentAmount = ed.settings.indentation;
+			indentUnits = /[a-z%]+/i.exec(indentAmount);
+			indentAmount = parseInt(indentAmount, 10);
+			return function(element) {
+				var currentIndent, newIndentAmount;
+				currentIndent = parseInt(ed.dom.getStyle(element, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(element, 'padding-left') || 0, 10);
+				if (isIndent) {
+					newIndentAmount = currentIndent + indentAmount;
+				} else {
+					newIndentAmount = currentIndent - indentAmount;
+				}
+				ed.dom.setStyle(element, 'padding-left', '');
+				ed.dom.setStyle(element, 'margin-left', newIndentAmount > 0 ? newIndentAmount + indentUnits : '');
+			};
+		},
+
+		selectedBlocks: function() {
+			var ed = this.ed, selectedBlocks = ed.selection.getSelectedBlocks();
+			return selectedBlocks.length == 0 ? [ ed.dom.getRoot() ] : selectedBlocks;
+		},
+
+		getInfo: function() {
+			return {
+				longname : 'Lists',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	tinymce.PluginManager.add("lists", tinymce.plugins.Lists);
+}());
diff --git a/program/js/tiny_mce/plugins/media/editor_plugin_src.js b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
index aee92360b..33a58050e 100644
--- a/program/js/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
@@ -382,7 +382,7 @@
 			data = JSON.parse(data);

 			typeItem = this.getType(node.attr('class'));

 

-			style = node.attr('data-mce-style')

+			style = node.attr('data-mce-style');

 			if (!style) {

 				style = node.attr('style');

 

diff --git a/program/js/tiny_mce/plugins/media/js/media.js b/program/js/tiny_mce/plugins/media/js/media.js
index 733c5f6c2..f6a081a63 100644
--- a/program/js/tiny_mce/plugins/media/js/media.js
+++ b/program/js/tiny_mce/plugins/media/js/media.js
@@ -78,7 +78,7 @@
 			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');

 			get('audio_altsource1_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource1','audio_altsource1','media','media');

 			get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');

-			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');

+			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','image','media');

 

 			html = self.getMediaListHTML('medialist', 'src', 'media', 'media');

 			if (html == "")

@@ -326,6 +326,39 @@
 					setVal('src', src);

 					setVal('media_type', data.type);

 				}

+				

+				// Vimeo

+				if (src.match(/vimeo.com\/([0-9]+)/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://player.vimeo.com/video/' + src.match(/vimeo.com\/([0-9]+)/)[1];

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+            

+				// stream.cz

+				if (src.match(/stream.cz\/((?!object).)*\/([0-9]+)/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://www.stream.cz/object/' + src.match(/stream.cz\/[^/]+\/([0-9]+)/)[1];

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

+				

+				// Google maps

+				if (src.match(/maps.google.([a-z]{2,3})\/maps\/(.+)msid=(.+)/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://maps.google.com/maps/ms?msid=' + src.match(/msid=(.+)/)[1] + "&output=embed";

+					setVal('src', src);

+					setVal('media_type', data.type);

+				}

 

 				if (data.type == 'video') {

 					if (!data.video.sources)

diff --git a/program/js/tiny_mce/plugins/noneditable/editor_plugin.js b/program/js/tiny_mce/plugins/noneditable/editor_plugin.js
index e204328d9..da411ebc0 100644
--- a/program/js/tiny_mce/plugins/noneditable/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.dom.TreeWalker;var a="contenteditable",d="data-mce-"+a;var e=tinymce.VK;function b(n){var j=n.dom,p=n.selection,r,o="mce_noneditablecaret";r=tinymce.isGecko?"\u200B":"\uFEFF";function m(t){var s;if(t.nodeType===1){s=t.getAttribute(d);if(s&&s!=="inherit"){return s}s=t.contentEditable;if(s!=="inherit"){return s}}return null}function g(s){var t;while(s){t=m(s);if(t){return t==="false"?s:null}s=s.parentNode}}function l(s){while(s){if(s.id===o){return s}s=s.parentNode}}function k(s){var t;if(s){t=new c(s,s);for(s=t.current();s;s=t.next()){if(s.nodeType===3){return s}}}}function f(v,u){var s,t;if(m(v)==="false"){if(j.isBlock(v)){p.select(v);return}}t=j.createRng();if(m(v)==="true"){if(!v.firstChild){v.appendChild(n.getDoc().createTextNode("\u00a0"))}v=v.firstChild;u=true}s=j.create("span",{id:o,"data-mce-bogus":true},r);if(u){v.parentNode.insertBefore(s,v)}else{j.insertAfter(s,v)}t.setStart(s.firstChild,1);t.collapse(true);p.setRng(t);return s}function i(s){var v,t,u;if(s){rng=p.getRng(true);rng.setStartBefore(s);rng.setEndBefore(s);v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true);p.setRng(rng)}else{t=l(p.getStart());while((s=j.get(o))&&s!==u){if(t!==s){v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true)}u=s}}}function q(){var s,w,u,t,v;function x(B,D){var A,F,E,C,z;A=t.startContainer;F=t.startOffset;if(A.nodeType==3){z=A.nodeValue.length;if((F>0&&F<z)||(D?F==z:F==0)){return}}else{if(F<A.childNodes.length){var G=!D&&F>0?F-1:F;A=A.childNodes[G];if(A.hasChildNodes()){A=A.firstChild}}else{return !D?B:null}}E=new c(A,B);while(C=E[D?"prev":"next"]()){if(C.nodeType===3&&C.nodeValue.length>0){return}else{if(m(C)==="true"){return C}}}return B}i();u=p.isCollapsed();s=g(p.getStart());w=g(p.getEnd());if(s||w){t=p.getRng(true);if(u){s=s||w;var y=p.getStart();if(v=x(s,true)){f(v,true)}else{if(v=x(s,false)){f(v,false)}else{p.select(s)}}}else{t=p.getRng(true);if(s){t.setStartBefore(s)}if(w){t.setEndAfter(w)}p.setRng(t)}}}function h(z,B){var F=B.keyCode,x,C,D,v;function u(H,G){while(H=H[G?"previousSibling":"nextSibling"]){if(H.nodeType!==3||H.nodeValue.length>0){return H}}}function y(G,H){p.select(G);p.collapse(H)}function t(K){var J,I,M,H;function G(O){var N=I;while(N){if(N===O){return}N=N.parentNode}j.remove(O);q()}function L(){var O,P,N=z.schema.getNonEmptyElements();P=new tinymce.dom.TreeWalker(I,z.getBody());while(O=(K?P.prev():P.next())){if(N[O.nodeName.toLowerCase()]){break}if(O.nodeType===3&&tinymce.trim(O.nodeValue).length>0){break}if(m(O)==="false"){G(O);return true}}if(g(O)){return true}return false}if(p.isCollapsed()){J=p.getRng(true);I=J.startContainer;M=J.startOffset;I=l(I)||I;if(H=g(I)){G(H);return false}if(I.nodeType==3&&(K?M>0:M<I.nodeValue.length)){return true}if(I.nodeType==1){I=I.childNodes[M]||I}if(L()){return false}}return true}D=p.getStart();v=p.getEnd();x=g(D)||g(v);if(x&&(F<112||F>124)&&F!=e.DELETE&&F!=e.BACKSPACE){if((tinymce.isMac?B.metaKey:B.ctrlKey)&&(F==67||F==88||F==86)){return}B.preventDefault();if(F==e.LEFT||F==e.RIGHT){var w=F==e.LEFT;if(z.dom.isBlock(x)){var A=w?x.previousSibling:x.nextSibling;var s=new c(A,A);var E=w?s.prev():s.next();y(E,!w)}else{y(x,w)}}}else{if(F==e.LEFT||F==e.RIGHT||F==e.BACKSPACE||F==e.DELETE){C=l(D);if(C){if(F==e.LEFT||F==e.BACKSPACE){x=u(C,true);if(x&&m(x)==="false"){B.preventDefault();if(F==e.LEFT){y(x,true)}else{j.remove(x);return}}else{i(C)}}if(F==e.RIGHT||F==e.DELETE){x=u(C);if(x&&m(x)==="false"){B.preventDefault();if(F==e.RIGHT){y(x,false)}else{j.remove(x);return}}else{i(C)}}}if((F==e.BACKSPACE||F==e.DELETE)&&!t(F==e.BACKSPACE)){B.preventDefault();return false}}}}n.onMouseDown.addToTop(function(s,u){var t=s.selection.getNode();if(m(t)==="false"&&t==u.target){q()}});n.onMouseUp.addToTop(q);n.onKeyDown.addToTop(h);n.onKeyUp.addToTop(q)}tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(i,k){var h,g,j;function f(m,n){var o=j.length,p=n.content,l=tinymce.trim(g);if(n.format=="raw"){return}while(o--){p=p.replace(j[o],function(s){var r=arguments,q=r[r.length-2];if(q>0&&p.charAt(q-1)=='"'){return s}return'<span class="'+l+'" data-mce-content="'+m.dom.encode(r[0])+'">'+m.dom.encode(typeof(r[1])==="string"?r[1]:r[0])+"</span>"})}n.content=p}h=" "+tinymce.trim(i.getParam("noneditable_editable_class","mceEditable"))+" ";g=" "+tinymce.trim(i.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";j=i.getParam("noneditable_regexp");if(j&&!j.length){j=[j]}i.onPreInit.add(function(){b(i);if(j){i.selection.onBeforeSetContent.add(f);i.onBeforeSetContent.add(f)}i.parser.addAttributeFilter("class",function(l){var m=l.length,n,o;while(m--){o=l[m];n=" "+o.attr("class")+" ";if(n.indexOf(h)!==-1){o.attr(d,"true")}else{if(n.indexOf(g)!==-1){o.attr(d,"false")}}}});i.serializer.addAttributeFilter(d,function(l,m){var n=l.length,o;while(n--){o=l[n];if(j&&o.attr("data-mce-content")){o.name="#text";o.type=3;o.raw=true;o.value=o.attr("data-mce-content")}else{o.attr(a,null);o.attr(d,null)}}});i.parser.addAttributeFilter(a,function(l,m){var n=l.length,o;while(n--){o=l[n];o.attr(d,o.attr(a));o.attr(a,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.dom.TreeWalker;var a="contenteditable",d="data-mce-"+a;var e=tinymce.VK;function b(n){var j=n.dom,p=n.selection,r,o="mce_noneditablecaret",r="\uFEFF";function m(t){var s;if(t.nodeType===1){s=t.getAttribute(d);if(s&&s!=="inherit"){return s}s=t.contentEditable;if(s!=="inherit"){return s}}return null}function g(s){var t;while(s){t=m(s);if(t){return t==="false"?s:null}s=s.parentNode}}function l(s){while(s){if(s.id===o){return s}s=s.parentNode}}function k(s){var t;if(s){t=new c(s,s);for(s=t.current();s;s=t.next()){if(s.nodeType===3){return s}}}}function f(v,u){var s,t;if(m(v)==="false"){if(j.isBlock(v)){p.select(v);return}}t=j.createRng();if(m(v)==="true"){if(!v.firstChild){v.appendChild(n.getDoc().createTextNode("\u00a0"))}v=v.firstChild;u=true}s=j.create("span",{id:o,"data-mce-bogus":true},r);if(u){v.parentNode.insertBefore(s,v)}else{j.insertAfter(s,v)}t.setStart(s.firstChild,1);t.collapse(true);p.setRng(t);return s}function i(s){var v,t,u;if(s){rng=p.getRng(true);rng.setStartBefore(s);rng.setEndBefore(s);v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true);p.setRng(rng)}else{t=l(p.getStart());while((s=j.get(o))&&s!==u){if(t!==s){v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true)}u=s}}}function q(){var s,w,u,t,v;function x(B,D){var A,F,E,C,z;A=t.startContainer;F=t.startOffset;if(A.nodeType==3){z=A.nodeValue.length;if((F>0&&F<z)||(D?F==z:F==0)){return}}else{if(F<A.childNodes.length){var G=!D&&F>0?F-1:F;A=A.childNodes[G];if(A.hasChildNodes()){A=A.firstChild}}else{return !D?B:null}}E=new c(A,B);while(C=E[D?"prev":"next"]()){if(C.nodeType===3&&C.nodeValue.length>0){return}else{if(m(C)==="true"){return C}}}return B}i();u=p.isCollapsed();s=g(p.getStart());w=g(p.getEnd());if(s||w){t=p.getRng(true);if(u){s=s||w;var y=p.getStart();if(v=x(s,true)){f(v,true)}else{if(v=x(s,false)){f(v,false)}else{p.select(s)}}}else{t=p.getRng(true);if(s){t.setStartBefore(s)}if(w){t.setEndAfter(w)}p.setRng(t)}}}function h(z,B){var F=B.keyCode,x,C,D,v;function u(H,G){while(H=H[G?"previousSibling":"nextSibling"]){if(H.nodeType!==3||H.nodeValue.length>0){return H}}}function y(G,H){p.select(G);p.collapse(H)}function t(K){var J,I,M,H;function G(O){var N=I;while(N){if(N===O){return}N=N.parentNode}j.remove(O);q()}function L(){var O,P,N=z.schema.getNonEmptyElements();P=new tinymce.dom.TreeWalker(I,z.getBody());while(O=(K?P.prev():P.next())){if(N[O.nodeName.toLowerCase()]){break}if(O.nodeType===3&&tinymce.trim(O.nodeValue).length>0){break}if(m(O)==="false"){G(O);return true}}if(g(O)){return true}return false}if(p.isCollapsed()){J=p.getRng(true);I=J.startContainer;M=J.startOffset;I=l(I)||I;if(H=g(I)){G(H);return false}if(I.nodeType==3&&(K?M>0:M<I.nodeValue.length)){return true}if(I.nodeType==1){I=I.childNodes[M]||I}if(L()){return false}}return true}D=p.getStart();v=p.getEnd();x=g(D)||g(v);if(x&&(F<112||F>124)&&F!=e.DELETE&&F!=e.BACKSPACE){if((tinymce.isMac?B.metaKey:B.ctrlKey)&&(F==67||F==88||F==86)){return}B.preventDefault();if(F==e.LEFT||F==e.RIGHT){var w=F==e.LEFT;if(z.dom.isBlock(x)){var A=w?x.previousSibling:x.nextSibling;var s=new c(A,A);var E=w?s.prev():s.next();y(E,!w)}else{y(x,w)}}}else{if(F==e.LEFT||F==e.RIGHT||F==e.BACKSPACE||F==e.DELETE){C=l(D);if(C){if(F==e.LEFT||F==e.BACKSPACE){x=u(C,true);if(x&&m(x)==="false"){B.preventDefault();if(F==e.LEFT){y(x,true)}else{j.remove(x);return}}else{i(C)}}if(F==e.RIGHT||F==e.DELETE){x=u(C);if(x&&m(x)==="false"){B.preventDefault();if(F==e.RIGHT){y(x,false)}else{j.remove(x);return}}else{i(C)}}}if((F==e.BACKSPACE||F==e.DELETE)&&!t(F==e.BACKSPACE)){B.preventDefault();return false}}}}n.onMouseDown.addToTop(function(s,u){var t=s.selection.getNode();if(m(t)==="false"&&t==u.target){q()}});n.onMouseUp.addToTop(q);n.onKeyDown.addToTop(h);n.onKeyUp.addToTop(q)}tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(i,k){var h,g,j;function f(m,n){var o=j.length,p=n.content,l=tinymce.trim(g);if(n.format=="raw"){return}while(o--){p=p.replace(j[o],function(s){var r=arguments,q=r[r.length-2];if(q>0&&p.charAt(q-1)=='"'){return s}return'<span class="'+l+'" data-mce-content="'+m.dom.encode(r[0])+'">'+m.dom.encode(typeof(r[1])==="string"?r[1]:r[0])+"</span>"})}n.content=p}h=" "+tinymce.trim(i.getParam("noneditable_editable_class","mceEditable"))+" ";g=" "+tinymce.trim(i.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";j=i.getParam("noneditable_regexp");if(j&&!j.length){j=[j]}i.onPreInit.add(function(){b(i);if(j){i.selection.onBeforeSetContent.add(f);i.onBeforeSetContent.add(f)}i.parser.addAttributeFilter("class",function(l){var m=l.length,n,o;while(m--){o=l[m];n=" "+o.attr("class")+" ";if(n.indexOf(h)!==-1){o.attr(d,"true")}else{if(n.indexOf(g)!==-1){o.attr(d,"false")}}}});i.serializer.addAttributeFilter(d,function(l,m){var n=l.length,o;while(n--){o=l[n];if(j&&o.attr("data-mce-content")){o.name="#text";o.type=3;o.raw=true;o.value=o.attr("data-mce-content")}else{o.attr(a,null);o.attr(d,null)}}});i.parser.addAttributeFilter(a,function(l,m){var n=l.length,o;while(n--){o=l[n];o.attr(d,o.attr(a));o.attr(a,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/noneditable/editor_plugin_src.js b/program/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
index c0efe749c..a18bcd786 100644
--- a/program/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -14,10 +14,7 @@
 	var VK = tinymce.VK;

 

 	function handleContentEditableSelection(ed) {

-		var dom = ed.dom, selection = ed.selection, invisibleChar, caretContainerId = 'mce_noneditablecaret';

-

-		// Setup invisible character use zero width space on Gecko since it doesn't change the height of the container

-		invisibleChar = tinymce.isGecko ? '\u200B' : '\uFEFF';

+		var dom = ed.dom, selection = ed.selection, invisibleChar, caretContainerId = 'mce_noneditablecaret', invisibleChar = '\uFEFF';

 

 		// Returns the content editable state of a node "true/false" or null

 		function getContentEditable(node) {

diff --git a/program/js/tiny_mce/plugins/style/langs/es_dlg.js b/program/js/tiny_mce/plugins/style/langs/es_dlg.js
index 9bbaa5f5d..7a63754a7 100644
--- a/program/js/tiny_mce/plugins/style/langs/es_dlg.js
+++ b/program/js/tiny_mce/plugins/style/langs/es_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('es.style_dlg',{"text_lineheight":"Ancho de la fila","text_variant":"Variante","text_style":"Estilo","text_weight":"Peso","text_size":"Tama\u00f1o","text_font":"Fuente","text_props":"Texto","positioning_tab":"Posici\u00f3n","list_tab":"Lista","border_tab":"Borde","box_tab":"Caja","block_tab":"Bloque","background_tab":"Fondo","text_tab":"Texto",apply:"Aplicar",title:"Editar Estilo CSS",clip:"Clip",placement:"Placement",overflow:"Overflow",zindex:"Z-index",visibility:"Visibilidad","positioning_type":"Tipo",position:"Posici\u00f3n","bullet_image":"Imagen de la vi\u00f1eta","list_type":"Tipo",color:"Color",height:"Alto",width:"Ancho",style:"Estilo",margin:"Margen",left:"Izquierda",bottom:"Debajo",right:"Derecha",top:"Arriba",same:"Lo mismo en todos",padding:"Padding","box_clear":"Clear","box_float":"Float","box_height":"Alto","box_width":"Ancho","block_display":"Display","block_whitespace":"Espacio en blanco","block_text_indent":"Sangr\u00eda","block_text_align":"Alineaci\u00f3n del texto","block_vertical_alignment":"Alineaci\u00f3n vertical","block_letterspacing":"Espacio entre letra","block_wordspacing":"Espacio entre palabra","background_vpos":"Posici\u00f3n vertical","background_hpos":"Posici\u00f3n horizontal","background_attachment":"Adjunto","background_repeat":"Repetici\u00f3n","background_image":"Imagen de fondo","background_color":"Color de fondo","text_none":"Ninguno","text_blink":"Parpadeo","text_case":"Min\u00fas./May\u00fas.","text_striketrough":"Tachado","text_underline":"Subrayado","text_overline":"Subrayado superior","text_decoration":"Decorativos","text_color":"Color",text:"Texto",background:"Fondo",block:"Bloque",box:"Caja",border:"Borde",list:"Lista"});
\ No newline at end of file
+tinyMCE.addI18n('es.style_dlg',{"text_lineheight":"Ancho de la fila","text_variant":"Variante","text_style":"Estilo","text_weight":"Peso","text_size":"Tama\u00f1o","text_font":"Fuente","text_props":"Texto","positioning_tab":"Posicionamiento","list_tab":"Lista","border_tab":"Borde","box_tab":"Caja","block_tab":"Bloque","background_tab":"Fondo","text_tab":"Texto",apply:"Aplicar",title:"Editar Estilo CSS",clip:"Clip",placement:"Placement",overflow:"Overflow",zindex:"Z-index",visibility:"Visibilidad","positioning_type":"Tipo",position:"Posici\u00f3n","bullet_image":"Imagen de la vi\u00f1eta","list_type":"Tipo",color:"Color",height:"Alto",width:"Ancho",style:"Estilo",margin:"Margen",left:"Izquierda",bottom:"Inferior",right:"Derecha",top:"Superior",same:"Lo mismo en todos",padding:"Padding","box_clear":"Clear","box_float":"Float","box_height":"Alto","box_width":"Ancho","block_display":"Display","block_whitespace":"Espacio en blanco","block_text_indent":"Sangr\u00eda","block_text_align":"Alineaci\u00f3n del texto","block_vertical_alignment":"Alineaci\u00f3n vertical","block_letterspacing":"Espacio entre letra","block_wordspacing":"Espacio entre palabra","background_vpos":"Posici\u00f3n vertical","background_hpos":"Posici\u00f3n horizontal","background_attachment":"Adjunto","background_repeat":"Repetici\u00f3n","background_image":"Imagen de fondo","background_color":"Color de fondo","text_none":"Ninguno","text_blink":"Parpadeo","text_case":"Min\u00fas./May\u00fas.","text_striketrough":"Tachado","text_underline":"Subrayado","text_overline":"Subrayado superior","text_decoration":"Decorativos","text_color":"Color",text:"Texto",background:"Fondo",block:"Bloque",box:"Caja",border:"Borde",list:"Lista"});
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/style/props.htm b/program/js/tiny_mce/plugins/style/props.htm
index 33d424cb9..7dc087a30 100644
--- a/program/js/tiny_mce/plugins/style/props.htm
+++ b/program/js/tiny_mce/plugins/style/props.htm
@@ -1,845 +1,845 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-	<title>{#style_dlg.title}</title>

-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

-	<script type="text/javascript" src="../../utils/mctabs.js"></script>

-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

-	<script type="text/javascript" src="../../utils/form_utils.js"></script>

-	<script type="text/javascript" src="js/props.js"></script>

-	<link href="css/props.css" rel="stylesheet" type="text/css" />

-</head>

-

-<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">

-<span id="app_title" style="display:none">{#style_dlg.title}</span>

-<form onsubmit="updateAction();return false;" action="#">

-<div class="tabs">

-	<ul>

-		<li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>

-		<li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>

-		<li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>

-		<li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>

-		<li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>

-		<li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>

-		<li id="positioning_tab" aria-controls="positioning_panel"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>

-	</ul>

-</div>

-

-<div class="panel_wrapper">

-<div id="text_panel" class="panel current">

-	<fieldset>

-		<legend>{#style_dlg.text}</legend>

-		<table role="presentation" border="0" width="100%">

-			<tr>

-				<td><label for="text_font">{#style_dlg.text_font}</label></td>

-				<td colspan="3">

-					<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="text_size">{#style_dlg.text_size}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>

-								<select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-				<td><label for="text_weight">{#style_dlg.text_weight}</label></td>

-				<td>

-					<select id="text_weight" name="text_weight"></select>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="text_style">{#style_dlg.text_style}</label></td>

-				<td>

-					<select id="text_style" name="text_style" class="mceEditableSelect"></select>

-				</td>

-				<td><label for="text_variant">{#style_dlg.text_variant}</label></td>

-				<td>

-					<select id="text_variant" name="text_variant"></select>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td>

-								<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>

-							</td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>

-								<select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-				<td><label for="text_case">{#style_dlg.text_case}</label></td>

-				<td>

-					<select id="text_case" name="text_case"></select>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="text_color">{#style_dlg.text_color}</label></td>

-				<td colspan="2">

-					<table role="presentation" border="0" cellpadding="0" cellspacing="0">

-						<tr>

-							<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>

-							<td id="text_color_pickcontainer">&nbsp;</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>

-				<td colspan="2">

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>

-							<td><label for="text_underline">{#style_dlg.text_underline}</label></td>

-						</tr>

-						<tr>

-							<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>

-							<td><label for="text_overline">{#style_dlg.text_overline}</label></td>

-						</tr>

-						<tr>

-							<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>

-							<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>

-						</tr>

-						<tr>

-							<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>

-							<td><label for="text_blink">{#style_dlg.text_blink}</label></td>

-						</tr>

-						<tr>

-							<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" onclick="updateTextDecorations();"/></td>

-							<td><label for="text_none">{#style_dlg.text_none}</label></td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-

-<div id="background_panel" class="panel">

-	<fieldset>

-		<legend>{#style_dlg.background}</legend>

-		<table role="presentation" border="0">

-			<tr>

-				<td><label for="background_color">{#style_dlg.background_color}</label></td>

-				<td>

-					<table role="presentation" border="0" cellpadding="0" cellspacing="0">

-						<tr>

-							<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>

-							<td id="background_color_pickcontainer">&nbsp;</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-

-			<tr>

-				<td><label for="background_image">{#style_dlg.background_image}</label></td>

-				<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">

-					<tr> 

-						<td><input id="background_image" name="background_image" type="text" /></td> 

-						<td id="background_image_browser">&nbsp;</td>

-					</tr>

-					</table>

-				</td>

-			</tr>

-

-			<tr>

-				<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>

-				<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>

-			</tr>

-

-			<tr>

-				<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>

-				<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>

-			</tr>

-

-			<tr>

-				<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>

-								<select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-

-			<tr>

-				<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>

-							<td>&nbsp;</td>

-							<td>

-

-								<label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>

-								<select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-

-<div id="block_panel" class="panel">

-	<fieldset>

-		<legend>{#style_dlg.block}</legend>

-		<table role="presentation" border="0">

-			<tr>

-				<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>

-								<select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-

-			<tr>

-				<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>

-								<select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-

-			<tr>

-				<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>

-				<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>

-			</tr>

-

-			<tr>

-				<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>

-				<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>

-			</tr>

-

-			<tr>

-				<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>

-

-								<select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-

-			<tr>

-				<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>

-				<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>

-			</tr>

-

-			<tr>

-				<td><label for="block_display">{#style_dlg.block_display}</label></td>

-				<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-

-<div id="box_panel" class="panel">

-	<fieldset>

-		<legend>{#style_dlg.box}</legend>

-		<table role="presentation" border="0">

-			<tr>

-				<td><label for="box_width">{#style_dlg.box_width}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>

-								<select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-				<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>

-				<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>

-			</tr>

-

-			<tr>

-				<td><label for="box_height">{#style_dlg.box_height}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>

-								<select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-				<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>

-				<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>

-			</tr>

-		</table>

-	</fieldset>

-

-<div style="float: left; width: 49%">

-	<fieldset>

-		<legend>{#style_dlg.padding}</legend>

-

-		<table role="presentation" border="0">

-			<tr>

-				<td>&nbsp;</td>

-				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>

-			</tr>

-			<tr>

-				<td><label for="box_padding_top">{#style_dlg.top}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>

-								<select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="box_padding_right">{#style_dlg.right}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>

-								<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>

-								<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="box_padding_left">{#style_dlg.left}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>

-								<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-

-<div style="float: right; width: 49%">

-	<fieldset>

-		<legend>{#style_dlg.margin}</legend>

-

-		<table role="presentation" border="0">

-			<tr>

-				<td>&nbsp;</td>

-				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>

-			</tr>

-			<tr>

-				<td><label for="box_margin_top">{#style_dlg.top}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>

-								<select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="box_margin_right">{#style_dlg.right}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>

-								<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>

-								<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td><label for="box_margin_left">{#style_dlg.left}</label></td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>

-								<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-<br style="clear: both" />

-</div>

-

-<div id="border_panel" class="panel">

-	<fieldset>

-		<legend>{#style_dlg.border}</legend>	

-		<table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">

-		<tr>

-			<td class="tdelim">&nbsp;</td>

-			<td class="tdelim delim">&nbsp;</td>

-			<td class="tdelim">{#style_dlg.style}</td>

-			<td class="tdelim delim">&nbsp;</td>

-			<td class="tdelim">{#style_dlg.width}</td>

-			<td class="tdelim delim">&nbsp;</td>

-			<td class="tdelim">{#style_dlg.color}</td>

-		</tr>

-

-		<tr>

-			<td>&nbsp;</td>

-			<td class="delim">&nbsp;</td>

-			<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>

-			<td class="delim">&nbsp;</td>

-			<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>

-			<td class="delim">&nbsp;</td>

-			<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>

-		</tr>

-

-		<tr>

-			<td>{#style_dlg.top}</td>

-			<td class="delim">&nbsp;</td>

-			<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-					<tr>

-						<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>

-						<td>&nbsp;</td>

-						<td>

-							<label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>

-							<select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>

-						</td>

-					</tr>

-				</table>

-			</td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellpadding="0" cellspacing="0">

-					<tr>

-						<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>

-						<td id="border_color_top_pickcontainer">&nbsp;</td>

-					</tr>

-				</table>

-			</td>

-		</tr>

-

-		<tr>

-			<td>{#style_dlg.right}</td>

-			<td class="delim">&nbsp;</td>

-			<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-					<tr>

-						<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>

-						<td>&nbsp;</td>

-						<td>

-							<label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>

-							<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>

-						</td>

-					</tr>

-				</table>

-			</td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellpadding="0" cellspacing="0">

-					<tr>

-						<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>

-						<td id="border_color_right_pickcontainer">&nbsp;</td>

-					</tr>

-				</table>

-			</td>

-		</tr>

-

-		<tr>

-			<td>{#style_dlg.bottom}</td>

-			<td class="delim">&nbsp;</td>

-			<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-					<tr>

-						<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>

-						<td>&nbsp;</td>

-						<td>

-							<label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>

-							<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>

-						</td>

-					</tr>

-				</table>

-			</td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellpadding="0" cellspacing="0">

-					<tr>

-						<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>

-						<td id="border_color_bottom_pickcontainer">&nbsp;</td>

-					</tr>

-				</table>

-			</td>

-		</tr>

-

-		<tr>

-			<td>{#style_dlg.left}</td>

-			<td class="delim">&nbsp;</td>

-			<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-					<tr>

-						<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>

-						<td>&nbsp;</td>

-						<td>

-							<label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>

-							<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>

-						</td>

-					</tr>

-				</table>

-			</td>

-			<td class="delim">&nbsp;</td>

-			<td>

-				<table role="presentation" border="0" cellpadding="0" cellspacing="0">

-					<tr>

-						<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>

-						<td id="border_color_left_pickcontainer">&nbsp;</td>

-					</tr>

-				</table>

-			</td>

-		</tr>

-		</table>

-	</fieldset>

-</div>

-

-<div id="list_panel" class="panel">

-<fieldset>

-	<legend>{#style_dlg.list}</legend>

-	<table role="presentation" border="0">

-		<tr>

-			<td><label for="list_type">{#style_dlg.list_type}</label></td>

-			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>

-		</tr>

-

-		<tr>

-			<td><label for="list_bullet_image">{#style_dlg.bullet_image}</label></td>

-			<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>

-		</tr>

-

-		<tr>

-			<td><label for="list_position">{#style_dlg.position}</label></td>

-			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>

-		</tr>

-	</table>

-</fieldset>

-</div>

-

-<div id="positioning_panel" class="panel">

-<fieldset>

-	<legend>{#style_dlg.position}</legend>

-<table role="presentation" border="0">

-	<tr>

-		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>

-		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>

-		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{#style_dlg.visibility}</label></td>

-		<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>

-	</tr>

-

-	<tr>

-		<td><label for="positioning_width">{#style_dlg.width}</label></td>

-		<td>

-			<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-				<tr>

-					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>

-					<td>&nbsp;</td>

-					<td>

-						<label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>

-						<select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>

-					</td>

-				</tr>

-			</table>

-		</td>

-		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{#style_dlg.zindex}</label></td>

-		<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>

-	</tr>

-

-	<tr>

-		<td><label for="positioning_height">{#style_dlg.height}</label></td>

-		<td>

-			<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-				<tr>

-					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>

-					<td>&nbsp;</td>

-					<td>

-						<label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>

-						<select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>

-					</td>

-				</tr>

-			</table>

-		</td>

-		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{#style_dlg.overflow}</label></td>

-		<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>

-	</tr>

-</table>

-</fieldset>

-

-<div style="float: left; width: 49%">

-	<fieldset>

-		<legend>{#style_dlg.placement}</legend>

-

-		<table role="presentation" border="0">

-			<tr>

-				<td>&nbsp;</td>

-				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.top}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>

-								<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.right}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>

-								<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.bottom}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>

-								<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.left}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>

-								<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-

-<div style="float: right; width: 49%">

-	<fieldset>

-		<legend>{#style_dlg.clip}</legend>

-

-		<table role="presentation" border="0">

-			<tr>

-				<td>&nbsp;</td>

-				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.top}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>

-								<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.right}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>

-								<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.bottom}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>

-								<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-			<tr>

-				<td>{#style_dlg.left}</td>

-				<td>

-					<table role="presentation" border="0" cellspacing="0" cellpadding="0">

-						<tr>

-							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>

-							<td>&nbsp;</td>

-							<td>

-								<label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>

-								<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>

-							</td>

-						</tr>

-					</table>

-				</td>

-			</tr>

-		</table>

-	</fieldset>

-</div>

-<br style="clear: both" />

-</div>

-</div>

-

-<div class="panel_toggle_insert_span">

-	<input type="checkbox" class="checkbox" id="toggle_insert_span" name="toggle_insert_span" onClick="toggleApplyAction();" />

-	<label for="toggle_insert_span">{#style_dlg.toggle_insert_span}</label>

-</div>

-

-<div class="mceActionPanel">

-	<input type="submit" id="insert" name="insert" value="{#update}" />

-	<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />

-	<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />

-</div>

-</form>

-

-<div style="display: none">

-	<div id="container"></div>

-</div>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#style_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/props.js"></script>
+	<link href="css/props.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#style_dlg.title}</span>
+<form onsubmit="updateAction();return false;" action="#">
+<div class="tabs">
+	<ul>
+		<li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab" aria-controls="positioning_panel"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
+	</ul>
+</div>
+
+<div class="panel_wrapper">
+<div id="text_panel" class="panel current">
+	<fieldset>
+		<legend>{#style_dlg.text}</legend>
+		<table role="presentation" border="0" width="100%">
+			<tr>
+				<td><label for="text_font">{#style_dlg.text_font}</label></td>
+				<td colspan="3">
+					<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_size">{#style_dlg.text_size}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>
+								<select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
+				<td>
+					<select id="text_weight" name="text_weight"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_style">{#style_dlg.text_style}</label></td>
+				<td>
+					<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+				</td>
+				<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
+				<td>
+					<select id="text_variant" name="text_variant"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td>
+								<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+							</td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>
+								<select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_case">{#style_dlg.text_case}</label></td>
+				<td>
+					<select id="text_case" name="text_case"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_color">{#style_dlg.text_color}</label></td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
+							<td id="text_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" onclick="updateTextDecorations();"/></td>
+							<td><label for="text_none">{#style_dlg.text_none}</label></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="background_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.background}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="background_color">{#style_dlg.background_color}</label></td>
+				<td>
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
+							<td id="background_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_image">{#style_dlg.background_image}</label></td>
+				<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr> 
+						<td><input id="background_image" name="background_image" type="text" /></td> 
+						<td id="background_image_browser">&nbsp;</td>
+					</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
+				<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
+				<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>
+								<select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+
+								<label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>
+								<select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="block_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.block}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>
+								<select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>
+								<select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
+				<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
+				<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>
+
+								<select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
+				<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_display">{#style_dlg.block_display}</label></td>
+				<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="box_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.box}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="box_width">{#style_dlg.box_width}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>
+								<select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
+				<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="box_height">{#style_dlg.box_height}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>
+								<select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
+				<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+	</fieldset>
+
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.padding}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>
+								<select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>
+								<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>
+								<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>
+								<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.margin}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>
+								<select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>
+								<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>
+								<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>
+								<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+
+<div id="border_panel" class="panel">
+	<fieldset>
+		<legend>{#style_dlg.border}</legend>	
+		<table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td class="tdelim">&nbsp;</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.style}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.width}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.color}</td>
+		</tr>
+
+		<tr>
+			<td>&nbsp;</td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.top}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>
+							<select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
+						<td id="border_color_top_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.right}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>
+							<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+						<td id="border_color_right_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.bottom}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>
+							<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+						<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td>{#style_dlg.left}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>
+							<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+						<td id="border_color_left_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div id="list_panel" class="panel">
+<fieldset>
+	<legend>{#style_dlg.list}</legend>
+	<table role="presentation" border="0">
+		<tr>
+			<td><label for="list_type">{#style_dlg.list_type}</label></td>
+			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_bullet_image">{#style_dlg.bullet_image}</label></td>
+			<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_position">{#style_dlg.position}</label></td>
+			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
+		</tr>
+	</table>
+</fieldset>
+</div>
+
+<div id="positioning_panel" class="panel">
+<fieldset>
+	<legend>{#style_dlg.position}</legend>
+<table role="presentation" border="0">
+	<tr>
+		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
+		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{#style_dlg.visibility}</label></td>
+		<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_width">{#style_dlg.width}</label></td>
+		<td>
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
+					<td>&nbsp;</td>
+					<td>
+						<label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>
+						<select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{#style_dlg.zindex}</label></td>
+		<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_height">{#style_dlg.height}</label></td>
+		<td>
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
+					<td>&nbsp;</td>
+					<td>
+						<label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>
+						<select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>
+					</td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{#style_dlg.overflow}</label></td>
+		<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>
+	</tr>
+</table>
+</fieldset>
+
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.placement}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>
+								<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>
+								<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>
+								<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>
+								<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.clip}</legend>
+
+		<table role="presentation" border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>
+								<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>
+								<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>
+								<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>
+								<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+</div>
+
+<div class="panel_toggle_insert_span">
+	<input type="checkbox" class="checkbox" id="toggle_insert_span" name="toggle_insert_span" onClick="toggleApplyAction();" />
+	<label for="toggle_insert_span">{#style_dlg.toggle_insert_span}</label>
+</div>
+
+<div class="mceActionPanel">
+	<input type="submit" id="insert" name="insert" value="{#update}" />
+	<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />
+	<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
+</div>
+</form>
+
+<div style="display: none">
+	<div id="container"></div>
+</div>
+
+</body>
+</html>
diff --git a/program/js/tiny_mce/plugins/style/readme.txt b/program/js/tiny_mce/plugins/style/readme.txt
index e8f84d7fb..5bac30202 100644
--- a/program/js/tiny_mce/plugins/style/readme.txt
+++ b/program/js/tiny_mce/plugins/style/readme.txt
@@ -1,19 +1,19 @@
-Edit CSS Style plug-in notes

-~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Unlike WYSIWYG editor functionality that operates only on the selected text,

-typically by inserting new HTML elements with the specified styles.

-This plug-in operates on the HTML blocks surrounding the selected text.

-No new HTML elements are created.

-

-This plug-in only operates on the surrounding blocks and not the nearest

-parent node.  This means that if a block encapsulates a node,

-e.g <p><span>text</span></p>, then only the styles in the block are

-recognized, not those in the span.

-

-When selecting text that includes multiple blocks at the same level (peers),

-this plug-in accumulates the specified styles in all of the surrounding blocks

-and populates the dialogue checkboxes accordingly.  There is no differentiation

-between styles set in all the blocks versus styles set in some of the blocks.

-

-When the [Update] or [Apply] buttons are pressed, the styles selected in the

-checkboxes are applied to all blocks that surround the selected text.

+Edit CSS Style plug-in notes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Unlike WYSIWYG editor functionality that operates only on the selected text,
+typically by inserting new HTML elements with the specified styles.
+This plug-in operates on the HTML blocks surrounding the selected text.
+No new HTML elements are created.
+
+This plug-in only operates on the surrounding blocks and not the nearest
+parent node.  This means that if a block encapsulates a node,
+e.g <p><span>text</span></p>, then only the styles in the block are
+recognized, not those in the span.
+
+When selecting text that includes multiple blocks at the same level (peers),
+this plug-in accumulates the specified styles in all of the surrounding blocks
+and populates the dialogue checkboxes accordingly.  There is no differentiation
+between styles set in all the blocks versus styles set in some of the blocks.
+
+When the [Update] or [Apply] buttons are pressed, the styles selected in the
+checkboxes are applied to all blocks that surround the selected text.
diff --git a/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
index f9df7de7f..94f45320d 100644
--- a/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/tabfocus/editor_plugin_src.js
@@ -1,122 +1,122 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function() {

-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;

-

-	tinymce.create('tinymce.plugins.TabFocusPlugin', {

-		init : function(ed, url) {

-			function tabCancel(ed, e) {

-				if (e.keyCode === 9)

-					return Event.cancel(e);

-			}

-

-			function tabHandler(ed, e) {

-				var x, i, f, el, v;

-

-				function find(d) {

-					el = DOM.select(':input:enabled,*[tabindex]:not(iframe)');

-

-					function canSelectRecursive(e) {

-						return e.nodeName==="BODY" || (e.type != 'hidden' &&

-							!(e.style.display == "none") &&

-							!(e.style.visibility == "hidden") && canSelectRecursive(e.parentNode));

-					}

-					function canSelectInOldIe(el) {

-						return el.attributes["tabIndex"].specified || el.nodeName == "INPUT" || el.nodeName == "TEXTAREA";

-					}

-					function isOldIe() {

-						return tinymce.isIE6 || tinymce.isIE7;

-					}

-					function canSelect(el) {

-						return ((!isOldIe() || canSelectInOldIe(el))) && el.getAttribute("tabindex") != '-1' && canSelectRecursive(el);

-					}

-

-					each(el, function(e, i) {

-						if (e.id == ed.id) {

-							x = i;

-							return false;

-						}

-					});

-					if (d > 0) {

-						for (i = x + 1; i < el.length; i++) {

-							if (canSelect(el[i]))

-								return el[i];

-						}

-					} else {

-						for (i = x - 1; i >= 0; i--) {

-							if (canSelect(el[i]))

-								return el[i];

-						}

-					}

-

-					return null;

-				}

-

-				if (e.keyCode === 9) {

-					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));

-

-					if (v.length == 1) {

-						v[1] = v[0];

-						v[0] = ':prev';

-					}

-

-					// Find element to focus

-					if (e.shiftKey) {

-						if (v[0] == ':prev')

-							el = find(-1);

-						else

-							el = DOM.get(v[0]);

-					} else {

-						if (v[1] == ':next')

-							el = find(1);

-						else

-							el = DOM.get(v[1]);

-					}

-

-					if (el) {

-						if (el.id && (ed = tinymce.get(el.id || el.name)))

-							ed.focus();

-						else

-							window.setTimeout(function() {

-								if (!tinymce.isWebKit)

-									window.focus();

-								el.focus();

-							}, 10);

-

-						return Event.cancel(e);

-					}

-				}

-			}

-

-			ed.onKeyUp.add(tabCancel);

-

-			if (tinymce.isGecko) {

-				ed.onKeyPress.add(tabHandler);

-				ed.onKeyDown.add(tabCancel);

-			} else

-				ed.onKeyDown.add(tabHandler);

-

-		},

-

-		getInfo : function() {

-			return {

-				longname : 'Tabfocus',

-				author : 'Moxiecode Systems AB',

-				authorurl : 'http://tinymce.moxiecode.com',

-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',

-				version : tinymce.majorVersion + "." + tinymce.minorVersion

-			};

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);

-})();

+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;
+
+	tinymce.create('tinymce.plugins.TabFocusPlugin', {
+		init : function(ed, url) {
+			function tabCancel(ed, e) {
+				if (e.keyCode === 9)
+					return Event.cancel(e);
+			}
+
+			function tabHandler(ed, e) {
+				var x, i, f, el, v;
+
+				function find(d) {
+					el = DOM.select(':input:enabled,*[tabindex]:not(iframe)');
+
+					function canSelectRecursive(e) {
+						return e.nodeName==="BODY" || (e.type != 'hidden' &&
+							!(e.style.display == "none") &&
+							!(e.style.visibility == "hidden") && canSelectRecursive(e.parentNode));
+					}
+					function canSelectInOldIe(el) {
+						return el.attributes["tabIndex"].specified || el.nodeName == "INPUT" || el.nodeName == "TEXTAREA";
+					}
+					function isOldIe() {
+						return tinymce.isIE6 || tinymce.isIE7;
+					}
+					function canSelect(el) {
+						return ((!isOldIe() || canSelectInOldIe(el))) && el.getAttribute("tabindex") != '-1' && canSelectRecursive(el);
+					}
+
+					each(el, function(e, i) {
+						if (e.id == ed.id) {
+							x = i;
+							return false;
+						}
+					});
+					if (d > 0) {
+						for (i = x + 1; i < el.length; i++) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					} else {
+						for (i = x - 1; i >= 0; i--) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					}
+
+					return null;
+				}
+
+				if (e.keyCode === 9) {
+					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));
+
+					if (v.length == 1) {
+						v[1] = v[0];
+						v[0] = ':prev';
+					}
+
+					// Find element to focus
+					if (e.shiftKey) {
+						if (v[0] == ':prev')
+							el = find(-1);
+						else
+							el = DOM.get(v[0]);
+					} else {
+						if (v[1] == ':next')
+							el = find(1);
+						else
+							el = DOM.get(v[1]);
+					}
+
+					if (el) {
+						if (el.id && (ed = tinymce.get(el.id || el.name)))
+							ed.focus();
+						else
+							window.setTimeout(function() {
+								if (!tinymce.isWebKit)
+									window.focus();
+								el.focus();
+							}, 10);
+
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			ed.onKeyUp.add(tabCancel);
+
+			if (tinymce.isGecko) {
+				ed.onKeyPress.add(tabHandler);
+				ed.onKeyDown.add(tabCancel);
+			} else
+				ed.onKeyDown.add(tabHandler);
+
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Tabfocus',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);
+})();
diff --git a/program/js/tiny_mce/plugins/table/editor_plugin_src.js b/program/js/tiny_mce/plugins/table/editor_plugin_src.js
index 6a3630962..54bab56c3 100644
--- a/program/js/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/table/editor_plugin_src.js
@@ -1,1449 +1,1449 @@
-/**

- * editor_plugin_src.js

- *

- * Copyright 2009, Moxiecode Systems AB

- * Released under LGPL License.

- *

- * License: http://tinymce.moxiecode.com/license

- * Contributing: http://tinymce.moxiecode.com/contributing

- */

-

-(function(tinymce) {

-	var each = tinymce.each;

-

-	// Checks if the selection/caret is at the start of the specified block element

-	function isAtStart(rng, par) {

-		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;

-

-		rng2.setStartBefore(par);

-		rng2.setEnd(rng.endContainer, rng.endOffset);

-

-		elm = doc.createElement('body');

-		elm.appendChild(rng2.cloneContents());

-

-		// Check for text characters of other elements that should be treated as content

-		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;

-	};

-

-	function getSpanVal(td, name) {

-		return parseInt(td.getAttribute(name) || 1);

-	}

-

-	/**

-	 * Table Grid class.

-	 */

-	function TableGrid(table, dom, selection) {

-		var grid, startPos, endPos, selectedCell;

-

-		buildGrid();

-		selectedCell = dom.getParent(selection.getStart(), 'th,td');

-		if (selectedCell) {

-			startPos = getPos(selectedCell);

-			endPos = findEndPos();

-			selectedCell = getCell(startPos.x, startPos.y);

-		}

-

-		function cloneNode(node, children) {

-			node = node.cloneNode(children);

-			node.removeAttribute('id');

-

-			return node;

-		}

-

-		function buildGrid() {

-			var startY = 0;

-

-			grid = [];

-

-			each(['thead', 'tbody', 'tfoot'], function(part) {

-				var rows = dom.select('> ' + part + ' tr', table);

-

-				each(rows, function(tr, y) {

-					y += startY;

-

-					each(dom.select('> td, > th', tr), function(td, x) {

-						var x2, y2, rowspan, colspan;

-

-						// Skip over existing cells produced by rowspan

-						if (grid[y]) {

-							while (grid[y][x])

-								x++;

-						}

-

-						// Get col/rowspan from cell

-						rowspan = getSpanVal(td, 'rowspan');

-						colspan = getSpanVal(td, 'colspan');

-

-						// Fill out rowspan/colspan right and down

-						for (y2 = y; y2 < y + rowspan; y2++) {

-							if (!grid[y2])

-								grid[y2] = [];

-

-							for (x2 = x; x2 < x + colspan; x2++) {

-								grid[y2][x2] = {

-									part : part,

-									real : y2 == y && x2 == x,

-									elm : td,

-									rowspan : rowspan,

-									colspan : colspan

-								};

-							}

-						}

-					});

-				});

-

-				startY += rows.length;

-			});

-		};

-

-		function getCell(x, y) {

-			var row;

-

-			row = grid[y];

-			if (row)

-				return row[x];

-		};

-

-		function setSpanVal(td, name, val) {

-			if (td) {

-				val = parseInt(val);

-

-				if (val === 1)

-					td.removeAttribute(name, 1);

-				else

-					td.setAttribute(name, val, 1);

-			}

-		}

-

-		function isCellSelected(cell) {

-			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);

-		};

-

-		function getSelectedRows() {

-			var rows = [];

-

-			each(table.rows, function(row) {

-				each(row.cells, function(cell) {

-					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {

-						rows.push(row);

-						return false;

-					}

-				});

-			});

-

-			return rows;

-		};

-

-		function deleteTable() {

-			var rng = dom.createRng();

-

-			rng.setStartAfter(table);

-			rng.setEndAfter(table);

-

-			selection.setRng(rng);

-

-			dom.remove(table);

-		};

-

-		function cloneCell(cell) {

-			var formatNode;

-

-			// Clone formats

-			tinymce.walk(cell, function(node) {

-				var curNode;

-

-				if (node.nodeType == 3) {

-					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {

-						node = cloneNode(node, false);

-

-						if (!formatNode)

-							formatNode = curNode = node;

-						else if (curNode)

-							curNode.appendChild(node);

-

-						curNode = node;

-					});

-

-					// Add something to the inner node

-					if (curNode)

-						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';

-

-					return false;

-				}

-			}, 'childNodes');

-

-			cell = cloneNode(cell, false);

-			setSpanVal(cell, 'rowSpan', 1);

-			setSpanVal(cell, 'colSpan', 1);

-

-			if (formatNode) {

-				cell.appendChild(formatNode);

-			} else {

-				if (!tinymce.isIE)

-					cell.innerHTML = '<br data-mce-bogus="1" />';

-			}

-

-			return cell;

-		};

-

-		function cleanup() {

-			var rng = dom.createRng();

-

-			// Empty rows

-			each(dom.select('tr', table), function(tr) {

-				if (tr.cells.length == 0)

-					dom.remove(tr);

-			});

-

-			// Empty table

-			if (dom.select('tr', table).length == 0) {

-				rng.setStartAfter(table);

-				rng.setEndAfter(table);

-				selection.setRng(rng);

-				dom.remove(table);

-				return;

-			}

-

-			// Empty header/body/footer

-			each(dom.select('thead,tbody,tfoot', table), function(part) {

-				if (part.rows.length == 0)

-					dom.remove(part);

-			});

-

-			// Restore selection to start position if it still exists

-			buildGrid();

-

-			// Restore the selection to the closest table position

-			row = grid[Math.min(grid.length - 1, startPos.y)];

-			if (row) {

-				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);

-				selection.collapse(true);

-			}

-		};

-

-		function fillLeftDown(x, y, rows, cols) {

-			var tr, x2, r, c, cell;

-

-			tr = grid[y][x].elm.parentNode;

-			for (r = 1; r <= rows; r++) {

-				tr = dom.getNext(tr, 'tr');

-

-				if (tr) {

-					// Loop left to find real cell

-					for (x2 = x; x2 >= 0; x2--) {

-						cell = grid[y + r][x2].elm;

-

-						if (cell.parentNode == tr) {

-							// Append clones after

-							for (c = 1; c <= cols; c++)

-								dom.insertAfter(cloneCell(cell), cell);

-

-							break;

-						}

-					}

-

-					if (x2 == -1) {

-						// Insert nodes before first cell

-						for (c = 1; c <= cols; c++)

-							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);

-					}

-				}

-			}

-		};

-

-		function split() {

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					var colSpan, rowSpan, newCell, i;

-

-					if (isCellSelected(cell)) {

-						cell = cell.elm;

-						colSpan = getSpanVal(cell, 'colspan');

-						rowSpan = getSpanVal(cell, 'rowspan');

-

-						if (colSpan > 1 || rowSpan > 1) {

-							setSpanVal(cell, 'rowSpan', 1);

-							setSpanVal(cell, 'colSpan', 1);

-

-							// Insert cells right

-							for (i = 0; i < colSpan - 1; i++)

-								dom.insertAfter(cloneCell(cell), cell);

-

-							fillLeftDown(x, y, rowSpan - 1, colSpan);

-						}

-					}

-				});

-			});

-		};

-

-		function merge(cell, cols, rows) {

-			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;

-

-			// Use specified cell and cols/rows

-			if (cell) {

-				pos = getPos(cell);

-				startX = pos.x;

-				startY = pos.y;

-				endX = startX + (cols - 1);

-				endY = startY + (rows - 1);

-			} else {

-				startPos = endPos = null;

-

-				// Calculate start/end pos by checking for selected cells in grid works better with context menu

-				each(grid, function(row, y) {

-					each(row, function(cell, x) {

-						if (isCellSelected(cell)) {

-							if (!startPos) {

-								startPos = {x: x, y: y};

-							}

-

-							endPos = {x: x, y: y};

-						}

-					});

-				});

-

-				// Use selection

-				startX = startPos.x;

-				startY = startPos.y;

-				endX = endPos.x;

-				endY = endPos.y;

-			}

-

-			// Find start/end cells

-			startCell = getCell(startX, startY);

-			endCell = getCell(endX, endY);

-

-			// Check if the cells exists and if they are of the same part for example tbody = tbody

-			if (startCell && endCell && startCell.part == endCell.part) {

-				// Split and rebuild grid

-				split();

-				buildGrid();

-

-				// Set row/col span to start cell

-				startCell = getCell(startX, startY).elm;

-				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);

-				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);

-

-				// Remove other cells and add it's contents to the start cell

-				for (y = startY; y <= endY; y++) {

-					for (x = startX; x <= endX; x++) {

-						if (!grid[y] || !grid[y][x])

-							continue;

-

-						cell = grid[y][x].elm;

-

-						if (cell != startCell) {

-							// Move children to startCell

-							children = tinymce.grep(cell.childNodes);

-							each(children, function(node) {

-								startCell.appendChild(node);

-							});

-

-							// Remove bogus nodes if there is children in the target cell

-							if (children.length) {

-								children = tinymce.grep(startCell.childNodes);

-								count = 0;

-								each(children, function(node) {

-									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)

-										startCell.removeChild(node);

-								});

-							}

-							

-							// Remove cell

-							dom.remove(cell);

-						}

-					}

-				}

-

-				// Remove empty rows etc and restore caret location

-				cleanup();

-			}

-		};

-

-		function insertRow(before) {

-			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;

-

-			// Find first/last row

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (isCellSelected(cell)) {

-						cell = cell.elm;

-						rowElm = cell.parentNode;

-						newRow = cloneNode(rowElm, false);

-						posY = y;

-

-						if (before)

-							return false;

-					}

-				});

-

-				if (before)

-					return !posY;

-			});

-

-			for (x = 0; x < grid[0].length; x++) {

-				// Cell not found could be because of an invalid table structure

-				if (!grid[posY][x])

-					continue;

-

-				cell = grid[posY][x].elm;

-

-				if (cell != lastCell) {

-					if (!before) {

-						rowSpan = getSpanVal(cell, 'rowspan');

-						if (rowSpan > 1) {

-							setSpanVal(cell, 'rowSpan', rowSpan + 1);

-							continue;

-						}

-					} else {

-						// Check if cell above can be expanded

-						if (posY > 0 && grid[posY - 1][x]) {

-							otherCell = grid[posY - 1][x].elm;

-							rowSpan = getSpanVal(otherCell, 'rowSpan');

-							if (rowSpan > 1) {

-								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);

-								continue;

-							}

-						}

-					}

-

-					// Insert new cell into new row

-					newCell = cloneCell(cell);

-					setSpanVal(newCell, 'colSpan', cell.colSpan);

-

-					newRow.appendChild(newCell);

-

-					lastCell = cell;

-				}

-			}

-

-			if (newRow.hasChildNodes()) {

-				if (!before)

-					dom.insertAfter(newRow, rowElm);

-				else

-					rowElm.parentNode.insertBefore(newRow, rowElm);

-			}

-		};

-

-		function insertCol(before) {

-			var posX, lastCell;

-

-			// Find first/last column

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (isCellSelected(cell)) {

-						posX = x;

-

-						if (before)

-							return false;

-					}

-				});

-

-				if (before)

-					return !posX;

-			});

-

-			each(grid, function(row, y) {

-				var cell, rowSpan, colSpan;

-

-				if (!row[posX])

-					return;

-

-				cell = row[posX].elm;

-				if (cell != lastCell) {

-					colSpan = getSpanVal(cell, 'colspan');

-					rowSpan = getSpanVal(cell, 'rowspan');

-

-					if (colSpan == 1) {

-						if (!before) {

-							dom.insertAfter(cloneCell(cell), cell);

-							fillLeftDown(posX, y, rowSpan - 1, colSpan);

-						} else {

-							cell.parentNode.insertBefore(cloneCell(cell), cell);

-							fillLeftDown(posX, y, rowSpan - 1, colSpan);

-						}

-					} else

-						setSpanVal(cell, 'colSpan', cell.colSpan + 1);

-

-					lastCell = cell;

-				}

-			});

-		};

-

-		function deleteCols() {

-			var cols = [];

-

-			// Get selected column indexes

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {

-						each(grid, function(row) {

-							var cell = row[x].elm, colSpan;

-

-							colSpan = getSpanVal(cell, 'colSpan');

-

-							if (colSpan > 1)

-								setSpanVal(cell, 'colSpan', colSpan - 1);

-							else

-								dom.remove(cell);

-						});

-

-						cols.push(x);

-					}

-				});

-			});

-

-			cleanup();

-		};

-

-		function deleteRows() {

-			var rows;

-

-			function deleteRow(tr) {

-				var nextTr, pos, lastCell;

-

-				nextTr = dom.getNext(tr, 'tr');

-

-				// Move down row spanned cells

-				each(tr.cells, function(cell) {

-					var rowSpan = getSpanVal(cell, 'rowSpan');

-

-					if (rowSpan > 1) {

-						setSpanVal(cell, 'rowSpan', rowSpan - 1);

-						pos = getPos(cell);

-						fillLeftDown(pos.x, pos.y, 1, 1);

-					}

-				});

-

-				// Delete cells

-				pos = getPos(tr.cells[0]);

-				each(grid[pos.y], function(cell) {

-					var rowSpan;

-

-					cell = cell.elm;

-

-					if (cell != lastCell) {

-						rowSpan = getSpanVal(cell, 'rowSpan');

-

-						if (rowSpan <= 1)

-							dom.remove(cell);

-						else

-							setSpanVal(cell, 'rowSpan', rowSpan - 1);

-

-						lastCell = cell;

-					}

-				});

-			};

-

-			// Get selected rows and move selection out of scope

-			rows = getSelectedRows();

-

-			// Delete all selected rows

-			each(rows.reverse(), function(tr) {

-				deleteRow(tr);

-			});

-

-			cleanup();

-		};

-

-		function cutRows() {

-			var rows = getSelectedRows();

-

-			dom.remove(rows);

-			cleanup();

-

-			return rows;

-		};

-

-		function copyRows() {

-			var rows = getSelectedRows();

-

-			each(rows, function(row, i) {

-				rows[i] = cloneNode(row, true);

-			});

-

-			return rows;

-		};

-

-		function pasteRows(rows, before) {

-			var selectedRows = getSelectedRows(),

-				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],

-				targetCellCount = targetRow.cells.length;

-

-			// Calc target cell count

-			each(grid, function(row) {

-				var match;

-

-				targetCellCount = 0;

-				each(row, function(cell, x) {

-					if (cell.real)

-						targetCellCount += cell.colspan;

-

-					if (cell.elm.parentNode == targetRow)

-						match = 1;

-				});

-

-				if (match)

-					return false;

-			});

-

-			if (!before)

-				rows.reverse();

-

-			each(rows, function(row) {

-				var cellCount = row.cells.length, cell;

-

-				// Remove col/rowspans

-				for (i = 0; i < cellCount; i++) {

-					cell = row.cells[i];

-					setSpanVal(cell, 'colSpan', 1);

-					setSpanVal(cell, 'rowSpan', 1);

-				}

-

-				// Needs more cells

-				for (i = cellCount; i < targetCellCount; i++)

-					row.appendChild(cloneCell(row.cells[cellCount - 1]));

-

-				// Needs less cells

-				for (i = targetCellCount; i < cellCount; i++)

-					dom.remove(row.cells[i]);

-

-				// Add before/after

-				if (before)

-					targetRow.parentNode.insertBefore(row, targetRow);

-				else

-					dom.insertAfter(row, targetRow);

-			});

-

-			// Remove current selection

-			dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

-		};

-

-		function getPos(target) {

-			var pos;

-

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					if (cell.elm == target) {

-						pos = {x : x, y : y};

-						return false;

-					}

-				});

-

-				return !pos;

-			});

-

-			return pos;

-		};

-

-		function setStartCell(cell) {

-			startPos = getPos(cell);

-		};

-

-		function findEndPos() {

-			var pos, maxX, maxY;

-

-			maxX = maxY = 0;

-

-			each(grid, function(row, y) {

-				each(row, function(cell, x) {

-					var colSpan, rowSpan;

-

-					if (isCellSelected(cell)) {

-						cell = grid[y][x];

-

-						if (x > maxX)

-							maxX = x;

-

-						if (y > maxY)

-							maxY = y;

-

-						if (cell.real) {

-							colSpan = cell.colspan - 1;

-							rowSpan = cell.rowspan - 1;

-

-							if (colSpan) {

-								if (x + colSpan > maxX)

-									maxX = x + colSpan;

-							}

-

-							if (rowSpan) {

-								if (y + rowSpan > maxY)

-									maxY = y + rowSpan;

-							}

-						}

-					}

-				});

-			});

-

-			return {x : maxX, y : maxY};

-		};

-

-		function setEndCell(cell) {

-			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;

-

-			endPos = getPos(cell);

-

-			if (startPos && endPos) {

-				// Get start/end positions

-				startX = Math.min(startPos.x, endPos.x);

-				startY = Math.min(startPos.y, endPos.y);

-				endX = Math.max(startPos.x, endPos.x);

-				endY = Math.max(startPos.y, endPos.y);

-

-				// Expand end positon to include spans

-				maxX = endX;

-				maxY = endY;

-

-				// Expand startX

-				for (y = startY; y <= maxY; y++) {

-					cell = grid[y][startX];

-

-					if (!cell.real) {

-						if (startX - (cell.colspan - 1) < startX)

-							startX -= cell.colspan - 1;

-					}

-				}

-

-				// Expand startY

-				for (x = startX; x <= maxX; x++) {

-					cell = grid[startY][x];

-

-					if (!cell.real) {

-						if (startY - (cell.rowspan - 1) < startY)

-							startY -= cell.rowspan - 1;

-					}

-				}

-

-				// Find max X, Y

-				for (y = startY; y <= endY; y++) {

-					for (x = startX; x <= endX; x++) {

-						cell = grid[y][x];

-

-						if (cell.real) {

-							colSpan = cell.colspan - 1;

-							rowSpan = cell.rowspan - 1;

-

-							if (colSpan) {

-								if (x + colSpan > maxX)

-									maxX = x + colSpan;

-							}

-

-							if (rowSpan) {

-								if (y + rowSpan > maxY)

-									maxY = y + rowSpan;

-							}

-						}

-					}

-				}

-

-				// Remove current selection

-				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

-

-				// Add new selection

-				for (y = startY; y <= maxY; y++) {

-					for (x = startX; x <= maxX; x++) {

-						if (grid[y][x])

-							dom.addClass(grid[y][x].elm, 'mceSelected');

-					}

-				}

-			}

-		};

-

-		// Expose to public

-		tinymce.extend(this, {

-			deleteTable : deleteTable,

-			split : split,

-			merge : merge,

-			insertRow : insertRow,

-			insertCol : insertCol,

-			deleteCols : deleteCols,

-			deleteRows : deleteRows,

-			cutRows : cutRows,

-			copyRows : copyRows,

-			pasteRows : pasteRows,

-			getPos : getPos,

-			setStartCell : setStartCell,

-			setEndCell : setEndCell

-		});

-	};

-

-	tinymce.create('tinymce.plugins.TablePlugin', {

-		init : function(ed, url) {

-			var winMan, clipboardRows, hasCellSelection = true; // Might be selected cells on reload

-

-			function createTableGrid(node) {

-				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');

-

-				if (tblElm)

-					return new TableGrid(tblElm, ed.dom, selection);

-			};

-

-			function cleanup() {

-				// Restore selection possibilities

-				ed.getBody().style.webkitUserSelect = '';

-

-				if (hasCellSelection) {

-					ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

-					hasCellSelection = false;

-				}

-			};

-

-			// Register buttons

-			each([

-				['table', 'table.desc', 'mceInsertTable', true],

-				['delete_table', 'table.del', 'mceTableDelete'],

-				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],

-				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],

-				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],

-				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],

-				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],

-				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],

-				['row_props', 'table.row_desc', 'mceTableRowProps', true],

-				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],

-				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],

-				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]

-			], function(c) {

-				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});

-			});

-

-			// Select whole table is a table border is clicked

-			if (!tinymce.isIE) {

-				ed.onClick.add(function(ed, e) {

-					e = e.target;

-

-					if (e.nodeName === 'TABLE') {

-						ed.selection.select(e);

-						ed.nodeChanged();

-					}

-				});

-			}

-

-			ed.onPreProcess.add(function(ed, args) {

-				var nodes, i, node, dom = ed.dom, value;

-

-				nodes = dom.select('table', args.node);

-				i = nodes.length;

-				while (i--) {

-					node = nodes[i];

-					dom.setAttrib(node, 'data-mce-style', '');

-

-					if ((value = dom.getAttrib(node, 'width'))) {

-						dom.setStyle(node, 'width', value);

-						dom.setAttrib(node, 'width', '');

-					}

-

-					if ((value = dom.getAttrib(node, 'height'))) {

-						dom.setStyle(node, 'height', value);

-						dom.setAttrib(node, 'height', '');

-					}

-				}

-			});

-

-			// Handle node change updates

-			ed.onNodeChange.add(function(ed, cm, n) {

-				var p;

-

-				n = ed.selection.getStart();

-				p = ed.dom.getParent(n, 'td,th,caption');

-				cm.setActive('table', n.nodeName === 'TABLE' || !!p);

-

-				// Disable table tools if we are in caption

-				if (p && p.nodeName === 'CAPTION')

-					p = 0;

-

-				cm.setDisabled('delete_table', !p);

-				cm.setDisabled('delete_col', !p);

-				cm.setDisabled('delete_table', !p);

-				cm.setDisabled('delete_row', !p);

-				cm.setDisabled('col_after', !p);

-				cm.setDisabled('col_before', !p);

-				cm.setDisabled('row_after', !p);

-				cm.setDisabled('row_before', !p);

-				cm.setDisabled('row_props', !p);

-				cm.setDisabled('cell_props', !p);

-				cm.setDisabled('split_cells', !p);

-				cm.setDisabled('merge_cells', !p);

-			});

-

-			ed.onInit.add(function(ed) {

-				var startTable, startCell, dom = ed.dom, tableGrid;

-

-				winMan = ed.windowManager;

-

-				// Add cell selection logic

-				ed.onMouseDown.add(function(ed, e) {

-					if (e.button != 2) {

-						cleanup();

-

-						startCell = dom.getParent(e.target, 'td,th');

-						startTable = dom.getParent(startCell, 'table');

-					}

-				});

-

-				dom.bind(ed.getDoc(), 'mouseover', function(e) {

-					var sel, table, target = e.target;

-

-					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {

-						table = dom.getParent(target, 'table');

-						if (table == startTable) {

-							if (!tableGrid) {

-								tableGrid = createTableGrid(table);

-								tableGrid.setStartCell(startCell);

-

-								ed.getBody().style.webkitUserSelect = 'none';

-							}

-

-							tableGrid.setEndCell(target);

-							hasCellSelection = true;

-						}

-

-						// Remove current selection

-						sel = ed.selection.getSel();

-

-						try {

-							if (sel.removeAllRanges)

-								sel.removeAllRanges();

-							else

-								sel.empty();

-						} catch (ex) {

-							// IE9 might throw errors here

-						}

-

-						e.preventDefault();

-					}

-				});

-

-				ed.onMouseUp.add(function(ed, e) {

-					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;

-

-					// Move selection to startCell

-					if (startCell) {

-						if (tableGrid)

-							ed.getBody().style.webkitUserSelect = '';

-

-						function setPoint(node, start) {

-							var walker = new tinymce.dom.TreeWalker(node, node);

-

-							do {

-								// Text node

-								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

-									if (start)

-										rng.setStart(node, 0);

-									else

-										rng.setEnd(node, node.nodeValue.length);

-

-									return;

-								}

-

-								// BR element

-								if (node.nodeName == 'BR') {

-									if (start)

-										rng.setStartBefore(node);

-									else

-										rng.setEndBefore(node);

-

-									return;

-								}

-							} while (node = (start ? walker.next() : walker.prev()));

-						}

-

-						// Try to expand text selection as much as we can only Gecko supports cell selection

-						selectedCells = dom.select('td.mceSelected,th.mceSelected');

-						if (selectedCells.length > 0) {

-							rng = dom.createRng();

-							node = selectedCells[0];

-							endNode = selectedCells[selectedCells.length - 1];

-							rng.setStartBefore(node);

-							rng.setEndAfter(node);

-

-							setPoint(node, 1);

-							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));

-

-							do {

-								if (node.nodeName == 'TD' || node.nodeName == 'TH') {

-									if (!dom.hasClass(node, 'mceSelected'))

-										break;

-

-									lastNode = node;

-								}

-							} while (node = walker.next());

-

-							setPoint(lastNode);

-

-							sel.setRng(rng);

-						}

-

-						ed.nodeChanged();

-						startCell = tableGrid = startTable = null;

-					}

-				});

-

-				ed.onKeyUp.add(function(ed, e) {

-					cleanup();

-				});

-

-				ed.onKeyDown.add(function (ed, e) {

-					fixTableCellSelection(ed);

-				});

-

-				ed.onMouseDown.add(function (ed, e) {

-					if (e.button != 2) {

-						fixTableCellSelection(ed);

-					}

-				});

-				function tableCellSelected(ed, rng, n, currentCell) {

-					// The decision of when a table cell is selected is somewhat involved.  The fact that this code is

-					// required is actually a pointer to the root cause of this bug. A cell is selected when the start 

-					// and end offsets are 0, the start container is a text, and the selection node is either a TR (most cases)

-					// or the parent of the table (in the case of the selection containing the last cell of a table).

-					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'), 

-					tableParent, allOfCellSelected, tableCellSelection;

-					if (table) 

-					tableParent = table.parentNode;

-					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE && 

-						rng.startOffset == 0 && 

-						rng.endOffset == 0 && 

-						currentCell && 

-						(n.nodeName=="TR" || n==tableParent);

-					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;	   

-					return  allOfCellSelected || tableCellSelection;

-					// return false;

-				}

-				

-				// this nasty hack is here to work around some WebKit selection bugs.

-				function fixTableCellSelection(ed) {

-					if (!tinymce.isWebKit)

-						return;

-

-					var rng = ed.selection.getRng();

-					var n = ed.selection.getNode();

-					var currentCell = ed.dom.getParent(rng.startContainer, 'TD,TH');

-				

-					if (!tableCellSelected(ed, rng, n, currentCell))

-						return;

-						if (!currentCell) {

-							currentCell=n;

-						}

-					

-					// Get the very last node inside the table cell

-					var end = currentCell.lastChild;

-					while (end.lastChild)

-						end = end.lastChild;

-					

-					// Select the entire table cell. Nothing outside of the table cell should be selected.

-					rng.setEnd(end, end.nodeValue.length);

-					ed.selection.setRng(rng);

-				}

-				ed.plugins.table.fixTableCellSelection=fixTableCellSelection;

-

-				// Add context menu

-				if (ed && ed.plugins.contextmenu) {

-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {

-						var sm, se = ed.selection, el = se.getNode() || ed.getBody();

-

-						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {

-							m.removeAll();

-

-							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {

-								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});

-								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});

-								m.addSeparator();

-							}

-

-							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {

-								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});

-								m.addSeparator();

-							}

-

-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});

-							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});

-							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});

-							m.addSeparator();

-

-							// Cell menu

-							sm = m.addMenu({title : 'table.cell'});

-							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});

-							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});

-							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});

-

-							// Row menu

-							sm = m.addMenu({title : 'table.row'});

-							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});

-							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});

-							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});

-							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});

-							sm.addSeparator();

-							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});

-							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});

-							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);

-							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);

-

-							// Column menu

-							sm = m.addMenu({title : 'table.col'});

-							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});

-							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});

-							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});

-						} else

-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});

-					});

-				}

-

-				// Fix to allow navigating up and down in a table in WebKit browsers.

-				if (tinymce.isWebKit) {

-					function moveSelection(ed, e) {

-						var VK = tinymce.VK;

-						var key = e.keyCode;

-

-						function handle(upBool, sourceNode, event) {

-							var siblingDirection = upBool ? 'previousSibling' : 'nextSibling';

-							var currentRow = ed.dom.getParent(sourceNode, 'tr');

-							var siblingRow = currentRow[siblingDirection];

-

-							if (siblingRow) {

-								moveCursorToRow(ed, sourceNode, siblingRow, upBool);

-								tinymce.dom.Event.cancel(event);

-								return true;

-							} else {

-								var tableNode = ed.dom.getParent(currentRow, 'table');

-								var middleNode = currentRow.parentNode;

-								var parentNodeName = middleNode.nodeName.toLowerCase();

-								if (parentNodeName === 'tbody' || parentNodeName === (upBool ? 'tfoot' : 'thead')) {

-									var targetParent = getTargetParent(upBool, tableNode, middleNode, 'tbody');

-									if (targetParent !== null) {

-										return moveToRowInTarget(upBool, targetParent, sourceNode, event);

-									}

-								}

-								return escapeTable(upBool, currentRow, siblingDirection, tableNode, event);

-							}

-						}

-

-						function getTargetParent(upBool, topNode, secondNode, nodeName) {

-							var tbodies = ed.dom.select('>' + nodeName, topNode);

-							var position = tbodies.indexOf(secondNode);

-							if (upBool && position === 0 || !upBool && position === tbodies.length - 1) {

-								return getFirstHeadOrFoot(upBool, topNode);

-							} else if (position === -1) {

-								var topOrBottom = secondNode.tagName.toLowerCase() === 'thead' ? 0 : tbodies.length - 1;

-								return tbodies[topOrBottom];

-							} else {

-								return tbodies[position + (upBool ? -1 : 1)];

-							}

-						}

-

-						function getFirstHeadOrFoot(upBool, parent) {

-							var tagName = upBool ? 'thead' : 'tfoot';

-							var headOrFoot = ed.dom.select('>' + tagName, parent);

-							return headOrFoot.length !== 0 ? headOrFoot[0] : null;

-						}

-

-						function moveToRowInTarget(upBool, targetParent, sourceNode, event) {

-							var targetRow = getChildForDirection(targetParent, upBool);

-							targetRow && moveCursorToRow(ed, sourceNode, targetRow, upBool);

-							tinymce.dom.Event.cancel(event);

-							return true;

-						}

-

-						function escapeTable(upBool, currentRow, siblingDirection, table, event) {

-							var tableSibling = table[siblingDirection];

-							if (tableSibling) {

-								moveCursorToStartOfElement(tableSibling);

-								return true;

-							} else {

-								var parentCell = ed.dom.getParent(table, 'td,th');

-								if (parentCell) {

-									return handle(upBool, parentCell, event);

-								} else {

-									var backUpSibling = getChildForDirection(currentRow, !upBool);

-									moveCursorToStartOfElement(backUpSibling);

-									return tinymce.dom.Event.cancel(event);

-								}

-							}

-						}

-

-						function getChildForDirection(parent, up) {

-							var child =  parent && parent[up ? 'lastChild' : 'firstChild'];

-							// BR is not a valid table child to return in this case we return the table cell

-							return child && child.nodeName === 'BR' ? ed.dom.getParent(child, 'td,th') : child;

-						}

-

-						function moveCursorToStartOfElement(n) {

-							ed.selection.setCursorLocation(n, 0);

-						}

-

-						function isVerticalMovement() {

-							return key == VK.UP || key == VK.DOWN;

-						}

-

-						function isInTable(ed) {

-							var node = ed.selection.getNode();

-							var currentRow = ed.dom.getParent(node, 'tr');

-							return currentRow !== null;

-						}

-

-						function columnIndex(column) {

-							var colIndex = 0;

-							var c = column;

-							while (c.previousSibling) {

-								c = c.previousSibling;

-								colIndex = colIndex + getSpanVal(c, "colspan");

-							}

-							return colIndex;

-						}

-

-						function findColumn(rowElement, columnIndex) {

-							var c = 0;

-							var r = 0;

-							each(rowElement.children, function(cell, i) {

-								c = c + getSpanVal(cell, "colspan");

-								r = i;

-								if (c > columnIndex)

-									return false;

-							});

-							return r;

-						}

-

-						function moveCursorToRow(ed, node, row, upBool) {

-							var srcColumnIndex = columnIndex(ed.dom.getParent(node, 'td,th'));

-							var tgtColumnIndex = findColumn(row, srcColumnIndex);

-							var tgtNode = row.childNodes[tgtColumnIndex];

-							var rowCellTarget = getChildForDirection(tgtNode, upBool);

-							moveCursorToStartOfElement(rowCellTarget || tgtNode);

-						}

-

-						function shouldFixCaret(preBrowserNode) {

-							var newNode = ed.selection.getNode();

-							var newParent = ed.dom.getParent(newNode, 'td,th');

-							var oldParent = ed.dom.getParent(preBrowserNode, 'td,th');

-							return newParent && newParent !== oldParent && checkSameParentTable(newParent, oldParent)

-						}

-

-						function checkSameParentTable(nodeOne, NodeTwo) {

-							return ed.dom.getParent(nodeOne, 'TABLE') === ed.dom.getParent(NodeTwo, 'TABLE');

-						}

-

-						if (isVerticalMovement() && isInTable(ed)) {

-							var preBrowserNode = ed.selection.getNode();

-							setTimeout(function() {

-								if (shouldFixCaret(preBrowserNode)) {

-									handle(!e.shiftKey && key === VK.UP, preBrowserNode, e);

-								}

-							}, 0);

-						}

-					}

-

-					ed.onKeyDown.add(moveSelection);

-				}

-

-				// Fixes an issue on Gecko where it's impossible to place the caret behind a table

-				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled

-				function fixTableCaretPos() {

-					var last;

-

-					// Skip empty text nodes form the end

-					for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;

-

-					if (last && last.nodeName == 'TABLE') {

-						if (ed.settings.forced_root_block)

-							ed.dom.add(ed.getBody(), ed.settings.forced_root_block, null, tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />');

-						else

-							ed.dom.add(ed.getBody(), 'br', {'data-mce-bogus': '1'});

-					}

-				};

-

-				// Fixes an bug where it's impossible to place the caret before a table in Gecko

-				// this fix solves it by detecting when the caret is at the beginning of such a table

-				// and then manually moves the caret infront of the table

-				if (tinymce.isGecko) {

-					ed.onKeyDown.add(function(ed, e) {

-						var rng, table, dom = ed.dom;

-

-						// On gecko it's not possible to place the caret before a table

-						if (e.keyCode == 37 || e.keyCode == 38) {

-							rng = ed.selection.getRng();

-							table = dom.getParent(rng.startContainer, 'table');

-

-							if (table && ed.getBody().firstChild == table) {

-								if (isAtStart(rng, table)) {

-									rng = dom.createRng();

-

-									rng.setStartBefore(table);

-									rng.setEndBefore(table);

-

-									ed.selection.setRng(rng);

-

-									e.preventDefault();

-								}

-							}

-						}

-					});

-				}

-

-				ed.onKeyUp.add(fixTableCaretPos);

-				ed.onSetContent.add(fixTableCaretPos);

-				ed.onVisualAid.add(fixTableCaretPos);

-

-				ed.onPreProcess.add(function(ed, o) {

-					var last = o.node.lastChild;

-

-					if (last && (last.nodeName == "BR" || (last.childNodes.length == 1 && (last.firstChild.nodeName == 'BR' || last.firstChild.nodeValue == '\u00a0'))) && last.previousSibling && last.previousSibling.nodeName == "TABLE") {

-						ed.dom.remove(last);

-					}

-				});

-

-

-				/**

-				 * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line

-				 */

-				if (tinymce.isGecko) {

-					ed.onKeyDown.add(function(ed, e) {

-						if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {

-							var node = ed.selection.getRng().startContainer;

-							var tableCell = dom.getParent(node, 'td,th');

-							if (tableCell) {

-								var zeroSizedNbsp = ed.getDoc().createTextNode("\uFEFF");

-								dom.insertAfter(zeroSizedNbsp, node);

-							}

-						}

-					});

-				}

-

-

-				fixTableCaretPos();

-				ed.startContent = ed.getContent({format : 'raw'});

-			});

-

-			// Register action commands

-			each({

-				mceTableSplitCells : function(grid) {

-					grid.split();

-				},

-

-				mceTableMergeCells : function(grid) {

-					var rowSpan, colSpan, cell;

-

-					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');

-					if (cell) {

-						rowSpan = cell.rowSpan;

-						colSpan = cell.colSpan;

-					}

-

-					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {

-						winMan.open({

-							url : url + '/merge_cells.htm',

-							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),

-							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),

-							inline : 1

-						}, {

-							rows : rowSpan,

-							cols : colSpan,

-							onaction : function(data) {

-								grid.merge(cell, data.cols, data.rows);

-							},

-							plugin_url : url

-						});

-					} else

-						grid.merge();

-				},

-

-				mceTableInsertRowBefore : function(grid) {

-					grid.insertRow(true);

-				},

-

-				mceTableInsertRowAfter : function(grid) {

-					grid.insertRow();

-				},

-

-				mceTableInsertColBefore : function(grid) {

-					grid.insertCol(true);

-				},

-

-				mceTableInsertColAfter : function(grid) {

-					grid.insertCol();

-				},

-

-				mceTableDeleteCol : function(grid) {

-					grid.deleteCols();

-				},

-

-				mceTableDeleteRow : function(grid) {

-					grid.deleteRows();

-				},

-

-				mceTableCutRow : function(grid) {

-					clipboardRows = grid.cutRows();

-				},

-

-				mceTableCopyRow : function(grid) {

-					clipboardRows = grid.copyRows();

-				},

-

-				mceTablePasteRowBefore : function(grid) {

-					grid.pasteRows(clipboardRows, true);

-				},

-

-				mceTablePasteRowAfter : function(grid) {

-					grid.pasteRows(clipboardRows);

-				},

-

-				mceTableDelete : function(grid) {

-					grid.deleteTable();

-				}

-			}, function(func, name) {

-				ed.addCommand(name, function() {

-					var grid = createTableGrid();

-

-					if (grid) {

-						func(grid);

-						ed.execCommand('mceRepaint');

-						cleanup();

-					}

-				});

-			});

-

-			// Register dialog commands

-			each({

-				mceInsertTable : function(val) {

-					winMan.open({

-						url : url + '/table.htm',

-						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),

-						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),

-						inline : 1

-					}, {

-						plugin_url : url,

-						action : val ? val.action : 0

-					});

-				},

-

-				mceTableRowProps : function() {

-					winMan.open({

-						url : url + '/row.htm',

-						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),

-						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),

-						inline : 1

-					}, {

-						plugin_url : url

-					});

-				},

-

-				mceTableCellProps : function() {

-					winMan.open({

-						url : url + '/cell.htm',

-						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),

-						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),

-						inline : 1

-					}, {

-						plugin_url : url

-					});

-				}

-			}, function(func, name) {

-				ed.addCommand(name, function(ui, val) {

-					func(val);

-				});

-			});

-		}

-	});

-

-	// Register plugin

-	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);

-})(tinymce);

+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function(tinymce) {
+	var each = tinymce.each;
+
+	// Checks if the selection/caret is at the start of the specified block element
+	function isAtStart(rng, par) {
+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;
+
+		rng2.setStartBefore(par);
+		rng2.setEnd(rng.endContainer, rng.endOffset);
+
+		elm = doc.createElement('body');
+		elm.appendChild(rng2.cloneContents());
+
+		// Check for text characters of other elements that should be treated as content
+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
+	};
+
+	function getSpanVal(td, name) {
+		return parseInt(td.getAttribute(name) || 1);
+	}
+
+	/**
+	 * Table Grid class.
+	 */
+	function TableGrid(table, dom, selection) {
+		var grid, startPos, endPos, selectedCell;
+
+		buildGrid();
+		selectedCell = dom.getParent(selection.getStart(), 'th,td');
+		if (selectedCell) {
+			startPos = getPos(selectedCell);
+			endPos = findEndPos();
+			selectedCell = getCell(startPos.x, startPos.y);
+		}
+
+		function cloneNode(node, children) {
+			node = node.cloneNode(children);
+			node.removeAttribute('id');
+
+			return node;
+		}
+
+		function buildGrid() {
+			var startY = 0;
+
+			grid = [];
+
+			each(['thead', 'tbody', 'tfoot'], function(part) {
+				var rows = dom.select('> ' + part + ' tr', table);
+
+				each(rows, function(tr, y) {
+					y += startY;
+
+					each(dom.select('> td, > th', tr), function(td, x) {
+						var x2, y2, rowspan, colspan;
+
+						// Skip over existing cells produced by rowspan
+						if (grid[y]) {
+							while (grid[y][x])
+								x++;
+						}
+
+						// Get col/rowspan from cell
+						rowspan = getSpanVal(td, 'rowspan');
+						colspan = getSpanVal(td, 'colspan');
+
+						// Fill out rowspan/colspan right and down
+						for (y2 = y; y2 < y + rowspan; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2 = x; x2 < x + colspan; x2++) {
+								grid[y2][x2] = {
+									part : part,
+									real : y2 == y && x2 == x,
+									elm : td,
+									rowspan : rowspan,
+									colspan : colspan
+								};
+							}
+						}
+					});
+				});
+
+				startY += rows.length;
+			});
+		};
+
+		function getCell(x, y) {
+			var row;
+
+			row = grid[y];
+			if (row)
+				return row[x];
+		};
+
+		function setSpanVal(td, name, val) {
+			if (td) {
+				val = parseInt(val);
+
+				if (val === 1)
+					td.removeAttribute(name, 1);
+				else
+					td.setAttribute(name, val, 1);
+			}
+		}
+
+		function isCellSelected(cell) {
+			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
+		};
+
+		function getSelectedRows() {
+			var rows = [];
+
+			each(table.rows, function(row) {
+				each(row.cells, function(cell) {
+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {
+						rows.push(row);
+						return false;
+					}
+				});
+			});
+
+			return rows;
+		};
+
+		function deleteTable() {
+			var rng = dom.createRng();
+
+			rng.setStartAfter(table);
+			rng.setEndAfter(table);
+
+			selection.setRng(rng);
+
+			dom.remove(table);
+		};
+
+		function cloneCell(cell) {
+			var formatNode;
+
+			// Clone formats
+			tinymce.walk(cell, function(node) {
+				var curNode;
+
+				if (node.nodeType == 3) {
+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {
+						node = cloneNode(node, false);
+
+						if (!formatNode)
+							formatNode = curNode = node;
+						else if (curNode)
+							curNode.appendChild(node);
+
+						curNode = node;
+					});
+
+					// Add something to the inner node
+					if (curNode)
+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';
+
+					return false;
+				}
+			}, 'childNodes');
+
+			cell = cloneNode(cell, false);
+			setSpanVal(cell, 'rowSpan', 1);
+			setSpanVal(cell, 'colSpan', 1);
+
+			if (formatNode) {
+				cell.appendChild(formatNode);
+			} else {
+				if (!tinymce.isIE)
+					cell.innerHTML = '<br data-mce-bogus="1" />';
+			}
+
+			return cell;
+		};
+
+		function cleanup() {
+			var rng = dom.createRng();
+
+			// Empty rows
+			each(dom.select('tr', table), function(tr) {
+				if (tr.cells.length == 0)
+					dom.remove(tr);
+			});
+
+			// Empty table
+			if (dom.select('tr', table).length == 0) {
+				rng.setStartAfter(table);
+				rng.setEndAfter(table);
+				selection.setRng(rng);
+				dom.remove(table);
+				return;
+			}
+
+			// Empty header/body/footer
+			each(dom.select('thead,tbody,tfoot', table), function(part) {
+				if (part.rows.length == 0)
+					dom.remove(part);
+			});
+
+			// Restore selection to start position if it still exists
+			buildGrid();
+
+			// Restore the selection to the closest table position
+			row = grid[Math.min(grid.length - 1, startPos.y)];
+			if (row) {
+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);
+				selection.collapse(true);
+			}
+		};
+
+		function fillLeftDown(x, y, rows, cols) {
+			var tr, x2, r, c, cell;
+
+			tr = grid[y][x].elm.parentNode;
+			for (r = 1; r <= rows; r++) {
+				tr = dom.getNext(tr, 'tr');
+
+				if (tr) {
+					// Loop left to find real cell
+					for (x2 = x; x2 >= 0; x2--) {
+						cell = grid[y + r][x2].elm;
+
+						if (cell.parentNode == tr) {
+							// Append clones after
+							for (c = 1; c <= cols; c++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							break;
+						}
+					}
+
+					if (x2 == -1) {
+						// Insert nodes before first cell
+						for (c = 1; c <= cols; c++)
+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);
+					}
+				}
+			}
+		};
+
+		function split() {
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan, newCell, i;
+
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						colSpan = getSpanVal(cell, 'colspan');
+						rowSpan = getSpanVal(cell, 'rowspan');
+
+						if (colSpan > 1 || rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', 1);
+							setSpanVal(cell, 'colSpan', 1);
+
+							// Insert cells right
+							for (i = 0; i < colSpan - 1; i++)
+								dom.insertAfter(cloneCell(cell), cell);
+
+							fillLeftDown(x, y, rowSpan - 1, colSpan);
+						}
+					}
+				});
+			});
+		};
+
+		function merge(cell, cols, rows) {
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
+
+			// Use specified cell and cols/rows
+			if (cell) {
+				pos = getPos(cell);
+				startX = pos.x;
+				startY = pos.y;
+				endX = startX + (cols - 1);
+				endY = startY + (rows - 1);
+			} else {
+				startPos = endPos = null;
+
+				// Calculate start/end pos by checking for selected cells in grid works better with context menu
+				each(grid, function(row, y) {
+					each(row, function(cell, x) {
+						if (isCellSelected(cell)) {
+							if (!startPos) {
+								startPos = {x: x, y: y};
+							}
+
+							endPos = {x: x, y: y};
+						}
+					});
+				});
+
+				// Use selection
+				startX = startPos.x;
+				startY = startPos.y;
+				endX = endPos.x;
+				endY = endPos.y;
+			}
+
+			// Find start/end cells
+			startCell = getCell(startX, startY);
+			endCell = getCell(endX, endY);
+
+			// Check if the cells exists and if they are of the same part for example tbody = tbody
+			if (startCell && endCell && startCell.part == endCell.part) {
+				// Split and rebuild grid
+				split();
+				buildGrid();
+
+				// Set row/col span to start cell
+				startCell = getCell(startX, startY).elm;
+				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);
+				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);
+
+				// Remove other cells and add it's contents to the start cell
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						if (!grid[y] || !grid[y][x])
+							continue;
+
+						cell = grid[y][x].elm;
+
+						if (cell != startCell) {
+							// Move children to startCell
+							children = tinymce.grep(cell.childNodes);
+							each(children, function(node) {
+								startCell.appendChild(node);
+							});
+
+							// Remove bogus nodes if there is children in the target cell
+							if (children.length) {
+								children = tinymce.grep(startCell.childNodes);
+								count = 0;
+								each(children, function(node) {
+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)
+										startCell.removeChild(node);
+								});
+							}
+							
+							// Remove cell
+							dom.remove(cell);
+						}
+					}
+				}
+
+				// Remove empty rows etc and restore caret location
+				cleanup();
+			}
+		};
+
+		function insertRow(before) {
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;
+
+			// Find first/last row
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						rowElm = cell.parentNode;
+						newRow = cloneNode(rowElm, false);
+						posY = y;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posY;
+			});
+
+			for (x = 0; x < grid[0].length; x++) {
+				// Cell not found could be because of an invalid table structure
+				if (!grid[posY][x])
+					continue;
+
+				cell = grid[posY][x].elm;
+
+				if (cell != lastCell) {
+					if (!before) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+						if (rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', rowSpan + 1);
+							continue;
+						}
+					} else {
+						// Check if cell above can be expanded
+						if (posY > 0 && grid[posY - 1][x]) {
+							otherCell = grid[posY - 1][x].elm;
+							rowSpan = getSpanVal(otherCell, 'rowSpan');
+							if (rowSpan > 1) {
+								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);
+								continue;
+							}
+						}
+					}
+
+					// Insert new cell into new row
+					newCell = cloneCell(cell);
+					setSpanVal(newCell, 'colSpan', cell.colSpan);
+
+					newRow.appendChild(newCell);
+
+					lastCell = cell;
+				}
+			}
+
+			if (newRow.hasChildNodes()) {
+				if (!before)
+					dom.insertAfter(newRow, rowElm);
+				else
+					rowElm.parentNode.insertBefore(newRow, rowElm);
+			}
+		};
+
+		function insertCol(before) {
+			var posX, lastCell;
+
+			// Find first/last column
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						posX = x;
+
+						if (before)
+							return false;
+					}
+				});
+
+				if (before)
+					return !posX;
+			});
+
+			each(grid, function(row, y) {
+				var cell, rowSpan, colSpan;
+
+				if (!row[posX])
+					return;
+
+				cell = row[posX].elm;
+				if (cell != lastCell) {
+					colSpan = getSpanVal(cell, 'colspan');
+					rowSpan = getSpanVal(cell, 'rowspan');
+
+					if (colSpan == 1) {
+						if (!before) {
+							dom.insertAfter(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						} else {
+							cell.parentNode.insertBefore(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						}
+					} else
+						setSpanVal(cell, 'colSpan', cell.colSpan + 1);
+
+					lastCell = cell;
+				}
+			});
+		};
+
+		function deleteCols() {
+			var cols = [];
+
+			// Get selected column indexes
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {
+						each(grid, function(row) {
+							var cell = row[x].elm, colSpan;
+
+							colSpan = getSpanVal(cell, 'colSpan');
+
+							if (colSpan > 1)
+								setSpanVal(cell, 'colSpan', colSpan - 1);
+							else
+								dom.remove(cell);
+						});
+
+						cols.push(x);
+					}
+				});
+			});
+
+			cleanup();
+		};
+
+		function deleteRows() {
+			var rows;
+
+			function deleteRow(tr) {
+				var nextTr, pos, lastCell;
+
+				nextTr = dom.getNext(tr, 'tr');
+
+				// Move down row spanned cells
+				each(tr.cells, function(cell) {
+					var rowSpan = getSpanVal(cell, 'rowSpan');
+
+					if (rowSpan > 1) {
+						setSpanVal(cell, 'rowSpan', rowSpan - 1);
+						pos = getPos(cell);
+						fillLeftDown(pos.x, pos.y, 1, 1);
+					}
+				});
+
+				// Delete cells
+				pos = getPos(tr.cells[0]);
+				each(grid[pos.y], function(cell) {
+					var rowSpan;
+
+					cell = cell.elm;
+
+					if (cell != lastCell) {
+						rowSpan = getSpanVal(cell, 'rowSpan');
+
+						if (rowSpan <= 1)
+							dom.remove(cell);
+						else
+							setSpanVal(cell, 'rowSpan', rowSpan - 1);
+
+						lastCell = cell;
+					}
+				});
+			};
+
+			// Get selected rows and move selection out of scope
+			rows = getSelectedRows();
+
+			// Delete all selected rows
+			each(rows.reverse(), function(tr) {
+				deleteRow(tr);
+			});
+
+			cleanup();
+		};
+
+		function cutRows() {
+			var rows = getSelectedRows();
+
+			dom.remove(rows);
+			cleanup();
+
+			return rows;
+		};
+
+		function copyRows() {
+			var rows = getSelectedRows();
+
+			each(rows, function(row, i) {
+				rows[i] = cloneNode(row, true);
+			});
+
+			return rows;
+		};
+
+		function pasteRows(rows, before) {
+			var selectedRows = getSelectedRows(),
+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
+				targetCellCount = targetRow.cells.length;
+
+			// Calc target cell count
+			each(grid, function(row) {
+				var match;
+
+				targetCellCount = 0;
+				each(row, function(cell, x) {
+					if (cell.real)
+						targetCellCount += cell.colspan;
+
+					if (cell.elm.parentNode == targetRow)
+						match = 1;
+				});
+
+				if (match)
+					return false;
+			});
+
+			if (!before)
+				rows.reverse();
+
+			each(rows, function(row) {
+				var cellCount = row.cells.length, cell;
+
+				// Remove col/rowspans
+				for (i = 0; i < cellCount; i++) {
+					cell = row.cells[i];
+					setSpanVal(cell, 'colSpan', 1);
+					setSpanVal(cell, 'rowSpan', 1);
+				}
+
+				// Needs more cells
+				for (i = cellCount; i < targetCellCount; i++)
+					row.appendChild(cloneCell(row.cells[cellCount - 1]));
+
+				// Needs less cells
+				for (i = targetCellCount; i < cellCount; i++)
+					dom.remove(row.cells[i]);
+
+				// Add before/after
+				if (before)
+					targetRow.parentNode.insertBefore(row, targetRow);
+				else
+					dom.insertAfter(row, targetRow);
+			});
+
+			// Remove current selection
+			dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+		};
+
+		function getPos(target) {
+			var pos;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (cell.elm == target) {
+						pos = {x : x, y : y};
+						return false;
+					}
+				});
+
+				return !pos;
+			});
+
+			return pos;
+		};
+
+		function setStartCell(cell) {
+			startPos = getPos(cell);
+		};
+
+		function findEndPos() {
+			var pos, maxX, maxY;
+
+			maxX = maxY = 0;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan;
+
+					if (isCellSelected(cell)) {
+						cell = grid[y][x];
+
+						if (x > maxX)
+							maxX = x;
+
+						if (y > maxY)
+							maxY = y;
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				});
+			});
+
+			return {x : maxX, y : maxY};
+		};
+
+		function setEndCell(cell) {
+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;
+
+			endPos = getPos(cell);
+
+			if (startPos && endPos) {
+				// Get start/end positions
+				startX = Math.min(startPos.x, endPos.x);
+				startY = Math.min(startPos.y, endPos.y);
+				endX = Math.max(startPos.x, endPos.x);
+				endY = Math.max(startPos.y, endPos.y);
+
+				// Expand end positon to include spans
+				maxX = endX;
+				maxY = endY;
+
+				// Expand startX
+				for (y = startY; y <= maxY; y++) {
+					cell = grid[y][startX];
+
+					if (!cell.real) {
+						if (startX - (cell.colspan - 1) < startX)
+							startX -= cell.colspan - 1;
+					}
+				}
+
+				// Expand startY
+				for (x = startX; x <= maxX; x++) {
+					cell = grid[startY][x];
+
+					if (!cell.real) {
+						if (startY - (cell.rowspan - 1) < startY)
+							startY -= cell.rowspan - 1;
+					}
+				}
+
+				// Find max X, Y
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x];
+
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
+
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
+							}
+						}
+					}
+				}
+
+				// Remove current selection
+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+
+				// Add new selection
+				for (y = startY; y <= maxY; y++) {
+					for (x = startX; x <= maxX; x++) {
+						if (grid[y][x])
+							dom.addClass(grid[y][x].elm, 'mceSelected');
+					}
+				}
+			}
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			deleteTable : deleteTable,
+			split : split,
+			merge : merge,
+			insertRow : insertRow,
+			insertCol : insertCol,
+			deleteCols : deleteCols,
+			deleteRows : deleteRows,
+			cutRows : cutRows,
+			copyRows : copyRows,
+			pasteRows : pasteRows,
+			getPos : getPos,
+			setStartCell : setStartCell,
+			setEndCell : setEndCell
+		});
+	};
+
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var winMan, clipboardRows, hasCellSelection = true; // Might be selected cells on reload
+
+			function createTableGrid(node) {
+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
+
+				if (tblElm)
+					return new TableGrid(tblElm, ed.dom, selection);
+			};
+
+			function cleanup() {
+				// Restore selection possibilities
+				ed.getBody().style.webkitUserSelect = '';
+
+				if (hasCellSelection) {
+					ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+					hasCellSelection = false;
+				}
+			};
+
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				ed.onClick.add(function(ed, e) {
+					e = e.target;
+
+					if (e.nodeName === 'TABLE') {
+						ed.selection.select(e);
+						ed.nodeChanged();
+					}
+				});
+			}
+
+			ed.onPreProcess.add(function(ed, args) {
+				var nodes, i, node, dom = ed.dom, value;
+
+				nodes = dom.select('table', args.node);
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					dom.setAttrib(node, 'data-mce-style', '');
+
+					if ((value = dom.getAttrib(node, 'width'))) {
+						dom.setStyle(node, 'width', value);
+						dom.setAttrib(node, 'width', '');
+					}
+
+					if ((value = dom.getAttrib(node, 'height'))) {
+						dom.setStyle(node, 'height', value);
+						dom.setAttrib(node, 'height', '');
+					}
+				}
+			});
+
+			// Handle node change updates
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p;
+
+				n = ed.selection.getStart();
+				p = ed.dom.getParent(n, 'td,th,caption');
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+
+				// Disable table tools if we are in caption
+				if (p && p.nodeName === 'CAPTION')
+					p = 0;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p);
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			ed.onInit.add(function(ed) {
+				var startTable, startCell, dom = ed.dom, tableGrid;
+
+				winMan = ed.windowManager;
+
+				// Add cell selection logic
+				ed.onMouseDown.add(function(ed, e) {
+					if (e.button != 2) {
+						cleanup();
+
+						startCell = dom.getParent(e.target, 'td,th');
+						startTable = dom.getParent(startCell, 'table');
+					}
+				});
+
+				dom.bind(ed.getDoc(), 'mouseover', function(e) {
+					var sel, table, target = e.target;
+
+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {
+						table = dom.getParent(target, 'table');
+						if (table == startTable) {
+							if (!tableGrid) {
+								tableGrid = createTableGrid(table);
+								tableGrid.setStartCell(startCell);
+
+								ed.getBody().style.webkitUserSelect = 'none';
+							}
+
+							tableGrid.setEndCell(target);
+							hasCellSelection = true;
+						}
+
+						// Remove current selection
+						sel = ed.selection.getSel();
+
+						try {
+							if (sel.removeAllRanges)
+								sel.removeAllRanges();
+							else
+								sel.empty();
+						} catch (ex) {
+							// IE9 might throw errors here
+						}
+
+						e.preventDefault();
+					}
+				});
+
+				ed.onMouseUp.add(function(ed, e) {
+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;
+
+					// Move selection to startCell
+					if (startCell) {
+						if (tableGrid)
+							ed.getBody().style.webkitUserSelect = '';
+
+						function setPoint(node, start) {
+							var walker = new tinymce.dom.TreeWalker(node, node);
+
+							do {
+								// Text node
+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+									if (start)
+										rng.setStart(node, 0);
+									else
+										rng.setEnd(node, node.nodeValue.length);
+
+									return;
+								}
+
+								// BR element
+								if (node.nodeName == 'BR') {
+									if (start)
+										rng.setStartBefore(node);
+									else
+										rng.setEndBefore(node);
+
+									return;
+								}
+							} while (node = (start ? walker.next() : walker.prev()));
+						}
+
+						// Try to expand text selection as much as we can only Gecko supports cell selection
+						selectedCells = dom.select('td.mceSelected,th.mceSelected');
+						if (selectedCells.length > 0) {
+							rng = dom.createRng();
+							node = selectedCells[0];
+							endNode = selectedCells[selectedCells.length - 1];
+							rng.setStartBefore(node);
+							rng.setEndAfter(node);
+
+							setPoint(node, 1);
+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
+
+							do {
+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {
+									if (!dom.hasClass(node, 'mceSelected'))
+										break;
+
+									lastNode = node;
+								}
+							} while (node = walker.next());
+
+							setPoint(lastNode);
+
+							sel.setRng(rng);
+						}
+
+						ed.nodeChanged();
+						startCell = tableGrid = startTable = null;
+					}
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					cleanup();
+				});
+
+				ed.onKeyDown.add(function (ed, e) {
+					fixTableCellSelection(ed);
+				});
+
+				ed.onMouseDown.add(function (ed, e) {
+					if (e.button != 2) {
+						fixTableCellSelection(ed);
+					}
+				});
+				function tableCellSelected(ed, rng, n, currentCell) {
+					// The decision of when a table cell is selected is somewhat involved.  The fact that this code is
+					// required is actually a pointer to the root cause of this bug. A cell is selected when the start 
+					// and end offsets are 0, the start container is a text, and the selection node is either a TR (most cases)
+					// or the parent of the table (in the case of the selection containing the last cell of a table).
+					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'), 
+					tableParent, allOfCellSelected, tableCellSelection;
+					if (table) 
+					tableParent = table.parentNode;
+					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE && 
+						rng.startOffset == 0 && 
+						rng.endOffset == 0 && 
+						currentCell && 
+						(n.nodeName=="TR" || n==tableParent);
+					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;	   
+					return  allOfCellSelected || tableCellSelection;
+					// return false;
+				}
+				
+				// this nasty hack is here to work around some WebKit selection bugs.
+				function fixTableCellSelection(ed) {
+					if (!tinymce.isWebKit)
+						return;
+
+					var rng = ed.selection.getRng();
+					var n = ed.selection.getNode();
+					var currentCell = ed.dom.getParent(rng.startContainer, 'TD,TH');
+				
+					if (!tableCellSelected(ed, rng, n, currentCell))
+						return;
+						if (!currentCell) {
+							currentCell=n;
+						}
+					
+					// Get the very last node inside the table cell
+					var end = currentCell.lastChild;
+					while (end.lastChild)
+						end = end.lastChild;
+					
+					// Select the entire table cell. Nothing outside of the table cell should be selected.
+					rng.setEnd(end, end.nodeValue.length);
+					ed.selection.setRng(rng);
+				}
+				ed.plugins.table.fixTableCellSelection=fixTableCellSelection;
+
+				// Add context menu
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
+							}
+
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
+
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});
+					});
+				}
+
+				// Fix to allow navigating up and down in a table in WebKit browsers.
+				if (tinymce.isWebKit) {
+					function moveSelection(ed, e) {
+						var VK = tinymce.VK;
+						var key = e.keyCode;
+
+						function handle(upBool, sourceNode, event) {
+							var siblingDirection = upBool ? 'previousSibling' : 'nextSibling';
+							var currentRow = ed.dom.getParent(sourceNode, 'tr');
+							var siblingRow = currentRow[siblingDirection];
+
+							if (siblingRow) {
+								moveCursorToRow(ed, sourceNode, siblingRow, upBool);
+								tinymce.dom.Event.cancel(event);
+								return true;
+							} else {
+								var tableNode = ed.dom.getParent(currentRow, 'table');
+								var middleNode = currentRow.parentNode;
+								var parentNodeName = middleNode.nodeName.toLowerCase();
+								if (parentNodeName === 'tbody' || parentNodeName === (upBool ? 'tfoot' : 'thead')) {
+									var targetParent = getTargetParent(upBool, tableNode, middleNode, 'tbody');
+									if (targetParent !== null) {
+										return moveToRowInTarget(upBool, targetParent, sourceNode, event);
+									}
+								}
+								return escapeTable(upBool, currentRow, siblingDirection, tableNode, event);
+							}
+						}
+
+						function getTargetParent(upBool, topNode, secondNode, nodeName) {
+							var tbodies = ed.dom.select('>' + nodeName, topNode);
+							var position = tbodies.indexOf(secondNode);
+							if (upBool && position === 0 || !upBool && position === tbodies.length - 1) {
+								return getFirstHeadOrFoot(upBool, topNode);
+							} else if (position === -1) {
+								var topOrBottom = secondNode.tagName.toLowerCase() === 'thead' ? 0 : tbodies.length - 1;
+								return tbodies[topOrBottom];
+							} else {
+								return tbodies[position + (upBool ? -1 : 1)];
+							}
+						}
+
+						function getFirstHeadOrFoot(upBool, parent) {
+							var tagName = upBool ? 'thead' : 'tfoot';
+							var headOrFoot = ed.dom.select('>' + tagName, parent);
+							return headOrFoot.length !== 0 ? headOrFoot[0] : null;
+						}
+
+						function moveToRowInTarget(upBool, targetParent, sourceNode, event) {
+							var targetRow = getChildForDirection(targetParent, upBool);
+							targetRow && moveCursorToRow(ed, sourceNode, targetRow, upBool);
+							tinymce.dom.Event.cancel(event);
+							return true;
+						}
+
+						function escapeTable(upBool, currentRow, siblingDirection, table, event) {
+							var tableSibling = table[siblingDirection];
+							if (tableSibling) {
+								moveCursorToStartOfElement(tableSibling);
+								return true;
+							} else {
+								var parentCell = ed.dom.getParent(table, 'td,th');
+								if (parentCell) {
+									return handle(upBool, parentCell, event);
+								} else {
+									var backUpSibling = getChildForDirection(currentRow, !upBool);
+									moveCursorToStartOfElement(backUpSibling);
+									return tinymce.dom.Event.cancel(event);
+								}
+							}
+						}
+
+						function getChildForDirection(parent, up) {
+							var child =  parent && parent[up ? 'lastChild' : 'firstChild'];
+							// BR is not a valid table child to return in this case we return the table cell
+							return child && child.nodeName === 'BR' ? ed.dom.getParent(child, 'td,th') : child;
+						}
+
+						function moveCursorToStartOfElement(n) {
+							ed.selection.setCursorLocation(n, 0);
+						}
+
+						function isVerticalMovement() {
+							return key == VK.UP || key == VK.DOWN;
+						}
+
+						function isInTable(ed) {
+							var node = ed.selection.getNode();
+							var currentRow = ed.dom.getParent(node, 'tr');
+							return currentRow !== null;
+						}
+
+						function columnIndex(column) {
+							var colIndex = 0;
+							var c = column;
+							while (c.previousSibling) {
+								c = c.previousSibling;
+								colIndex = colIndex + getSpanVal(c, "colspan");
+							}
+							return colIndex;
+						}
+
+						function findColumn(rowElement, columnIndex) {
+							var c = 0;
+							var r = 0;
+							each(rowElement.children, function(cell, i) {
+								c = c + getSpanVal(cell, "colspan");
+								r = i;
+								if (c > columnIndex)
+									return false;
+							});
+							return r;
+						}
+
+						function moveCursorToRow(ed, node, row, upBool) {
+							var srcColumnIndex = columnIndex(ed.dom.getParent(node, 'td,th'));
+							var tgtColumnIndex = findColumn(row, srcColumnIndex);
+							var tgtNode = row.childNodes[tgtColumnIndex];
+							var rowCellTarget = getChildForDirection(tgtNode, upBool);
+							moveCursorToStartOfElement(rowCellTarget || tgtNode);
+						}
+
+						function shouldFixCaret(preBrowserNode) {
+							var newNode = ed.selection.getNode();
+							var newParent = ed.dom.getParent(newNode, 'td,th');
+							var oldParent = ed.dom.getParent(preBrowserNode, 'td,th');
+							return newParent && newParent !== oldParent && checkSameParentTable(newParent, oldParent)
+						}
+
+						function checkSameParentTable(nodeOne, NodeTwo) {
+							return ed.dom.getParent(nodeOne, 'TABLE') === ed.dom.getParent(NodeTwo, 'TABLE');
+						}
+
+						if (isVerticalMovement() && isInTable(ed)) {
+							var preBrowserNode = ed.selection.getNode();
+							setTimeout(function() {
+								if (shouldFixCaret(preBrowserNode)) {
+									handle(!e.shiftKey && key === VK.UP, preBrowserNode, e);
+								}
+							}, 0);
+						}
+					}
+
+					ed.onKeyDown.add(moveSelection);
+				}
+
+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
+				function fixTableCaretPos() {
+					var last;
+
+					// Skip empty text nodes form the end
+					for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
+
+					if (last && last.nodeName == 'TABLE') {
+						if (ed.settings.forced_root_block)
+							ed.dom.add(ed.getBody(), ed.settings.forced_root_block, null, tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />');
+						else
+							ed.dom.add(ed.getBody(), 'br', {'data-mce-bogus': '1'});
+					}
+				};
+
+				// Fixes an bug where it's impossible to place the caret before a table in Gecko
+				// this fix solves it by detecting when the caret is at the beginning of such a table
+				// and then manually moves the caret infront of the table
+				if (tinymce.isGecko) {
+					ed.onKeyDown.add(function(ed, e) {
+						var rng, table, dom = ed.dom;
+
+						// On gecko it's not possible to place the caret before a table
+						if (e.keyCode == 37 || e.keyCode == 38) {
+							rng = ed.selection.getRng();
+							table = dom.getParent(rng.startContainer, 'table');
+
+							if (table && ed.getBody().firstChild == table) {
+								if (isAtStart(rng, table)) {
+									rng = dom.createRng();
+
+									rng.setStartBefore(table);
+									rng.setEndBefore(table);
+
+									ed.selection.setRng(rng);
+
+									e.preventDefault();
+								}
+							}
+						}
+					});
+				}
+
+				ed.onKeyUp.add(fixTableCaretPos);
+				ed.onSetContent.add(fixTableCaretPos);
+				ed.onVisualAid.add(fixTableCaretPos);
+
+				ed.onPreProcess.add(function(ed, o) {
+					var last = o.node.lastChild;
+
+					if (last && (last.nodeName == "BR" || (last.childNodes.length == 1 && (last.firstChild.nodeName == 'BR' || last.firstChild.nodeValue == '\u00a0'))) && last.previousSibling && last.previousSibling.nodeName == "TABLE") {
+						ed.dom.remove(last);
+					}
+				});
+
+
+				/**
+				 * Fixes bug in Gecko where shift-enter in table cell does not place caret on new line
+				 */
+				if (tinymce.isGecko) {
+					ed.onKeyDown.add(function(ed, e) {
+						if (e.keyCode === tinymce.VK.ENTER && e.shiftKey) {
+							var node = ed.selection.getRng().startContainer;
+							var tableCell = dom.getParent(node, 'td,th');
+							if (tableCell) {
+								var zeroSizedNbsp = ed.getDoc().createTextNode("\uFEFF");
+								dom.insertAfter(zeroSizedNbsp, node);
+							}
+						}
+					});
+				}
+
+
+				fixTableCaretPos();
+				ed.startContent = ed.getContent({format : 'raw'});
+			});
+
+			// Register action commands
+			each({
+				mceTableSplitCells : function(grid) {
+					grid.split();
+				},
+
+				mceTableMergeCells : function(grid) {
+					var rowSpan, colSpan, cell;
+
+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');
+					if (cell) {
+						rowSpan = cell.rowSpan;
+						colSpan = cell.colSpan;
+					}
+
+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {
+						winMan.open({
+							url : url + '/merge_cells.htm',
+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),
+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),
+							inline : 1
+						}, {
+							rows : rowSpan,
+							cols : colSpan,
+							onaction : function(data) {
+								grid.merge(cell, data.cols, data.rows);
+							},
+							plugin_url : url
+						});
+					} else
+						grid.merge();
+				},
+
+				mceTableInsertRowBefore : function(grid) {
+					grid.insertRow(true);
+				},
+
+				mceTableInsertRowAfter : function(grid) {
+					grid.insertRow();
+				},
+
+				mceTableInsertColBefore : function(grid) {
+					grid.insertCol(true);
+				},
+
+				mceTableInsertColAfter : function(grid) {
+					grid.insertCol();
+				},
+
+				mceTableDeleteCol : function(grid) {
+					grid.deleteCols();
+				},
+
+				mceTableDeleteRow : function(grid) {
+					grid.deleteRows();
+				},
+
+				mceTableCutRow : function(grid) {
+					clipboardRows = grid.cutRows();
+				},
+
+				mceTableCopyRow : function(grid) {
+					clipboardRows = grid.copyRows();
+				},
+
+				mceTablePasteRowBefore : function(grid) {
+					grid.pasteRows(clipboardRows, true);
+				},
+
+				mceTablePasteRowAfter : function(grid) {
+					grid.pasteRows(clipboardRows);
+				},
+
+				mceTableDelete : function(grid) {
+					grid.deleteTable();
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function() {
+					var grid = createTableGrid();
+
+					if (grid) {
+						func(grid);
+						ed.execCommand('mceRepaint');
+						cleanup();
+					}
+				});
+			});
+
+			// Register dialog commands
+			each({
+				mceInsertTable : function(val) {
+					winMan.open({
+						url : url + '/table.htm',
+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),
+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url,
+						action : val ? val.action : 0
+					});
+				},
+
+				mceTableRowProps : function() {
+					winMan.open({
+						url : url + '/row.htm',
+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				},
+
+				mceTableCellProps : function() {
+					winMan.open({
+						url : url + '/cell.htm',
+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function(ui, val) {
+					func(val);
+				});
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+})(tinymce);