added ability to insert attached images in HTML editor

10 files changed, 1341 insertions, 1341 deletions

diff --git a/program/js/tiny_mce/plugins/media/css/content.css b/program/js/tiny_mce/plugins/media/css/content.css
index 1f667e633..7873235e7 100644
--- a/program/js/tiny_mce/plugins/media/css/content.css
+++ b/program/js/tiny_mce/plugins/media/css/content.css
@@ -1,26 +1,26 @@
-.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {

-	border: 1px dotted #cc0000;

-	background-position: center;

-	background-repeat: no-repeat;

-	background-color: #ffffcc;

-}

-

-.mceItemShockWave {

-	background-image: url('../images/shockwave.gif');

-}

-

-.mceItemFlash {

-	background-image: url('../images/flash.gif');

-}

-

-.mceItemQuickTime {

-	background-image: url('../images/quicktime.gif');

-}

-

-.mceItemWindowsMedia {

-	background-image: url('../images/windowsmedia.gif');

-}

-

-.mceItemRealMedia {

-	background-image: url('../images/realmedia.gif');

-}

+.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {
+	border: 1px dotted #cc0000;
+	background-position: center;
+	background-repeat: no-repeat;
+	background-color: #ffffcc;
+}
+
+.mceItemShockWave {
+	background-image: url('../images/shockwave.gif');
+}
+
+.mceItemFlash {
+	background-image: url('../images/flash.gif');
+}
+
+.mceItemQuickTime {
+	background-image: url('../images/quicktime.gif');
+}
+
+.mceItemWindowsMedia {
+	background-image: url('../images/windowsmedia.gif');
+}
+
+.mceItemRealMedia {
+	background-image: url('../images/realmedia.gif');
+}
diff --git a/program/js/tiny_mce/plugins/media/css/media.css b/program/js/tiny_mce/plugins/media/css/media.css
index 89c6bd5a0..62d666a5f 100644
--- a/program/js/tiny_mce/plugins/media/css/media.css
+++ b/program/js/tiny_mce/plugins/media/css/media.css
@@ -1,68 +1,68 @@
-#id, #name, #hspace, #vspace, #class_name, #align {

-	width: 100px;

-}

-

-#hspace, #vspace {

-	width: 50px;

-}

-

-#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode {

-	width: 100px;

-}

-

-#flash_base, #flash_flashvars {

-	width: 240px;

-}

-

-#width, #height {

-	width: 40px;

-}

-

-#src, #media_type {

-	width: 250px;

-}

-

-#class {

-	width: 120px;

-}

-

-#prev {

-	margin: 0;

-	border: 1px solid black;

-	width: 99%;

-	height: 230px;

-	overflow: auto;

-}

-

-.panel_wrapper div.current {

-	height: 390px;

-	overflow: auto;

-}

-

-#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options {

-	display: none;

-}

-

-.mceAddSelectValue {

-	background-color: #DDDDDD;

-}

-

-#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume {

-	width: 70px;

-}

-

-#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume {

-	width: 70px;

-}

-

-#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks {

-	width: 70px;

-}

-

-#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle {

-	width: 90px;

-}

-

-#qt_qtsrc {

-	width: 200px;

-}

+#id, #name, #hspace, #vspace, #class_name, #align {
+	width: 100px;
+}
+
+#hspace, #vspace {
+	width: 50px;
+}
+
+#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode {
+	width: 100px;
+}
+
+#flash_base, #flash_flashvars {
+	width: 240px;
+}
+
+#width, #height {
+	width: 40px;
+}
+
+#src, #media_type {
+	width: 250px;
+}
+
+#class {
+	width: 120px;
+}
+
+#prev {
+	margin: 0;
+	border: 1px solid black;
+	width: 99%;
+	height: 230px;
+	overflow: auto;
+}
+
+.panel_wrapper div.current {
+	height: 390px;
+	overflow: auto;
+}
+
+#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options {
+	display: none;
+}
+
+.mceAddSelectValue {
+	background-color: #DDDDDD;
+}
+
+#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume {
+	width: 70px;
+}
+
+#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume {
+	width: 70px;
+}
+
+#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks {
+	width: 70px;
+}
+
+#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle {
+	width: 90px;
+}
+
+#qt_qtsrc {
+	width: 200px;
+}
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 8bb7d5b59..ee7e13427 100644
--- a/program/js/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
@@ -1,432 +1,432 @@
-/**

- * $Id: editor_plugin_src.js 296 2007-08-21 10:36:35Z spocke $

- *

- * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

- */

-

-/* Import plugin specific language pack */

-tinyMCE.importPluginLanguagePack('media');

-

-var TinyMCE_MediaPlugin = {

-	getInfo : function() {

-		return {

-			longname : 'Media',

-			author : 'Moxiecode Systems AB',

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

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

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

-		};

-	},

-

-	initInstance : function(inst) {

-		// Warn if user has flash plugin and media plugin at the same time

-		if (inst.hasPlugin('flash') && !tinyMCE.flashWarn) {

-			alert('Flash plugin is deprecated and should not be used together with the media plugin.');

-			tinyMCE.flashWarn = true;

-		}

-

-		if (!tinyMCE.settings['media_skip_plugin_css'])

-			tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/media/css/content.css");

-	},

-

-	getControlHTML : function(cn) {

-		switch (cn) {

-			case "media":

-				return tinyMCE.getButtonHTML(cn, 'lang_media_desc', '{$pluginurl}/images/media.gif', 'mceMedia');

-		}

-

-		return "";

-	},

-

-	execCommand : function(editor_id, element, command, user_interface, value) {

-		// Handle commands

-		switch (command) {

-			case "mceMedia":

-				tinyMCE.openWindow({

-						file : '../../plugins/media/media.htm',

-						width : 430 + tinyMCE.getLang('lang_media_delta_width', 0),

-						height : 470 + tinyMCE.getLang('lang_media_delta_height', 0)

-					}, {

-						editor_id : editor_id,

-						inline : "yes"

-				});

-

-				return true;

-	   }

-

-	   // Pass to next handler in chain

-	   return false;

-	},

-

-	cleanup : function(type, content, inst) {

-		var nl, img, i, ne, d, s, ci;

-

-		switch (type) {

-			case "insert_to_editor":

-				img = tinyMCE.getParam("theme_href") + '/images/spacer.gif';

-				content = content.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, '<img class="mceItem$1" title="$2" src="' + img + '" />');

-				content = content.replace(/<object([^>]*)>/gi, '<div class="mceItemObject" $1>');

-				content = content.replace(/<embed([^>]*)>/gi, '<div class="mceItemObjectEmbed" $1>');

-				content = content.replace(/<\/(object|embed)([^>]*)>/gi, '</div>');

-				content = content.replace(/<param([^>]*)>/gi, '<div $1 class="mceItemParam"></div>');

-				content = content.replace(new RegExp('\\/ class="mceItemParam"><\\/div>', 'gi'), 'class="mceItemParam"></div>');

-				break;

-

-			case "insert_to_editor_dom":

-				d = inst.getDoc();

-				nl = content.getElementsByTagName("img");

-				for (i=0; i<nl.length; i++) {

-					if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(nl[i].className)) {

-						nl[i].width = nl[i].title.replace(/.*width:[^0-9]?([0-9]+)%?.*/g, '$1');

-						nl[i].height = nl[i].title.replace(/.*height:[^0-9]?([0-9]+)%?.*/g, '$1');

-						//nl[i].align = nl[i].title.replace(/.*align:([a-z]+).*/gi, '$1');

-					}

-				}

-

-				nl = tinyMCE.selectElements(content, 'DIV', function (n) {return tinyMCE.hasCSSClass(n, 'mceItemObject');});

-				for (i=0; i<nl.length; i++) {

-					ci = tinyMCE.getAttrib(nl[i], "classid").toLowerCase().replace(/\s+/g, '');

-

-					switch (ci) {

-						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':

-							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemFlash', d, nl[i]), nl[i]);

-							break;

-

-						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':

-							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemShockWave', d, nl[i]), nl[i]);

-							break;

-

-						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':

-						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':

-						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':

-							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemWindowsMedia', d, nl[i]), nl[i]);

-							break;

-

-						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':

-							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemQuickTime', d, nl[i]), nl[i]);

-							break;

-

-						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':

-							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemRealMedia', d, nl[i]), nl[i]);

-							break;

-					}

-				}

-

-				// Handle embed (if any)

-				nl = tinyMCE.selectNodes(content, function (n) {return n.className == 'mceItemObjectEmbed';});

-				for (i=0; i<nl.length; i++) {

-					switch (tinyMCE.getAttrib(nl[i], 'type')) {

-						case 'application/x-shockwave-flash':

-							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemFlash');

-							break;

-

-						case 'application/x-director':

-							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemShockWave');

-							break;

-

-						case 'application/x-mplayer2':

-							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemWindowsMedia');

-							break;

-

-						case 'video/quicktime':

-							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemQuickTime');

-							break;

-

-						case 'audio/x-pn-realaudio-plugin':

-							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemRealMedia');

-							break;

-					}

-				}

-				break;

-

-			case "get_from_editor":

-				var startPos = -1, endPos, attribs, chunkBefore, chunkAfter, embedHTML, at, pl, cb, mt, ex;

-

-				while ((startPos = content.indexOf('<img', startPos+1)) != -1) {

-					endPos = content.indexOf('/>', startPos);

-					attribs = TinyMCE_MediaPlugin._parseAttributes(content.substring(startPos + 4, endPos));

-

-					// Is not flash, skip it

-					if (!/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(attribs['class']))

-						continue;

-

-					endPos += 2;

-

-					// Parse attributes

-					at = attribs['title'];

-					if (at) {

-						at = at.replace(/&(#39|apos);/g, "'");

-						at = at.replace(/&#quot;/g, '"');

-

-						try {

-							pl = eval('x={' + at + '};');

-						} catch (ex) {

-							pl = {};

-						}

-					}

-

-					// Use object/embed

-					if (!tinyMCE.getParam('media_use_script', false)) {

-						switch (attribs['class']) {

-							case 'mceItemFlash':

-								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';

-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

-								mt = 'application/x-shockwave-flash';

-								break;

-

-							case 'mceItemShockWave':

-								ci = '166B1BCA-3F9C-11CF-8075-444553540000';

-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';

-								mt = 'application/x-director';

-								break;

-

-							case 'mceItemWindowsMedia':

-								ci = tinyMCE.getParam('media_wmp6_compatible') ? '05589FA1-C356-11CE-BF01-00AA0055595A' : '6BF52A52-394A-11D3-B153-00C04F79FAA6';

-								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

-								mt = 'application/x-mplayer2';

-								break;

-

-							case 'mceItemQuickTime':

-								ci = '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';

-								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';

-								mt = 'video/quicktime';

-								break;

-

-							case 'mceItemRealMedia':

-								ci = 'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';

-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

-								mt = 'audio/x-pn-realaudio-plugin';

-								break;

-						}

-

-						// Convert the URL

-						pl.src = tinyMCE.convertURL(pl.src, null, true);

-

-						embedHTML = TinyMCE_MediaPlugin._getEmbed(ci, cb, mt, pl, attribs);

-					} else {

-						// Use script version

-						switch (attribs['class']) {

-							case 'mceItemFlash':

-								s = 'writeFlash';

-								break;

-

-							case 'mceItemShockWave':

-								s = 'writeShockWave';

-								break;

-

-							case 'mceItemWindowsMedia':

-								s = 'writeWindowsMedia';

-								break;

-

-							case 'mceItemQuickTime':

-								s = 'writeQuickTime';

-								break;

-

-							case 'mceItemRealMedia':

-								s = 'writeRealMedia';

-								break;

-						}

-

-						if (attribs.width)

-							at = at.replace(/width:[^0-9]?[0-9]+%?[^0-9]?/g, "width:'" + attribs.width + "'");

-

-						if (attribs.height)

-							at = at.replace(/height:[^0-9]?[0-9]+%?[^0-9]?/g, "height:'" + attribs.height + "'");

-

-						// Force absolute URL

-						pl.src = tinyMCE.convertURL(pl.src, null, true);

-						at = at.replace(new RegExp("src:'[^']*'", "g"), "src:'" + pl.src + "'");

-

-						embedHTML = '<script type="text/javascript">' + s + '({' + at + '});</script>';

-					}

-

-					// Insert embed/object chunk

-					chunkBefore = content.substring(0, startPos);

-					chunkAfter = content.substring(endPos);

-					content = chunkBefore + embedHTML + chunkAfter;

-				}

-				break;

-		}

-

-		return content;

-	},

-

-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {

-		if (node == null)

-			return;

-

-		do {

-			if (node.nodeName == "IMG" && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(tinyMCE.getAttrib(node, 'class'))) {

-				tinyMCE.switchClass(editor_id + '_media', 'mceButtonSelected');

-				return true;

-			}

-		} while ((node = node.parentNode));

-

-		tinyMCE.switchClass(editor_id + '_media', 'mceButtonNormal');

-

-		return true;

-	},

-

-	_createImgFromEmbed : function(n, d, cl) {

-		var ne, at, i, ti = '', an;

-

-		ne = d.createElement('img');

-		ne.src = tinyMCE.getParam("theme_href") + '/images/spacer.gif';

-		ne.width = tinyMCE.getAttrib(n, 'width');

-		ne.height = tinyMCE.getAttrib(n, 'height');

-		ne.className = cl;

-

-		at = n.attributes;

-		for (i=0; i<at.length; i++) {

-			if (at[i].specified && at[i].nodeValue) {

-				an = at[i].nodeName.toLowerCase();

-

-				if (an == 'src')

-					continue;

-

-				if (an == 'mce_src')

-					an = 'src';

-

-				if (an.indexOf('mce_') == -1 && !new RegExp('^(class|type)$').test(an))

-					ti += an.toLowerCase() + ':\'' + at[i].nodeValue + "',";

-			}

-		}

-

-		ti = ti.length > 0 ? ti.substring(0, ti.length - 1) : ti;

-		ne.title = ti;

-

-		n.parentNode.replaceChild(ne, n);

-	},

-

-	_createImg : function(cl, d, n) {

-		var i, nl, ti = "", an, av, al = new Array();

-

-		ne = d.createElement('img');

-		ne.src = tinyMCE.getParam("theme_href") + '/images/spacer.gif';

-		ne.width = tinyMCE.getAttrib(n, 'width');

-		ne.height = tinyMCE.getAttrib(n, 'height');

-		ne.className = cl;

-

-		al.id = tinyMCE.getAttrib(n, 'id');

-		al.name = tinyMCE.getAttrib(n, 'name');

-		al.width = tinyMCE.getAttrib(n, 'width');

-		al.height = tinyMCE.getAttrib(n, 'height');

-		al.bgcolor = tinyMCE.getAttrib(n, 'bgcolor');

-		al.align = tinyMCE.getAttrib(n, 'align');

-		al.class_name = tinyMCE.getAttrib(n, 'mce_class');

-

-		nl = n.getElementsByTagName('div');

-		for (i=0; i<nl.length; i++) {

-			av = tinyMCE.getAttrib(nl[i], 'value');

-			av = av.replace(new RegExp('\\\\', 'g'), '\\\\');

-			av = av.replace(new RegExp('"', 'g'), '\\"');

-			av = av.replace(new RegExp("'", 'g'), "\\'");

-			an = tinyMCE.getAttrib(nl[i], 'name');

-			al[an] = av;

-		}

-

-		if (al.movie) {

-			al.src = al.movie;

-			al.movie = null;

-		}

-

-		for (an in al) {

-			if (al[an] != null && typeof(al[an]) != "function" && al[an] != '')

-				ti += an.toLowerCase() + ':\'' + al[an] + "',";

-		}

-

-		ti = ti.length > 0 ? ti.substring(0, ti.length - 1) : ti;

-		ne.title = ti;

-

-		return ne;

-	},

-

-	_getEmbed : function(cls, cb, mt, p, at) {

-		var h = '', n;

-

-		p.width = at.width ? at.width : p.width;

-		p.height = at.height ? at.height : p.height;

-

-		h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';

-		h += typeof(p.id) != "undefined" ? ' id="' + p.id + '"' : '';

-		h += typeof(p.name) != "undefined" ? ' name="' + p.name + '"' : '';

-		h += typeof(p.width) != "undefined" ? ' width="' + p.width + '"' : '';

-		h += typeof(p.height) != "undefined" ? ' height="' + p.height + '"' : '';

-		h += typeof(p.align) != "undefined" ? ' align="' + p.align + '"' : '';

-		h += '>';

-

-		for (n in p) {

-			if (typeof(p[n]) != "undefined" && typeof(p[n]) != "function") {

-				h += '<param name="' + n + '" value="' + p[n] + '" />';

-

-				// Add extra url parameter if it's an absolute URL on WMP

-				if (n == 'src' && p[n].indexOf('://') != -1 && mt == 'application/x-mplayer2')

-					h += '<param name="url" value="' + p[n] + '" />';

-			}

-		}

-

-		h += '<embed type="' + mt + '"';

-

-		for (n in p) {

-			if (typeof(p[n]) == "function")

-				continue;

-

-			// Skip url parameter for embed tag on WMP

-			if (!(n == 'url' && mt == 'application/x-mplayer2'))

-				h += ' ' + n + '="' + p[n] + '"';

-		}

-

-		h += '></embed></object>';

-

-		return h;

-	},

-

-	_parseAttributes : function(attribute_string) {

-		var attributeName = "", endChr = '"';

-		var attributeValue = "";

-		var withInName;

-		var withInValue;

-		var attributes = new Array();

-		var whiteSpaceRegExp = new RegExp('^[ \n\r\t]+', 'g');

-

-		if (attribute_string == null || attribute_string.length < 2)

-			return null;

-

-		withInName = withInValue = false;

-

-		for (var i=0; i<attribute_string.length; i++) {

-			var chr = attribute_string.charAt(i);

-

-			if ((chr == '"' || chr == "'") && !withInValue) {

-				withInValue = true;

-				endChr = chr;

-			} else if (chr == endChr && withInValue) {

-				withInValue = false;

-

-				var pos = attributeName.lastIndexOf(' ');

-				if (pos != -1)

-					attributeName = attributeName.substring(pos+1);

-

-				attributes[attributeName.toLowerCase()] = attributeValue.substring(1);

-

-				attributeName = "";

-				attributeValue = "";

-			} else if (!whiteSpaceRegExp.test(chr) && !withInName && !withInValue)

-				withInName = true;

-

-			if (chr == '=' && withInName)

-				withInName = false;

-

-			if (withInName)

-				attributeName += chr;

-

-			if (withInValue)

-				attributeValue += chr;

-		}

-

-		return attributes;

-	}

-};

-

-tinyMCE.addPlugin("media", TinyMCE_MediaPlugin);

+/**
+ * $Id: editor_plugin_src.js 296 2007-08-21 10:36:35Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
+ */
+
+/* Import plugin specific language pack */
+tinyMCE.importPluginLanguagePack('media');
+
+var TinyMCE_MediaPlugin = {
+	getInfo : function() {
+		return {
+			longname : 'Media',
+			author : 'Moxiecode Systems AB',
+			authorurl : 'http://tinymce.moxiecode.com',
+			infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
+			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+		};
+	},
+
+	initInstance : function(inst) {
+		// Warn if user has flash plugin and media plugin at the same time
+		if (inst.hasPlugin('flash') && !tinyMCE.flashWarn) {
+			alert('Flash plugin is deprecated and should not be used together with the media plugin.');
+			tinyMCE.flashWarn = true;
+		}
+
+		if (!tinyMCE.settings['media_skip_plugin_css'])
+			tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + "/plugins/media/css/content.css");
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "media":
+				return tinyMCE.getButtonHTML(cn, 'lang_media_desc', '{$pluginurl}/images/media.gif', 'mceMedia');
+		}
+
+		return "";
+	},
+
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			case "mceMedia":
+				tinyMCE.openWindow({
+						file : '../../plugins/media/media.htm',
+						width : 430 + tinyMCE.getLang('lang_media_delta_width', 0),
+						height : 470 + tinyMCE.getLang('lang_media_delta_height', 0)
+					}, {
+						editor_id : editor_id,
+						inline : "yes"
+				});
+
+				return true;
+	   }
+
+	   // Pass to next handler in chain
+	   return false;
+	},
+
+	cleanup : function(type, content, inst) {
+		var nl, img, i, ne, d, s, ci;
+
+		switch (type) {
+			case "insert_to_editor":
+				img = tinyMCE.getParam("theme_href") + '/images/spacer.gif';
+				content = content.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, '<img class="mceItem$1" title="$2" src="' + img + '" />');
+				content = content.replace(/<object([^>]*)>/gi, '<div class="mceItemObject" $1>');
+				content = content.replace(/<embed([^>]*)>/gi, '<div class="mceItemObjectEmbed" $1>');
+				content = content.replace(/<\/(object|embed)([^>]*)>/gi, '</div>');
+				content = content.replace(/<param([^>]*)>/gi, '<div $1 class="mceItemParam"></div>');
+				content = content.replace(new RegExp('\\/ class="mceItemParam"><\\/div>', 'gi'), 'class="mceItemParam"></div>');
+				break;
+
+			case "insert_to_editor_dom":
+				d = inst.getDoc();
+				nl = content.getElementsByTagName("img");
+				for (i=0; i<nl.length; i++) {
+					if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(nl[i].className)) {
+						nl[i].width = nl[i].title.replace(/.*width:[^0-9]?([0-9]+)%?.*/g, '$1');
+						nl[i].height = nl[i].title.replace(/.*height:[^0-9]?([0-9]+)%?.*/g, '$1');
+						//nl[i].align = nl[i].title.replace(/.*align:([a-z]+).*/gi, '$1');
+					}
+				}
+
+				nl = tinyMCE.selectElements(content, 'DIV', function (n) {return tinyMCE.hasCSSClass(n, 'mceItemObject');});
+				for (i=0; i<nl.length; i++) {
+					ci = tinyMCE.getAttrib(nl[i], "classid").toLowerCase().replace(/\s+/g, '');
+
+					switch (ci) {
+						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
+							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemFlash', d, nl[i]), nl[i]);
+							break;
+
+						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
+							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemShockWave', d, nl[i]), nl[i]);
+							break;
+
+						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
+						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
+						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
+							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemWindowsMedia', d, nl[i]), nl[i]);
+							break;
+
+						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
+							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemQuickTime', d, nl[i]), nl[i]);
+							break;
+
+						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
+							nl[i].parentNode.replaceChild(TinyMCE_MediaPlugin._createImg('mceItemRealMedia', d, nl[i]), nl[i]);
+							break;
+					}
+				}
+
+				// Handle embed (if any)
+				nl = tinyMCE.selectNodes(content, function (n) {return n.className == 'mceItemObjectEmbed';});
+				for (i=0; i<nl.length; i++) {
+					switch (tinyMCE.getAttrib(nl[i], 'type')) {
+						case 'application/x-shockwave-flash':
+							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemFlash');
+							break;
+
+						case 'application/x-director':
+							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemShockWave');
+							break;
+
+						case 'application/x-mplayer2':
+							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemWindowsMedia');
+							break;
+
+						case 'video/quicktime':
+							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemQuickTime');
+							break;
+
+						case 'audio/x-pn-realaudio-plugin':
+							TinyMCE_MediaPlugin._createImgFromEmbed(nl[i], d, 'mceItemRealMedia');
+							break;
+					}
+				}
+				break;
+
+			case "get_from_editor":
+				var startPos = -1, endPos, attribs, chunkBefore, chunkAfter, embedHTML, at, pl, cb, mt, ex;
+
+				while ((startPos = content.indexOf('<img', startPos+1)) != -1) {
+					endPos = content.indexOf('/>', startPos);
+					attribs = TinyMCE_MediaPlugin._parseAttributes(content.substring(startPos + 4, endPos));
+
+					// Is not flash, skip it
+					if (!/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(attribs['class']))
+						continue;
+
+					endPos += 2;
+
+					// Parse attributes
+					at = attribs['title'];
+					if (at) {
+						at = at.replace(/&(#39|apos);/g, "'");
+						at = at.replace(/&#quot;/g, '"');
+
+						try {
+							pl = eval('x={' + at + '};');
+						} catch (ex) {
+							pl = {};
+						}
+					}
+
+					// Use object/embed
+					if (!tinyMCE.getParam('media_use_script', false)) {
+						switch (attribs['class']) {
+							case 'mceItemFlash':
+								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+								mt = 'application/x-shockwave-flash';
+								break;
+
+							case 'mceItemShockWave':
+								ci = '166B1BCA-3F9C-11CF-8075-444553540000';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+								mt = 'application/x-director';
+								break;
+
+							case 'mceItemWindowsMedia':
+								ci = tinyMCE.getParam('media_wmp6_compatible') ? '05589FA1-C356-11CE-BF01-00AA0055595A' : '6BF52A52-394A-11D3-B153-00C04F79FAA6';
+								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+								mt = 'application/x-mplayer2';
+								break;
+
+							case 'mceItemQuickTime':
+								ci = '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
+								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+								mt = 'video/quicktime';
+								break;
+
+							case 'mceItemRealMedia':
+								ci = 'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+								mt = 'audio/x-pn-realaudio-plugin';
+								break;
+						}
+
+						// Convert the URL
+						pl.src = tinyMCE.convertURL(pl.src, null, true);
+
+						embedHTML = TinyMCE_MediaPlugin._getEmbed(ci, cb, mt, pl, attribs);
+					} else {
+						// Use script version
+						switch (attribs['class']) {
+							case 'mceItemFlash':
+								s = 'writeFlash';
+								break;
+
+							case 'mceItemShockWave':
+								s = 'writeShockWave';
+								break;
+
+							case 'mceItemWindowsMedia':
+								s = 'writeWindowsMedia';
+								break;
+
+							case 'mceItemQuickTime':
+								s = 'writeQuickTime';
+								break;
+
+							case 'mceItemRealMedia':
+								s = 'writeRealMedia';
+								break;
+						}
+
+						if (attribs.width)
+							at = at.replace(/width:[^0-9]?[0-9]+%?[^0-9]?/g, "width:'" + attribs.width + "'");
+
+						if (attribs.height)
+							at = at.replace(/height:[^0-9]?[0-9]+%?[^0-9]?/g, "height:'" + attribs.height + "'");
+
+						// Force absolute URL
+						pl.src = tinyMCE.convertURL(pl.src, null, true);
+						at = at.replace(new RegExp("src:'[^']*'", "g"), "src:'" + pl.src + "'");
+
+						embedHTML = '<script type="text/javascript">' + s + '({' + at + '});</script>';
+					}
+
+					// Insert embed/object chunk
+					chunkBefore = content.substring(0, startPos);
+					chunkAfter = content.substring(endPos);
+					content = chunkBefore + embedHTML + chunkAfter;
+				}
+				break;
+		}
+
+		return content;
+	},
+
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+		if (node == null)
+			return;
+
+		do {
+			if (node.nodeName == "IMG" && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(tinyMCE.getAttrib(node, 'class'))) {
+				tinyMCE.switchClass(editor_id + '_media', 'mceButtonSelected');
+				return true;
+			}
+		} while ((node = node.parentNode));
+
+		tinyMCE.switchClass(editor_id + '_media', 'mceButtonNormal');
+
+		return true;
+	},
+
+	_createImgFromEmbed : function(n, d, cl) {
+		var ne, at, i, ti = '', an;
+
+		ne = d.createElement('img');
+		ne.src = tinyMCE.getParam("theme_href") + '/images/spacer.gif';
+		ne.width = tinyMCE.getAttrib(n, 'width');
+		ne.height = tinyMCE.getAttrib(n, 'height');
+		ne.className = cl;
+
+		at = n.attributes;
+		for (i=0; i<at.length; i++) {
+			if (at[i].specified && at[i].nodeValue) {
+				an = at[i].nodeName.toLowerCase();
+
+				if (an == 'src')
+					continue;
+
+				if (an == 'mce_src')
+					an = 'src';
+
+				if (an.indexOf('mce_') == -1 && !new RegExp('^(class|type)$').test(an))
+					ti += an.toLowerCase() + ':\'' + at[i].nodeValue + "',";
+			}
+		}
+
+		ti = ti.length > 0 ? ti.substring(0, ti.length - 1) : ti;
+		ne.title = ti;
+
+		n.parentNode.replaceChild(ne, n);
+	},
+
+	_createImg : function(cl, d, n) {
+		var i, nl, ti = "", an, av, al = new Array();
+
+		ne = d.createElement('img');
+		ne.src = tinyMCE.getParam("theme_href") + '/images/spacer.gif';
+		ne.width = tinyMCE.getAttrib(n, 'width');
+		ne.height = tinyMCE.getAttrib(n, 'height');
+		ne.className = cl;
+
+		al.id = tinyMCE.getAttrib(n, 'id');
+		al.name = tinyMCE.getAttrib(n, 'name');
+		al.width = tinyMCE.getAttrib(n, 'width');
+		al.height = tinyMCE.getAttrib(n, 'height');
+		al.bgcolor = tinyMCE.getAttrib(n, 'bgcolor');
+		al.align = tinyMCE.getAttrib(n, 'align');
+		al.class_name = tinyMCE.getAttrib(n, 'mce_class');
+
+		nl = n.getElementsByTagName('div');
+		for (i=0; i<nl.length; i++) {
+			av = tinyMCE.getAttrib(nl[i], 'value');
+			av = av.replace(new RegExp('\\\\', 'g'), '\\\\');
+			av = av.replace(new RegExp('"', 'g'), '\\"');
+			av = av.replace(new RegExp("'", 'g'), "\\'");
+			an = tinyMCE.getAttrib(nl[i], 'name');
+			al[an] = av;
+		}
+
+		if (al.movie) {
+			al.src = al.movie;
+			al.movie = null;
+		}
+
+		for (an in al) {
+			if (al[an] != null && typeof(al[an]) != "function" && al[an] != '')
+				ti += an.toLowerCase() + ':\'' + al[an] + "',";
+		}
+
+		ti = ti.length > 0 ? ti.substring(0, ti.length - 1) : ti;
+		ne.title = ti;
+
+		return ne;
+	},
+
+	_getEmbed : function(cls, cb, mt, p, at) {
+		var h = '', n;
+
+		p.width = at.width ? at.width : p.width;
+		p.height = at.height ? at.height : p.height;
+
+		h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+		h += typeof(p.id) != "undefined" ? ' id="' + p.id + '"' : '';
+		h += typeof(p.name) != "undefined" ? ' name="' + p.name + '"' : '';
+		h += typeof(p.width) != "undefined" ? ' width="' + p.width + '"' : '';
+		h += typeof(p.height) != "undefined" ? ' height="' + p.height + '"' : '';
+		h += typeof(p.align) != "undefined" ? ' align="' + p.align + '"' : '';
+		h += '>';
+
+		for (n in p) {
+			if (typeof(p[n]) != "undefined" && typeof(p[n]) != "function") {
+				h += '<param name="' + n + '" value="' + p[n] + '" />';
+
+				// Add extra url parameter if it's an absolute URL on WMP
+				if (n == 'src' && p[n].indexOf('://') != -1 && mt == 'application/x-mplayer2')
+					h += '<param name="url" value="' + p[n] + '" />';
+			}
+		}
+
+		h += '<embed type="' + mt + '"';
+
+		for (n in p) {
+			if (typeof(p[n]) == "function")
+				continue;
+
+			// Skip url parameter for embed tag on WMP
+			if (!(n == 'url' && mt == 'application/x-mplayer2'))
+				h += ' ' + n + '="' + p[n] + '"';
+		}
+
+		h += '></embed></object>';
+
+		return h;
+	},
+
+	_parseAttributes : function(attribute_string) {
+		var attributeName = "", endChr = '"';
+		var attributeValue = "";
+		var withInName;
+		var withInValue;
+		var attributes = new Array();
+		var whiteSpaceRegExp = new RegExp('^[ \n\r\t]+', 'g');
+
+		if (attribute_string == null || attribute_string.length < 2)
+			return null;
+
+		withInName = withInValue = false;
+
+		for (var i=0; i<attribute_string.length; i++) {
+			var chr = attribute_string.charAt(i);
+
+			if ((chr == '"' || chr == "'") && !withInValue) {
+				withInValue = true;
+				endChr = chr;
+			} else if (chr == endChr && withInValue) {
+				withInValue = false;
+
+				var pos = attributeName.lastIndexOf(' ');
+				if (pos != -1)
+					attributeName = attributeName.substring(pos+1);
+
+				attributes[attributeName.toLowerCase()] = attributeValue.substring(1);
+
+				attributeName = "";
+				attributeValue = "";
+			} else if (!whiteSpaceRegExp.test(chr) && !withInName && !withInValue)
+				withInName = true;
+
+			if (chr == '=' && withInName)
+				withInName = false;
+
+			if (withInName)
+				attributeName += chr;
+
+			if (withInValue)
+				attributeValue += chr;
+		}
+
+		return attributes;
+	}
+};
+
+tinyMCE.addPlugin("media", TinyMCE_MediaPlugin);
diff --git a/program/js/tiny_mce/plugins/media/jscripts/embed.js b/program/js/tiny_mce/plugins/media/jscripts/embed.js
index f8dc81052..6fe25de09 100644
--- a/program/js/tiny_mce/plugins/media/jscripts/embed.js
+++ b/program/js/tiny_mce/plugins/media/jscripts/embed.js
@@ -1,73 +1,73 @@
-/**

- * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.

- */

-

-function writeFlash(p) {

-	writeEmbed(

-		'D27CDB6E-AE6D-11cf-96B8-444553540000',

-		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',

-		'application/x-shockwave-flash',

-		p

-	);

-}

-

-function writeShockWave(p) {

-	writeEmbed(

-	'166B1BCA-3F9C-11CF-8075-444553540000',

-	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',

-	'application/x-director',

-		p

-	);

-}

-

-function writeQuickTime(p) {

-	writeEmbed(

-		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',

-		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',

-		'video/quicktime',

-		p

-	);

-}

-

-function writeRealMedia(p) {

-	writeEmbed(

-		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',

-		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',

-		'audio/x-pn-realaudio-plugin',

-		p

-	);

-}

-

-function writeWindowsMedia(p) {

-	p.url = p.src;

-	writeEmbed(

-		'6BF52A52-394A-11D3-B153-00C04F79FAA6',

-		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',

-		'application/x-mplayer2',

-		p

-	);

-}

-

-function writeEmbed(cls, cb, mt, p) {

-	var h = '', n;

-

-	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';

-	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';

-	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';

-	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';

-	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';

-	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';

-	h += '>';

-

-	for (n in p)

-		h += '<param name="' + n + '" value="' + p[n] + '">';

-

-	h += '<embed type="' + mt + '"';

-

-	for (n in p)

-		h += n + '="' + p[n] + '" ';

-

-	h += '></embed></object>';

-

-	document.write(h);

-}

+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/program/js/tiny_mce/plugins/media/jscripts/media.js b/program/js/tiny_mce/plugins/media/jscripts/media.js
index 3c0073a59..2b9a4f02c 100644
--- a/program/js/tiny_mce/plugins/media/jscripts/media.js
+++ b/program/js/tiny_mce/plugins/media/jscripts/media.js
@@ -1,594 +1,594 @@
-var oldWidth, oldHeight;

-var url = tinyMCE.getParam("media_external_list_url");

-if (url != null) {

-	// Fix relative

-	if (url.charAt(0) != '/' && url.indexOf('://') == -1)

-		url = tinyMCE.documentBasePath + "/" + url;

-

-	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');

-}

-

-function init() {

-	var pl = "", f, val;

-	var type = "flash", fe, i;

-

-	tinyMCEPopup.resizeToInnerSize();

-	f = document.forms[0]

-

-	fe = tinyMCE.selectedInstance.getFocusElement();

-	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(tinyMCE.getAttrib(fe, 'class'))) {

-		pl = "x={" + fe.title + "};";

-

-		switch (tinyMCE.getAttrib(fe, 'class')) {

-			case 'mceItemFlash':

-				type = 'flash';

-				break;

-

-			case 'mceItemShockWave':

-				type = 'shockwave';

-				break;

-

-			case 'mceItemWindowsMedia':

-				type = 'wmp';

-				break;

-

-			case 'mceItemQuickTime':

-				type = 'qt';

-				break;

-

-			case 'mceItemRealMedia':

-				type = 'rmp';

-				break;

-		}

-

-		document.forms[0].insert.value = tinyMCE.getLang('lang_update', 'Insert', true); 

-	}

-

-	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

-	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');

-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

-

-	var html = getMediaListHTML('filebrowser','src','media','media');

-	if (html == "")

-		document.getElementById("linklistrow").style.display = 'none';

-	else

-		document.getElementById("linklistcontainer").innerHTML = html;

-

-	// Resize some elements

-	if (isVisible('filebrowsercontainer'))

-		document.getElementById('src').style.width = '230px';

-

-	// Setup form

-	if (pl != "") {

-		pl = eval(pl);

-

-		switch (type) {

-			case "flash":

-				setBool(pl, 'flash', 'play');

-				setBool(pl, 'flash', 'loop');

-				setBool(pl, 'flash', 'menu');

-				setBool(pl, 'flash', 'swliveconnect');

-				setStr(pl, 'flash', 'quality');

-				setStr(pl, 'flash', 'scale');

-				setStr(pl, 'flash', 'salign');

-				setStr(pl, 'flash', 'wmode');

-				setStr(pl, 'flash', 'base');

-				setStr(pl, 'flash', 'flashvars');

-			break;

-

-			case "qt":

-				setBool(pl, 'qt', 'loop');

-				setBool(pl, 'qt', 'autoplay');

-				setBool(pl, 'qt', 'cache');

-				setBool(pl, 'qt', 'controller');

-				setBool(pl, 'qt', 'correction');

-				setBool(pl, 'qt', 'enablejavascript');

-				setBool(pl, 'qt', 'kioskmode');

-				setBool(pl, 'qt', 'autohref');

-				setBool(pl, 'qt', 'playeveryframe');

-				setBool(pl, 'qt', 'tarsetcache');

-				setStr(pl, 'qt', 'scale');

-				setStr(pl, 'qt', 'starttime');

-				setStr(pl, 'qt', 'endtime');

-				setStr(pl, 'qt', 'tarset');

-				setStr(pl, 'qt', 'qtsrcchokespeed');

-				setStr(pl, 'qt', 'volume');

-				setStr(pl, 'qt', 'qtsrc');

-			break;

-

-			case "shockwave":

-				setBool(pl, 'shockwave', 'sound');

-				setBool(pl, 'shockwave', 'progress');

-				setBool(pl, 'shockwave', 'autostart');

-				setBool(pl, 'shockwave', 'swliveconnect');

-				setStr(pl, 'shockwave', 'swvolume');

-				setStr(pl, 'shockwave', 'swstretchstyle');

-				setStr(pl, 'shockwave', 'swstretchhalign');

-				setStr(pl, 'shockwave', 'swstretchvalign');

-			break;

-

-			case "wmp":

-				setBool(pl, 'wmp', 'autostart');

-				setBool(pl, 'wmp', 'enabled');

-				setBool(pl, 'wmp', 'enablecontextmenu');

-				setBool(pl, 'wmp', 'fullscreen');

-				setBool(pl, 'wmp', 'invokeurls');

-				setBool(pl, 'wmp', 'mute');

-				setBool(pl, 'wmp', 'stretchtofit');

-				setBool(pl, 'wmp', 'windowlessvideo');

-				setStr(pl, 'wmp', 'balance');

-				setStr(pl, 'wmp', 'baseurl');

-				setStr(pl, 'wmp', 'captioningid');

-				setStr(pl, 'wmp', 'currentmarker');

-				setStr(pl, 'wmp', 'currentposition');

-				setStr(pl, 'wmp', 'defaultframe');

-				setStr(pl, 'wmp', 'playcount');

-				setStr(pl, 'wmp', 'rate');

-				setStr(pl, 'wmp', 'uimode');

-				setStr(pl, 'wmp', 'volume');

-			break;

-

-			case "rmp":

-				setBool(pl, 'rmp', 'autostart');

-				setBool(pl, 'rmp', 'loop');

-				setBool(pl, 'rmp', 'autogotourl');

-				setBool(pl, 'rmp', 'center');

-				setBool(pl, 'rmp', 'imagestatus');

-				setBool(pl, 'rmp', 'maintainaspect');

-				setBool(pl, 'rmp', 'nojava');

-				setBool(pl, 'rmp', 'prefetch');

-				setBool(pl, 'rmp', 'shuffle');

-				setStr(pl, 'rmp', 'console');

-				setStr(pl, 'rmp', 'controls');

-				setStr(pl, 'rmp', 'numloop');

-				setStr(pl, 'rmp', 'scriptcallbacks');

-			break;

-		}

-

-		setStr(pl, null, 'src');

-		setStr(pl, null, 'id');

-		setStr(pl, null, 'name');

-		setStr(pl, null, 'vspace');

-		setStr(pl, null, 'hspace');

-		setStr(pl, null, 'bgcolor');

-		setStr(pl, null, 'align');

-		setStr(pl, null, 'width');

-		setStr(pl, null, 'height');

-

-		if ((val = tinyMCE.getAttrib(fe, "width")) != "")

-			pl.width = f.width.value = val;

-

-		if ((val = tinyMCE.getAttrib(fe, "height")) != "")

-			pl.height = f.height.value = val;

-

-		oldWidth = pl.width ? parseInt(pl.width) : 0;

-		oldHeight = pl.height ? parseInt(pl.height) : 0;

-	} else

-		oldWidth = oldHeight = 0;

-

-	selectByValue(f, 'media_type', type);

-	changedType(type);

-	updateColor('bgcolor_pick', 'bgcolor');

-

-	TinyMCE_EditableSelects.init();

-	generatePreview();

-}

-

-function insertMedia() {

-	var fe, f = document.forms[0], h;

-

-	if (!AutoValidator.validate(f)) {

-		alert(tinyMCE.getLang('lang_invalid_data'));

-		return false;

-	}

-

-	f.width.value = f.width.value == "" ? 100 : f.width.value;

-	f.height.value = f.height.value == "" ? 100 : f.height.value;

-

-	fe = tinyMCE.selectedInstance.getFocusElement();

-	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(tinyMCE.getAttrib(fe, 'class'))) {

-		switch (f.media_type.options[f.media_type.selectedIndex].value) {

-			case "flash":

-				fe.className = "mceItemFlash";

-				break;

-

-			case "shockwave":

-				fe.className = "mceItemShockWave";

-				break;

-

-			case "qt":

-				fe.className = "mceItemQuickTime";

-				break;

-

-			case "wmp":

-				fe.className = "mceItemWindowsMedia";

-				break;

-

-			case "rmp":

-				fe.className = "mceItemRealMedia";

-				break;

-		}

-

-		if (fe.width != f.width.value || fe.height != f.height.height)

-			tinyMCE.selectedInstance.repaint();

-

-		fe.title = serializeParameters();

-		fe.width = f.width.value;

-		fe.height = f.height.value;

-		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');

-		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');

-		fe.align = f.align.options[f.align.selectedIndex].value;

-	} else {

-		h = '<img src="' + tinyMCE.getParam("theme_href") + '/images/spacer.gif"' ;

-

-		switch (f.media_type.options[f.media_type.selectedIndex].value) {

-			case "flash":

-				h += ' class="mceItemFlash"';

-				break;

-

-			case "shockwave":

-				h += ' class="mceItemShockWave"';

-				break;

-

-			case "qt":

-				h += ' class="mceItemQuickTime"';

-				break;

-

-			case "wmp":

-				h += ' class="mceItemWindowsMedia"';

-				break;

-

-			case "rmp":

-				h += ' class="mceItemRealMedia"';

-				break;

-		}

-

-		h += ' title="' + serializeParameters() + '"';

-		h += ' width="' + f.width.value + '"';

-		h += ' height="' + f.height.value + '"';

-		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';

-

-		h += ' />';

-

-		tinyMCE.selectedInstance.execCommand('mceInsertContent', false, h);

-	}

-

-	tinyMCEPopup.close();

-}

-

-function getMediaListHTML() {

-	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {

-		var html = "";

-

-		html += '<select id="linklist" name="linklist" style="width: 250px" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.src.value=this.options[this.selectedIndex].value;">';

-		html += '<option value="">---</option>';

-

-		for (var i=0; i<tinyMCEMediaList.length; i++)

-			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';

-

-		html += '</select>';

-

-		return html;

-	}

-

-	return "";

-}

-

-function getType(v) {

-	var fo, i, c, el, x, f = document.forms[0];

-

-	fo = tinyMCE.getParam("media_types", "flash=swf;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');

-

-	// YouTube

-	if (v.indexOf('http://www.youtube.com/watch?v=') == 0 || v.indexOf('http://youtube.com/watch?v=') == 0) {

-		f.width.value = '425';

-		f.height.value = '350';

-

-		v = v.replace('http://youtube.com/watch?v=', '');

-		v = v.replace('http://www.youtube.com/watch?v=', '');

-

-		f.src.value = 'http://www.youtube.com/v/' + v;

-		return 'flash';

-	}

-

-	// Google video

-	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {

-		f.width.value = '425';

-		f.height.value = '326';

-		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';

-		return 'flash';

-	}

-

-	for (i=0; i<fo.length; i++) {

-		c = fo[i].split('=');

-

-		el = c[1].split(',');

-		for (x=0; x<el.length; x++)

-		if (v.indexOf('.' + el[x]) != -1)

-			return c[0];

-	}

-

-	return null;

-}

-

-function switchType(v) {

-	var t = getType(v), d = document, f = d.forms[0];

-

-	if (!t)

-		return;

-

-	selectByValue(d.forms[0], 'media_type', t);

-	changedType(t);

-

-	// Update qtsrc also

-	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {

-		alert(tinyMCE.getLang("lang_media_qt_stream_warn"));

-

-		if (f.qt_qtsrc.value == '')

-			f.qt_qtsrc.value = f.src.value;

-	}

-}

-

-function changedType(t) {

-	var d = document;

-

-	d.getElementById('flash_options').style.display = 'none';

-	d.getElementById('qt_options').style.display = 'none';

-	d.getElementById('shockwave_options').style.display = 'none';

-	d.getElementById('wmp_options').style.display = 'none';

-	d.getElementById('rmp_options').style.display = 'none';

-	d.getElementById(t + '_options').style.display = 'block';

-}

-

-function serializeParameters() {

-	var d = document, f = d.forms[0], s = '';

-

-	switch (f.media_type.options[f.media_type.selectedIndex].value) {

-		case "flash":

-			s += getBool('flash', 'play', true);

-			s += getBool('flash', 'loop', true);

-			s += getBool('flash', 'menu', true);

-			s += getBool('flash', 'swliveconnect', false);

-			s += getStr('flash', 'quality');

-			s += getStr('flash', 'scale');

-			s += getStr('flash', 'salign');

-			s += getStr('flash', 'wmode');

-			s += getStr('flash', 'base');

-			s += getStr('flash', 'flashvars');

-		break;

-

-		case "qt":

-			s += getBool('qt', 'loop', false);

-			s += getBool('qt', 'autoplay', true);

-			s += getBool('qt', 'cache', false);

-			s += getBool('qt', 'controller', true);

-			s += getBool('qt', 'correction', false, 'none', 'full');

-			s += getBool('qt', 'enablejavascript', false);

-			s += getBool('qt', 'kioskmode', false);

-			s += getBool('qt', 'autohref', false);

-			s += getBool('qt', 'playeveryframe', false);

-			s += getBool('qt', 'targetcache', false);

-			s += getStr('qt', 'scale');

-			s += getStr('qt', 'starttime');

-			s += getStr('qt', 'endtime');

-			s += getStr('qt', 'target');

-			s += getStr('qt', 'qtsrcchokespeed');

-			s += getStr('qt', 'volume');

-			s += getStr('qt', 'qtsrc');

-		break;

-

-		case "shockwave":

-			s += getBool('shockwave', 'sound');

-			s += getBool('shockwave', 'progress');

-			s += getBool('shockwave', 'autostart');

-			s += getBool('shockwave', 'swliveconnect');

-			s += getStr('shockwave', 'swvolume');

-			s += getStr('shockwave', 'swstretchstyle');

-			s += getStr('shockwave', 'swstretchhalign');

-			s += getStr('shockwave', 'swstretchvalign');

-		break;

-

-		case "wmp":

-			s += getBool('wmp', 'autostart', true);

-			s += getBool('wmp', 'enabled', false);

-			s += getBool('wmp', 'enablecontextmenu', true);

-			s += getBool('wmp', 'fullscreen', false);

-			s += getBool('wmp', 'invokeurls', true);

-			s += getBool('wmp', 'mute', false);

-			s += getBool('wmp', 'stretchtofit', false);

-			s += getBool('wmp', 'windowlessvideo', false);

-			s += getStr('wmp', 'balance');

-			s += getStr('wmp', 'baseurl');

-			s += getStr('wmp', 'captioningid');

-			s += getStr('wmp', 'currentmarker');

-			s += getStr('wmp', 'currentposition');

-			s += getStr('wmp', 'defaultframe');

-			s += getStr('wmp', 'playcount');

-			s += getStr('wmp', 'rate');

-			s += getStr('wmp', 'uimode');

-			s += getStr('wmp', 'volume');

-		break;

-

-		case "rmp":

-			s += getBool('rmp', 'autostart', false);

-			s += getBool('rmp', 'loop', false);

-			s += getBool('rmp', 'autogotourl', true);

-			s += getBool('rmp', 'center', false);

-			s += getBool('rmp', 'imagestatus', true);

-			s += getBool('rmp', 'maintainaspect', false);

-			s += getBool('rmp', 'nojava', false);

-			s += getBool('rmp', 'prefetch', false);

-			s += getBool('rmp', 'shuffle', false);

-			s += getStr('rmp', 'console');

-			s += getStr('rmp', 'controls');

-			s += getStr('rmp', 'numloop');

-			s += getStr('rmp', 'scriptcallbacks');

-		break;

-	}

-

-	s += getStr(null, 'id');

-	s += getStr(null, 'name');

-	s += getStr(null, 'src');

-	s += getStr(null, 'align');

-	s += getStr(null, 'bgcolor');

-	s += getInt(null, 'vspace');

-	s += getInt(null, 'hspace');

-	s += getStr(null, 'width');

-	s += getStr(null, 'height');

-

-	s = s.length > 0 ? s.substring(0, s.length - 1) : s;

-

-	return s;

-}

-

-function setBool(pl, p, n) {

-	if (typeof(pl[n]) == "undefined")

-		return;

-

-	document.forms[0].elements[p + "_" + n].checked = pl[n];

-}

-

-function setStr(pl, p, n) {

-	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];

-

-	if (typeof(pl[n]) == "undefined")

-		return;

-

-	if (e.type == "text")

-		e.value = pl[n];

-	else

-		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);

-}

-

-function getBool(p, n, d, tv, fv) {

-	var v = document.forms[0].elements[p + "_" + n].checked;

-

-	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";

-	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";

-

-	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');

-}

-

-function getStr(p, n, d) {

-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];

-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;

-

-	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");

-}

-

-function getInt(p, n, d) {

-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];

-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;

-

-	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");

-}

-

-function jsEncode(s) {

-	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');

-	s = s.replace(new RegExp('"', 'g'), '\\"');

-	s = s.replace(new RegExp("'", 'g'), "\\'");

-

-	return s;

-}

-

-function generatePreview(c) {

-	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;

-

-	p.innerHTML = '<!-- x --->';

-

-	nw = parseInt(f.width.value);

-	nh = parseInt(f.height.value);

-

-	if (f.width.value != "" && f.height.value != "") {

-		if (f.constrain.checked) {

-			if (c == 'width' && oldWidth != 0) {

-				wp = nw / oldWidth;

-				nh = Math.round(wp * nh);

-				f.height.value = nh;

-			} else if (c == 'height' && oldHeight != 0) {

-				hp = nh / oldHeight;

-				nw = Math.round(hp * nw);

-				f.width.value = nw;

-			}

-		}

-	}

-

-	if (f.width.value != "")

-		oldWidth = nw;

-

-	if (f.height.value != "")

-		oldHeight = nh;

-

-	// After constrain

-	pl = serializeParameters();

-

-	switch (f.media_type.options[f.media_type.selectedIndex].value) {

-		case "flash":

-			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';

-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

-			type = 'application/x-shockwave-flash';

-			break;

-

-		case "shockwave":

-			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';

-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';

-			type = 'application/x-director';

-			break;

-

-		case "qt":

-			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';

-			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';

-			type = 'video/quicktime';

-			break;

-

-		case "wmp":

-			cls = tinyMCE.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';

-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

-			type = 'application/x-mplayer2';

-			break;

-

-		case "rmp":

-			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';

-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

-			type = 'audio/x-pn-realaudio-plugin';

-			break;

-	}

-

-	if (pl == '') {

-		p.innerHTML = '';

-		return;

-	}

-

-	pl = eval('x={' + pl + '};');

-

-	if (!pl.src) {

-		p.innerHTML = '';

-		return;

-	}

-

-	pl.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], pl.src);

-	pl.width = !pl.width ? 100 : pl.width;

-	pl.height = !pl.height ? 100 : pl.height;

-	pl.id = !pl.id ? 'obj' : pl.id;

-	pl.name = !pl.name ? 'eobj' : pl.name;

-	pl.align = !pl.align ? '' : pl.align;

-

-	h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';

-

-	for (n in pl) {

-		h += '<param name="' + n + '" value="' + pl[n] + '">';

-

-		// Add extra url parameter if it's an absolute URL

-		if (n == 'src' && pl[n].indexOf('://') != -1)

-			h += '<param name="url" value="' + pl[n] + '" />';

-	}

-

-	h += '<embed type="' + type + '" ';

-

-	for (n in pl)

-		h += n + '="' + pl[n] + '" ';

-

-	h += '></embed></object>';

-

-	p.innerHTML = "<!-- x --->" + h;

-}

+var oldWidth, oldHeight;
+var url = tinyMCE.getParam("media_external_list_url");
+if (url != null) {
+	// Fix relative
+	if (url.charAt(0) != '/' && url.indexOf('://') == -1)
+		url = tinyMCE.documentBasePath + "/" + url;
+
+	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
+}
+
+function init() {
+	var pl = "", f, val;
+	var type = "flash", fe, i;
+
+	tinyMCEPopup.resizeToInnerSize();
+	f = document.forms[0]
+
+	fe = tinyMCE.selectedInstance.getFocusElement();
+	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(tinyMCE.getAttrib(fe, 'class'))) {
+		pl = "x={" + fe.title + "};";
+
+		switch (tinyMCE.getAttrib(fe, 'class')) {
+			case 'mceItemFlash':
+				type = 'flash';
+				break;
+
+			case 'mceItemShockWave':
+				type = 'shockwave';
+				break;
+
+			case 'mceItemWindowsMedia':
+				type = 'wmp';
+				break;
+
+			case 'mceItemQuickTime':
+				type = 'qt';
+				break;
+
+			case 'mceItemRealMedia':
+				type = 'rmp';
+				break;
+		}
+
+		document.forms[0].insert.value = tinyMCE.getLang('lang_update', 'Insert', true); 
+	}
+
+	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var html = getMediaListHTML('filebrowser','src','media','media');
+	if (html == "")
+		document.getElementById("linklistrow").style.display = 'none';
+	else
+		document.getElementById("linklistcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('filebrowsercontainer'))
+		document.getElementById('src').style.width = '230px';
+
+	// Setup form
+	if (pl != "") {
+		pl = eval(pl);
+
+		switch (type) {
+			case "flash":
+				setBool(pl, 'flash', 'play');
+				setBool(pl, 'flash', 'loop');
+				setBool(pl, 'flash', 'menu');
+				setBool(pl, 'flash', 'swliveconnect');
+				setStr(pl, 'flash', 'quality');
+				setStr(pl, 'flash', 'scale');
+				setStr(pl, 'flash', 'salign');
+				setStr(pl, 'flash', 'wmode');
+				setStr(pl, 'flash', 'base');
+				setStr(pl, 'flash', 'flashvars');
+			break;
+
+			case "qt":
+				setBool(pl, 'qt', 'loop');
+				setBool(pl, 'qt', 'autoplay');
+				setBool(pl, 'qt', 'cache');
+				setBool(pl, 'qt', 'controller');
+				setBool(pl, 'qt', 'correction');
+				setBool(pl, 'qt', 'enablejavascript');
+				setBool(pl, 'qt', 'kioskmode');
+				setBool(pl, 'qt', 'autohref');
+				setBool(pl, 'qt', 'playeveryframe');
+				setBool(pl, 'qt', 'tarsetcache');
+				setStr(pl, 'qt', 'scale');
+				setStr(pl, 'qt', 'starttime');
+				setStr(pl, 'qt', 'endtime');
+				setStr(pl, 'qt', 'tarset');
+				setStr(pl, 'qt', 'qtsrcchokespeed');
+				setStr(pl, 'qt', 'volume');
+				setStr(pl, 'qt', 'qtsrc');
+			break;
+
+			case "shockwave":
+				setBool(pl, 'shockwave', 'sound');
+				setBool(pl, 'shockwave', 'progress');
+				setBool(pl, 'shockwave', 'autostart');
+				setBool(pl, 'shockwave', 'swliveconnect');
+				setStr(pl, 'shockwave', 'swvolume');
+				setStr(pl, 'shockwave', 'swstretchstyle');
+				setStr(pl, 'shockwave', 'swstretchhalign');
+				setStr(pl, 'shockwave', 'swstretchvalign');
+			break;
+
+			case "wmp":
+				setBool(pl, 'wmp', 'autostart');
+				setBool(pl, 'wmp', 'enabled');
+				setBool(pl, 'wmp', 'enablecontextmenu');
+				setBool(pl, 'wmp', 'fullscreen');
+				setBool(pl, 'wmp', 'invokeurls');
+				setBool(pl, 'wmp', 'mute');
+				setBool(pl, 'wmp', 'stretchtofit');
+				setBool(pl, 'wmp', 'windowlessvideo');
+				setStr(pl, 'wmp', 'balance');
+				setStr(pl, 'wmp', 'baseurl');
+				setStr(pl, 'wmp', 'captioningid');
+				setStr(pl, 'wmp', 'currentmarker');
+				setStr(pl, 'wmp', 'currentposition');
+				setStr(pl, 'wmp', 'defaultframe');
+				setStr(pl, 'wmp', 'playcount');
+				setStr(pl, 'wmp', 'rate');
+				setStr(pl, 'wmp', 'uimode');
+				setStr(pl, 'wmp', 'volume');
+			break;
+
+			case "rmp":
+				setBool(pl, 'rmp', 'autostart');
+				setBool(pl, 'rmp', 'loop');
+				setBool(pl, 'rmp', 'autogotourl');
+				setBool(pl, 'rmp', 'center');
+				setBool(pl, 'rmp', 'imagestatus');
+				setBool(pl, 'rmp', 'maintainaspect');
+				setBool(pl, 'rmp', 'nojava');
+				setBool(pl, 'rmp', 'prefetch');
+				setBool(pl, 'rmp', 'shuffle');
+				setStr(pl, 'rmp', 'console');
+				setStr(pl, 'rmp', 'controls');
+				setStr(pl, 'rmp', 'numloop');
+				setStr(pl, 'rmp', 'scriptcallbacks');
+			break;
+		}
+
+		setStr(pl, null, 'src');
+		setStr(pl, null, 'id');
+		setStr(pl, null, 'name');
+		setStr(pl, null, 'vspace');
+		setStr(pl, null, 'hspace');
+		setStr(pl, null, 'bgcolor');
+		setStr(pl, null, 'align');
+		setStr(pl, null, 'width');
+		setStr(pl, null, 'height');
+
+		if ((val = tinyMCE.getAttrib(fe, "width")) != "")
+			pl.width = f.width.value = val;
+
+		if ((val = tinyMCE.getAttrib(fe, "height")) != "")
+			pl.height = f.height.value = val;
+
+		oldWidth = pl.width ? parseInt(pl.width) : 0;
+		oldHeight = pl.height ? parseInt(pl.height) : 0;
+	} else
+		oldWidth = oldHeight = 0;
+
+	selectByValue(f, 'media_type', type);
+	changedType(type);
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	TinyMCE_EditableSelects.init();
+	generatePreview();
+}
+
+function insertMedia() {
+	var fe, f = document.forms[0], h;
+
+	if (!AutoValidator.validate(f)) {
+		alert(tinyMCE.getLang('lang_invalid_data'));
+		return false;
+	}
+
+	f.width.value = f.width.value == "" ? 100 : f.width.value;
+	f.height.value = f.height.value == "" ? 100 : f.height.value;
+
+	fe = tinyMCE.selectedInstance.getFocusElement();
+	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(tinyMCE.getAttrib(fe, 'class'))) {
+		switch (f.media_type.options[f.media_type.selectedIndex].value) {
+			case "flash":
+				fe.className = "mceItemFlash";
+				break;
+
+			case "shockwave":
+				fe.className = "mceItemShockWave";
+				break;
+
+			case "qt":
+				fe.className = "mceItemQuickTime";
+				break;
+
+			case "wmp":
+				fe.className = "mceItemWindowsMedia";
+				break;
+
+			case "rmp":
+				fe.className = "mceItemRealMedia";
+				break;
+		}
+
+		if (fe.width != f.width.value || fe.height != f.height.height)
+			tinyMCE.selectedInstance.repaint();
+
+		fe.title = serializeParameters();
+		fe.width = f.width.value;
+		fe.height = f.height.value;
+		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
+		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
+		fe.align = f.align.options[f.align.selectedIndex].value;
+	} else {
+		h = '<img src="' + tinyMCE.getParam("theme_href") + '/images/spacer.gif"' ;
+
+		switch (f.media_type.options[f.media_type.selectedIndex].value) {
+			case "flash":
+				h += ' class="mceItemFlash"';
+				break;
+
+			case "shockwave":
+				h += ' class="mceItemShockWave"';
+				break;
+
+			case "qt":
+				h += ' class="mceItemQuickTime"';
+				break;
+
+			case "wmp":
+				h += ' class="mceItemWindowsMedia"';
+				break;
+
+			case "rmp":
+				h += ' class="mceItemRealMedia"';
+				break;
+		}
+
+		h += ' title="' + serializeParameters() + '"';
+		h += ' width="' + f.width.value + '"';
+		h += ' height="' + f.height.value + '"';
+		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
+
+		h += ' />';
+
+		tinyMCE.selectedInstance.execCommand('mceInsertContent', false, h);
+	}
+
+	tinyMCEPopup.close();
+}
+
+function getMediaListHTML() {
+	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+		var html = "";
+
+		html += '<select id="linklist" name="linklist" style="width: 250px" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.src.value=this.options[this.selectedIndex].value;">';
+		html += '<option value="">---</option>';
+
+		for (var i=0; i<tinyMCEMediaList.length; i++)
+			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+		html += '</select>';
+
+		return html;
+	}
+
+	return "";
+}
+
+function getType(v) {
+	var fo, i, c, el, x, f = document.forms[0];
+
+	fo = tinyMCE.getParam("media_types", "flash=swf;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
+
+	// YouTube
+	if (v.indexOf('http://www.youtube.com/watch?v=') == 0 || v.indexOf('http://youtube.com/watch?v=') == 0) {
+		f.width.value = '425';
+		f.height.value = '350';
+
+		v = v.replace('http://youtube.com/watch?v=', '');
+		v = v.replace('http://www.youtube.com/watch?v=', '');
+
+		f.src.value = 'http://www.youtube.com/v/' + v;
+		return 'flash';
+	}
+
+	// Google video
+	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
+		f.width.value = '425';
+		f.height.value = '326';
+		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
+		return 'flash';
+	}
+
+	for (i=0; i<fo.length; i++) {
+		c = fo[i].split('=');
+
+		el = c[1].split(',');
+		for (x=0; x<el.length; x++)
+		if (v.indexOf('.' + el[x]) != -1)
+			return c[0];
+	}
+
+	return null;
+}
+
+function switchType(v) {
+	var t = getType(v), d = document, f = d.forms[0];
+
+	if (!t)
+		return;
+
+	selectByValue(d.forms[0], 'media_type', t);
+	changedType(t);
+
+	// Update qtsrc also
+	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
+		alert(tinyMCE.getLang("lang_media_qt_stream_warn"));
+
+		if (f.qt_qtsrc.value == '')
+			f.qt_qtsrc.value = f.src.value;
+	}
+}
+
+function changedType(t) {
+	var d = document;
+
+	d.getElementById('flash_options').style.display = 'none';
+	d.getElementById('qt_options').style.display = 'none';
+	d.getElementById('shockwave_options').style.display = 'none';
+	d.getElementById('wmp_options').style.display = 'none';
+	d.getElementById('rmp_options').style.display = 'none';
+	d.getElementById(t + '_options').style.display = 'block';
+}
+
+function serializeParameters() {
+	var d = document, f = d.forms[0], s = '';
+
+	switch (f.media_type.options[f.media_type.selectedIndex].value) {
+		case "flash":
+			s += getBool('flash', 'play', true);
+			s += getBool('flash', 'loop', true);
+			s += getBool('flash', 'menu', true);
+			s += getBool('flash', 'swliveconnect', false);
+			s += getStr('flash', 'quality');
+			s += getStr('flash', 'scale');
+			s += getStr('flash', 'salign');
+			s += getStr('flash', 'wmode');
+			s += getStr('flash', 'base');
+			s += getStr('flash', 'flashvars');
+		break;
+
+		case "qt":
+			s += getBool('qt', 'loop', false);
+			s += getBool('qt', 'autoplay', true);
+			s += getBool('qt', 'cache', false);
+			s += getBool('qt', 'controller', true);
+			s += getBool('qt', 'correction', false, 'none', 'full');
+			s += getBool('qt', 'enablejavascript', false);
+			s += getBool('qt', 'kioskmode', false);
+			s += getBool('qt', 'autohref', false);
+			s += getBool('qt', 'playeveryframe', false);
+			s += getBool('qt', 'targetcache', false);
+			s += getStr('qt', 'scale');
+			s += getStr('qt', 'starttime');
+			s += getStr('qt', 'endtime');
+			s += getStr('qt', 'target');
+			s += getStr('qt', 'qtsrcchokespeed');
+			s += getStr('qt', 'volume');
+			s += getStr('qt', 'qtsrc');
+		break;
+
+		case "shockwave":
+			s += getBool('shockwave', 'sound');
+			s += getBool('shockwave', 'progress');
+			s += getBool('shockwave', 'autostart');
+			s += getBool('shockwave', 'swliveconnect');
+			s += getStr('shockwave', 'swvolume');
+			s += getStr('shockwave', 'swstretchstyle');
+			s += getStr('shockwave', 'swstretchhalign');
+			s += getStr('shockwave', 'swstretchvalign');
+		break;
+
+		case "wmp":
+			s += getBool('wmp', 'autostart', true);
+			s += getBool('wmp', 'enabled', false);
+			s += getBool('wmp', 'enablecontextmenu', true);
+			s += getBool('wmp', 'fullscreen', false);
+			s += getBool('wmp', 'invokeurls', true);
+			s += getBool('wmp', 'mute', false);
+			s += getBool('wmp', 'stretchtofit', false);
+			s += getBool('wmp', 'windowlessvideo', false);
+			s += getStr('wmp', 'balance');
+			s += getStr('wmp', 'baseurl');
+			s += getStr('wmp', 'captioningid');
+			s += getStr('wmp', 'currentmarker');
+			s += getStr('wmp', 'currentposition');
+			s += getStr('wmp', 'defaultframe');
+			s += getStr('wmp', 'playcount');
+			s += getStr('wmp', 'rate');
+			s += getStr('wmp', 'uimode');
+			s += getStr('wmp', 'volume');
+		break;
+
+		case "rmp":
+			s += getBool('rmp', 'autostart', false);
+			s += getBool('rmp', 'loop', false);
+			s += getBool('rmp', 'autogotourl', true);
+			s += getBool('rmp', 'center', false);
+			s += getBool('rmp', 'imagestatus', true);
+			s += getBool('rmp', 'maintainaspect', false);
+			s += getBool('rmp', 'nojava', false);
+			s += getBool('rmp', 'prefetch', false);
+			s += getBool('rmp', 'shuffle', false);
+			s += getStr('rmp', 'console');
+			s += getStr('rmp', 'controls');
+			s += getStr('rmp', 'numloop');
+			s += getStr('rmp', 'scriptcallbacks');
+		break;
+	}
+
+	s += getStr(null, 'id');
+	s += getStr(null, 'name');
+	s += getStr(null, 'src');
+	s += getStr(null, 'align');
+	s += getStr(null, 'bgcolor');
+	s += getInt(null, 'vspace');
+	s += getInt(null, 'hspace');
+	s += getStr(null, 'width');
+	s += getStr(null, 'height');
+
+	s = s.length > 0 ? s.substring(0, s.length - 1) : s;
+
+	return s;
+}
+
+function setBool(pl, p, n) {
+	if (typeof(pl[n]) == "undefined")
+		return;
+
+	document.forms[0].elements[p + "_" + n].checked = pl[n];
+}
+
+function setStr(pl, p, n) {
+	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
+
+	if (typeof(pl[n]) == "undefined")
+		return;
+
+	if (e.type == "text")
+		e.value = pl[n];
+	else
+		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
+}
+
+function getBool(p, n, d, tv, fv) {
+	var v = document.forms[0].elements[p + "_" + n].checked;
+
+	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
+	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
+
+	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');
+}
+
+function getStr(p, n, d) {
+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
+
+	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
+}
+
+function getInt(p, n, d) {
+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
+
+	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");
+}
+
+function jsEncode(s) {
+	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
+	s = s.replace(new RegExp('"', 'g'), '\\"');
+	s = s.replace(new RegExp("'", 'g'), "\\'");
+
+	return s;
+}
+
+function generatePreview(c) {
+	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
+
+	p.innerHTML = '<!-- x --->';
+
+	nw = parseInt(f.width.value);
+	nh = parseInt(f.height.value);
+
+	if (f.width.value != "" && f.height.value != "") {
+		if (f.constrain.checked) {
+			if (c == 'width' && oldWidth != 0) {
+				wp = nw / oldWidth;
+				nh = Math.round(wp * nh);
+				f.height.value = nh;
+			} else if (c == 'height' && oldHeight != 0) {
+				hp = nh / oldHeight;
+				nw = Math.round(hp * nw);
+				f.width.value = nw;
+			}
+		}
+	}
+
+	if (f.width.value != "")
+		oldWidth = nw;
+
+	if (f.height.value != "")
+		oldHeight = nh;
+
+	// After constrain
+	pl = serializeParameters();
+
+	switch (f.media_type.options[f.media_type.selectedIndex].value) {
+		case "flash":
+			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+			type = 'application/x-shockwave-flash';
+			break;
+
+		case "shockwave":
+			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+			type = 'application/x-director';
+			break;
+
+		case "qt":
+			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
+			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+			type = 'video/quicktime';
+			break;
+
+		case "wmp":
+			cls = tinyMCE.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+			type = 'application/x-mplayer2';
+			break;
+
+		case "rmp":
+			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+			type = 'audio/x-pn-realaudio-plugin';
+			break;
+	}
+
+	if (pl == '') {
+		p.innerHTML = '';
+		return;
+	}
+
+	pl = eval('x={' + pl + '};');
+
+	if (!pl.src) {
+		p.innerHTML = '';
+		return;
+	}
+
+	pl.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], pl.src);
+	pl.width = !pl.width ? 100 : pl.width;
+	pl.height = !pl.height ? 100 : pl.height;
+	pl.id = !pl.id ? 'obj' : pl.id;
+	pl.name = !pl.name ? 'eobj' : pl.name;
+	pl.align = !pl.align ? '' : pl.align;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+
+	for (n in pl) {
+		h += '<param name="' + n + '" value="' + pl[n] + '">';
+
+		// Add extra url parameter if it's an absolute URL
+		if (n == 'src' && pl[n].indexOf('://') != -1)
+			h += '<param name="url" value="' + pl[n] + '" />';
+	}
+
+	h += '<embed type="' + type + '" ';
+
+	for (n in pl)
+		h += n + '="' + pl[n] + '" ';
+
+	h += '></embed></object>';
+
+	p.innerHTML = "<!-- x --->" + h;
+}
diff --git a/program/js/tiny_mce/plugins/media/langs/en.js b/program/js/tiny_mce/plugins/media/langs/en.js
index ced196725..177438d7c 100644
--- a/program/js/tiny_mce/plugins/media/langs/en.js
+++ b/program/js/tiny_mce/plugins/media/langs/en.js
@@ -1,94 +1,94 @@
-// UK lang variables

-

-tinyMCE.addToLang('media',{

-title : 'Insert / edit embedded media',

-desc : 'Insert / edit embedded media',

-general : 'General',

-advanced : 'Advanced',

-file : 'File/URL',

-list : 'List',

-size : 'Dimensions',

-preview : 'Preview',

-constrain_proportions : 'Constrain proportions',

-type : 'Type',

-id : 'Id',

-name : 'Name',

-class_name : 'Class',

-vspace : 'V-Space',

-hspace : 'H-Space',

-play : 'Auto play',

-loop : 'Loop',

-menu : 'Show menu',

-quality : 'Quality',

-scale : 'Scale',

-align : 'Align',

-salign : 'SAlign',

-wmode : 'WMode',

-bgcolor : 'Background',

-base : 'Base',

-flashvars : 'Flashvars',

-liveconnect : 'SWLiveConnect',

-autohref : 'AutoHREF',

-cache : 'Cache',

-hidden : 'Hidden',

-controller : 'Controller',

-kioskmode : 'Kiosk mode',

-playeveryframe : 'Play every frame',

-targetcache : 'Target cache',

-correction : 'No correction',

-enablejavascript : 'Enable JavaScript',

-starttime : 'Start time',

-endtime : 'End time',

-href : 'Href',

-qtsrcchokespeed : 'Choke speed',

-target : 'Target',

-volume : 'Volume',

-autostart : 'Auto start',

-enabled : 'Enabled',

-fullscreen : 'Fullscreen',

-invokeurls : 'Invoke URLs',

-mute : 'Mute',

-stretchtofit : 'Stretch to fit',

-windowlessvideo : 'Windowless video',

-balance : 'Balance',

-baseurl : 'Base URL',

-captioningid : 'Captioning id',

-currentmarker : 'Current marker',

-currentposition : 'Current position',

-defaultframe : 'Default frame',

-playcount : 'Play count',

-rate : 'Rate',

-uimode : 'UI Mode',

-flash_options : 'Flash options',

-qt_options : 'Quicktime options',

-wmp_options : 'Windows media player options',

-rmp_options : 'Real media player options',

-shockwave_options : 'Shockwave options',

-autogotourl : 'Auto goto URL',

-center : 'Center',

-imagestatus : 'Image status',

-maintainaspect : 'Maintain aspect',

-nojava : 'No java',

-prefetch : 'Prefetch',

-shuffle : 'Shuffle',

-console : 'Console',

-numloop : 'Num loops',

-controls : 'Controls',

-scriptcallbacks : 'Script callbacks',

-swstretchstyle : 'Stretch style',

-swstretchhalign : 'Stretch H-Align',

-swstretchvalign : 'Stretch V-Align',

-sound : 'Sound',

-progress : 'Progress',

-qtsrc : 'QT Src',

-qt_stream_warn : 'Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..',

-align_top : 'Top',

-align_right : 'Right',

-align_bottom : 'Bottom',

-align_left : 'Left',

-align_center : 'Center',

-align_top_left : 'Top left',

-align_top_right : 'Top right',

-align_bottom_left : 'Bottom left',

-align_bottom_right : 'Bottom right'

+// UK lang variables
+
+tinyMCE.addToLang('media',{
+title : 'Insert / edit embedded media',
+desc : 'Insert / edit embedded media',
+general : 'General',
+advanced : 'Advanced',
+file : 'File/URL',
+list : 'List',
+size : 'Dimensions',
+preview : 'Preview',
+constrain_proportions : 'Constrain proportions',
+type : 'Type',
+id : 'Id',
+name : 'Name',
+class_name : 'Class',
+vspace : 'V-Space',
+hspace : 'H-Space',
+play : 'Auto play',
+loop : 'Loop',
+menu : 'Show menu',
+quality : 'Quality',
+scale : 'Scale',
+align : 'Align',
+salign : 'SAlign',
+wmode : 'WMode',
+bgcolor : 'Background',
+base : 'Base',
+flashvars : 'Flashvars',
+liveconnect : 'SWLiveConnect',
+autohref : 'AutoHREF',
+cache : 'Cache',
+hidden : 'Hidden',
+controller : 'Controller',
+kioskmode : 'Kiosk mode',
+playeveryframe : 'Play every frame',
+targetcache : 'Target cache',
+correction : 'No correction',
+enablejavascript : 'Enable JavaScript',
+starttime : 'Start time',
+endtime : 'End time',
+href : 'Href',
+qtsrcchokespeed : 'Choke speed',
+target : 'Target',
+volume : 'Volume',
+autostart : 'Auto start',
+enabled : 'Enabled',
+fullscreen : 'Fullscreen',
+invokeurls : 'Invoke URLs',
+mute : 'Mute',
+stretchtofit : 'Stretch to fit',
+windowlessvideo : 'Windowless video',
+balance : 'Balance',
+baseurl : 'Base URL',
+captioningid : 'Captioning id',
+currentmarker : 'Current marker',
+currentposition : 'Current position',
+defaultframe : 'Default frame',
+playcount : 'Play count',
+rate : 'Rate',
+uimode : 'UI Mode',
+flash_options : 'Flash options',
+qt_options : 'Quicktime options',
+wmp_options : 'Windows media player options',
+rmp_options : 'Real media player options',
+shockwave_options : 'Shockwave options',
+autogotourl : 'Auto goto URL',
+center : 'Center',
+imagestatus : 'Image status',
+maintainaspect : 'Maintain aspect',
+nojava : 'No java',
+prefetch : 'Prefetch',
+shuffle : 'Shuffle',
+console : 'Console',
+numloop : 'Num loops',
+controls : 'Controls',
+scriptcallbacks : 'Script callbacks',
+swstretchstyle : 'Stretch style',
+swstretchhalign : 'Stretch H-Align',
+swstretchvalign : 'Stretch V-Align',
+sound : 'Sound',
+progress : 'Progress',
+qtsrc : 'QT Src',
+qt_stream_warn : 'Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..',
+align_top : 'Top',
+align_right : 'Right',
+align_bottom : 'Bottom',
+align_left : 'Left',
+align_center : 'Center',
+align_top_left : 'Top left',
+align_top_right : 'Top right',
+align_bottom_left : 'Bottom left',
+align_bottom_right : 'Bottom right'
 });
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/readme.txt b/program/js/tiny_mce/plugins/readme.txt
index b694fdb6b..9192b26a5 100644
--- a/program/js/tiny_mce/plugins/readme.txt
+++ b/program/js/tiny_mce/plugins/readme.txt
@@ -1 +1 @@
-This is the location you place TinyMCE plugins.

+This is the location you place TinyMCE plugins.
diff --git a/program/js/tiny_mce/plugins/table/css/cell.css b/program/js/tiny_mce/plugins/table/css/cell.css
index a067ecdfe..a47cc1a1e 100644
--- a/program/js/tiny_mce/plugins/table/css/cell.css
+++ b/program/js/tiny_mce/plugins/table/css/cell.css
@@ -1,17 +1,17 @@
-/* CSS file for cell dialog in the table plugin */

-

-.panel_wrapper div.current {

-	height: 200px;

-}

-

-.advfield {

-	width: 200px;

-}

-

-#action {

-	margin-bottom: 3px;

-}

-

-#class {

-	width: 150px;

+/* CSS file for cell dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#class {
+	width: 150px;
 }
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/table/css/row.css b/program/js/tiny_mce/plugins/table/css/row.css
index 1f7755daf..0e397db3e 100644
--- a/program/js/tiny_mce/plugins/table/css/row.css
+++ b/program/js/tiny_mce/plugins/table/css/row.css
@@ -1,25 +1,25 @@
-/* CSS file for row dialog in the table plugin */

-

-.panel_wrapper div.current {

-	height: 200px;

-}

-

-.advfield {

-	width: 200px;

-}

-

-#action {

-	margin-bottom: 3px;

-}

-

-#rowtype,#align,#valign,#class,#height {

-	width: 150px;

-}

-

-#height {

-	width: 50px;	

-}

-

-.col2 {

-	padding-left: 20px;

-}

+/* CSS file for row dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#rowtype,#align,#valign,#class,#height {
+	width: 150px;
+}
+
+#height {
+	width: 50px;	
+}
+
+.col2 {
+	padding-left: 20px;
+}
diff --git a/program/js/tiny_mce/plugins/table/css/table.css b/program/js/tiny_mce/plugins/table/css/table.css
index 804f766ee..82bb548ca 100644
--- a/program/js/tiny_mce/plugins/table/css/table.css
+++ b/program/js/tiny_mce/plugins/table/css/table.css
@@ -1,13 +1,13 @@
-/* CSS file for table dialog in the table plugin */

-

-.panel_wrapper div.current {

-	height: 220px;

-}

-

-.advfield {

-	width: 200px;

-}

-

-#class {

-	width: 150px;

-}

+/* CSS file for table dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 220px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#class {
+	width: 150px;
+}