--- a/includes/clientside/tinymce/plugins/media/editor_plugin_src.js	Thu Jan 31 22:29:07 2008 -0500
+++ b/includes/clientside/tinymce/plugins/media/editor_plugin_src.js	Sat Feb 02 11:54:16 2008 -0500
@@ -1,8 +1,8 @@
 /**
- * $Id: editor_plugin_src.js 490 2007-12-11 21:45:33Z spocke $
+ * $Id: editor_plugin_src.js 561 2008-01-23 15:18:19Z spocke $
  *
  * @author Moxiecode
- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
  */
 
 (function() {
@@ -23,8 +23,8 @@
 			ed.addCommand('mceMedia', function() {
 				ed.windowManager.open({
 					file : url + '/media.htm',
-					width : 430 + ed.getLang('media.delta_width', 0),
-					height : 470 + ed.getLang('media.delta_height', 0),
+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
+					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
@@ -81,24 +81,24 @@
 					return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
 				});
 
-				h = h.replace(/<object([^>]*)>/gi, '<div class="mceItemObject" $1>');
-				h = h.replace(/<embed([^>]*)>/gi, '<div class="mceItemEmbed" $1>');
-				h = h.replace(/<\/(object|embed)([^>]*)>/gi, '</div>');
-				h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<div ' + b.replace(/value=/g, '_value=') + ' class="mceItemParam"></div>'});
-				h = h.replace(/\/ class=\"mceItemParam\"><\/div>/gi, 'class="mceItemParam"></div>');
+				h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
+				h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
+				h = h.replace(/<\/(object|embed)([^>]*)>/gi, '</span>');
+				h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/g, '_value=') + ' class="mceItemParam"></span>'});
+				h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
 
 				o.content = h;
 			});
 
 			ed.onSetContent.add(function() {
-				t._divsToImgs(ed.getBody());
+				t._spansToImgs(ed.getBody());
 			});
 
 			ed.onPreProcess.add(function(ed, o) {
 				var dom = ed.dom;
 
 				if (o.set) {
-					t._divsToImgs(o.node);
+					t._spansToImgs(o.node);
 
 					each(dom.select('IMG', o.node), function(n) {
 						var p;
@@ -211,7 +211,7 @@
 			p.width = o.width = dom.getAttrib(n, 'width') || 100;
 			p.height = o.height = dom.getAttrib(n, 'height') || 100;
 
-			ob = dom.create('div', {
+			ob = dom.create('span', {
 				mce_name : 'object',
 				classid : "clsid:" + o.classid,
 				codebase : o.codebase,
@@ -224,18 +224,18 @@
 
 			each (p, function(v, k) {
 				if (v && !/^(width|height|codebase|classid)$/.test(k))
-					dom.add(ob, 'div', {mce_name : 'param', name : k, '_value' : v});
+					dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v});
 			});
 
-			dom.add(ob, 'div', tinymce.extend({mce_name : 'embed', type : o.type}, p));
+			dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p));
 
 			return ob;
 		},
 
-		_divsToImgs : function(p) {
+		_spansToImgs : function(p) {
 			var t = this, dom = t.editor.dom, im, ci;
 
-			each(dom.select('div', p), function(n) {
+			each(dom.select('span', p), function(n) {
 				// Convert object into image
 				if (dom.getAttrib(n, 'class') == 'mceItemObject') {
 					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
@@ -290,7 +290,7 @@
 			});
 
 			// Add optional parameters
-			each(dom.select('div', n), function(n) {
+			each(dom.select('span', n), function(n) {
 				if (dom.hasClass(n, 'mceItemParam'))
 					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value');
 			});