- Updated TinyMCE to 3.2.3 version

4 files changed, 96 insertions, 56 deletions

diff --git a/program/js/tiny_mce/plugins/media/editor_plugin.js b/program/js/tiny_mce/plugins/media/editor_plugin.js
index 9c2c4bbf9..951d1e43a 100644
--- a/program/js/tiny_mce/plugins/media/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var each=tinymce.each;tinymce.create('tinymce.plugins.MediaPlugin',{init:function(ed,url){var t=this;t.editor=ed;t.url=url;function isMediaElm(n){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);};ed.onPreInit.add(function(){ed.serializer.addRules('param[name|value|_value]');});ed.addCommand('mceMedia',function(){ed.windowManager.open({file:url+'/media.htm',width:430+parseInt(ed.getLang('media.delta_width',0)),height:470+parseInt(ed.getLang('media.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('media',{title:'media.desc',cmd:'mceMedia'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('media',n.nodeName=='IMG'&&isMediaElm(n));});ed.onInit.add(function(){var lo={mceItemFlash:'flash',mceItemShockWave:'shockwave',mceItemWindowsMedia:'windowsmedia',mceItemQuickTime:'quicktime',mceItemRealMedia:'realmedia'};if(ed.settings.content_css!==false)ed.dom.loadCSS(url+"/css/content.css");if(ed.theme.onResolveName){ed.theme.onResolveName.add(function(th,o){if(o.name=='img'){each(lo,function(v,k){if(ed.dom.hasClass(o.node,k)){o.name=v;o.title=ed.dom.getAttrib(o.node,'title');return false;}});}});}if(ed&&ed.plugins.contextmenu){ed.plugins.contextmenu.onContextMenu.add(function(th,m,e){if(e.nodeName=='IMG'&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)){m.add({title:'media.edit',icon:'media',cmd:'mceMedia'});}});}});ed.onBeforeSetContent.add(function(ed,o){var h=o.content;h=h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(a,b,c){var o=t._parse(c);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,'<span class="mceItemObject" $1>');h=h.replace(/<embed([^>]*)\/>/gi,'<span class="mceItemEmbed" $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=/gi,'_value=')+' class="mceItemParam"></span>'});h=h.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');o.content=h;});ed.onSetContent.add(function(){t._spansToImgs(ed.getBody());});ed.onPreProcess.add(function(ed,o){var dom=ed.dom;if(o.set){t._spansToImgs(o.node);each(dom.select('IMG',o.node),function(n){var p;if(isMediaElm(n)){p=t._parse(n.title);dom.setAttrib(n,'width',dom.getAttrib(n,'width',p.width||100));dom.setAttrib(n,'height',dom.getAttrib(n,'height',p.height||100));}});}if(o.get){each(dom.select('IMG',o.node),function(n){var ci,cb,mt;if(ed.getParam('media_use_script')){if(isMediaElm(n))n.className=n.className.replace(/mceItem/g,'mceTemp');return;}switch(n.className){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=ed.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;}if(ci){dom.replace(t._buildObj({classid:ci,codebase:cb,type:mt},n),n);}});}});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/_value=/g,'value=');});if(ed.getParam('media_use_script')){function getAttr(s,n){n=new RegExp(n+'=\"([^\"]+)\"','g').exec(s);return n?ed.dom.decode(n[1]):'';};ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/<img[^>]+>/g,function(im){var cl=getAttr(im,'class');if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)){at=t._parse(getAttr(im,'title'));at.width=getAttr(im,'width');at.height=getAttr(im,'height');im='<script type="text/javascript">write'+cl.substring(7)+'({'+t._serialize(at)+'});</script>';}return im;});});}},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};},_buildObj:function(o,n){var ob,ed=this.editor,dom=ed.dom,p=this._parse(n.title);p.width=o.width=dom.getAttrib(n,'width')||100;p.height=o.height=dom.getAttrib(n,'height')||100;ob=dom.create('span',{mce_name:'object',classid:"clsid:"+o.classid,codebase:o.codebase,width:o.width,height:o.height});if(p.src)p.src=ed.convertURL(p.src,'src',n);each(p,function(v,k){if(!/^(width|height|codebase|classid)$/.test(k)){if(o.type=='application/x-mplayer2'&&k=='src')k='url';dom.add(ob,'span',{mce_name:'param',name:k,'_value':v});}});dom.add(ob,'span',tinymce.extend({mce_name:'embed',type:o.type},p));return ob;},_spansToImgs:function(p){var t=this,dom=t.editor.dom,im,ci;each(dom.select('span',p),function(n){if(dom.getAttrib(n,'class')=='mceItemObject'){ci=dom.getAttrib(n,"classid").toLowerCase().replace(/\s+/g,'');switch(ci){case'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':dom.replace(t._createImg('mceItemFlash',n),n);break;case'clsid:166b1bca-3f9c-11cf-8075-444553540000':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':case'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':case'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}return;}if(dom.getAttrib(n,'class')=='mceItemEmbed'){switch(dom.getAttrib(n,'type')){case'application/x-shockwave-flash':dom.replace(t._createImg('mceItemFlash',n),n);break;case'application/x-director':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'application/x-mplayer2':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'video/quicktime':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'audio/x-pn-realaudio-plugin':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}}});},_createImg:function(cl,n){var im,dom=this.editor.dom,pa={},ti='';im=dom.create('img',{src:this.url+'/img/trans.gif',width:dom.getAttrib(n,'width')||100,height:dom.getAttrib(n,'height')||100,'class':cl});each(['id','name','width','height','bgcolor','align','flashvars','src','wmode'],function(na){var v=dom.getAttrib(n,na);if(v)pa[na]=v;});each(dom.select('span',n),function(n){if(dom.hasClass(n,'mceItemParam'))pa[dom.getAttrib(n,'name')]=dom.getAttrib(n,'_value');});if(pa.movie){pa.src=pa.movie;delete pa.movie;}delete pa.width;delete pa.height;im.title=this._serialize(pa);return im;},_parse:function(s){return tinymce.util.JSON.parse('{'+s+'}');},_serialize:function(o){return tinymce.util.JSON.serialize(o).replace(/[{}]/g,'');}});tinymce.PluginManager.add('media',tinymce.plugins.MediaPlugin);})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/<img[^>]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j='<script type="text/javascript">write'+i.substring(7)+"({"+e._serialize(at)+"});<\/script>"}return j})}})},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}},_objectsToSpans:function(b,e){var c=this,d=e.content;d=d.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(g,f,i){var h=c._parse(i);return'<img class="mceItem'+f+'" title="'+b.dom.encode(i)+'" src="'+c.url+'/img/trans.gif" width="'+h.width+'" height="'+h.height+'" />'});d=d.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');d=d.replace(/<embed([^>]*)\/?>/gi,'<span class="mceItemEmbed" $1></span>');d=d.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');d=d.replace(/<\/(object)([^>]*)>/gi,"</span>");d=d.replace(/<\/embed>/gi,"");d=d.replace(/<param([^>]*)>/gi,function(g,f){return"<span "+f.replace(/value=/gi,"_mce_value=")+' class="mceItemParam"></span>'});d=d.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');e.content=d},_buildObj:function(g,h){var d,c=this.editor,f=c.dom,e=this._parse(h.title),b;b=c.getParam("media_strict",true)&&g.type=="application/x-shockwave-flash";e.width=g.width=f.getAttrib(h,"width")||100;e.height=g.height=f.getAttrib(h,"height")||100;if(e.src){e.src=c.convertURL(e.src,"src",h)}if(b){d=f.create("span",{id:e.id,mce_name:"object",type:"application/x-shockwave-flash",data:e.src,style:f.getAttrib(h,"style"),width:g.width,height:g.height})}else{d=f.create("span",{id:e.id,mce_name:"object",classid:"clsid:"+g.classid,style:f.getAttrib(h,"style"),codebase:g.codebase,width:g.width,height:g.height})}a(e,function(j,i){if(!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(i)){if(g.type=="application/x-mplayer2"&&i=="src"&&!e.url){i="url"}if(j){f.add(d,"span",{mce_name:"param",name:i,_mce_value:j})}}});if(!b){f.add(d,"span",tinymce.extend({mce_name:"embed",type:g.type,style:f.getAttrib(h,"style")},e))}return d},_spansToImgs:function(e){var d=this,f=d.editor.dom,b,c;a(f.select("span",e),function(g){if(f.getAttrib(g,"class")=="mceItemObject"){c=f.getAttrib(g,"classid").toLowerCase().replace(/\s+/g,"");switch(c){case"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000":f.replace(d._createImg("mceItemFlash",g),g);break;case"clsid:166b1bca-3f9c-11cf-8075-444553540000":f.replace(d._createImg("mceItemShockWave",g),g);break;case"clsid:6bf52a52-394a-11d3-b153-00c04f79faa6":case"clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95":case"clsid:05589fa1-c356-11ce-bf01-00aa0055595a":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}return}if(f.getAttrib(g,"class")=="mceItemEmbed"){switch(f.getAttrib(g,"type")){case"application/x-shockwave-flash":f.replace(d._createImg("mceItemFlash",g),g);break;case"application/x-director":f.replace(d._createImg("mceItemShockWave",g),g);break;case"application/x-mplayer2":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"video/quicktime":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"audio/x-pn-realaudio-plugin":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}}})},_createImg:function(c,h){var b,g=this.editor.dom,f={},e="",d;d=["id","name","width","height","bgcolor","align","flashvars","src","wmode","allowfullscreen","quality"];b=g.create("img",{src:this.url+"/img/trans.gif",width:g.getAttrib(h,"width")||100,height:g.getAttrib(h,"height")||100,style:g.getAttrib(h,"style"),"class":c});a(d,function(i){var j=g.getAttrib(h,i);if(j){f[i]=j}});a(g.select("span",h),function(i){if(g.hasClass(i,"mceItemParam")){f[g.getAttrib(i,"name")]=g.getAttrib(i,"_mce_value")}});if(f.movie){f.src=f.movie;delete f.movie}h=g.select(".mceItemEmbed",h)[0];if(h){a(d,function(i){var j=g.getAttrib(h,i);if(j&&!f[i]){f[i]=j}})}delete f.width;delete f.height;b.title=this._serialize(f);return b},_parse:function(b){return tinymce.util.JSON.parse("{"+b+"}")},_serialize:function(b){return tinymce.util.JSON.serialize(b).replace(/[{}]/g,"")}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
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 ebedd1273..faa0cf730 100644
--- a/program/js/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/media/editor_plugin_src.js
@@ -1,5 +1,5 @@
 /**

- * $Id: editor_plugin_src.js 870 2008-06-13 09:25:41Z spocke $

+ * $Id: editor_plugin_src.js 1037 2009-03-02 16:41:15Z spocke $

  *

  * @author Moxiecode

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

@@ -21,7 +21,7 @@
 

 			ed.onPreInit.add(function() {

 				// Force in _value parameter this extra parameter is required for older Opera versions

-				ed.serializer.addRules('param[name|value|_value]');

+				ed.serializer.addRules('param[name|value|_mce_value]');

 			});

 

 			// Register commands

@@ -52,6 +52,12 @@
 					mceItemRealMedia : 'realmedia'

 				};

 

+				ed.selection.onSetContent.add(function() {

+					t._spansToImgs(ed.getBody());

+				});

+

+				ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);

+

 				if (ed.settings.content_css !== false)

 					ed.dom.loadCSS(url + "/css/content.css");

 

@@ -78,24 +84,7 @@
 				}

 			});

 

-			ed.onBeforeSetContent.add(function(ed, o) {

-				var h = o.content;

-

-				h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {

-					var o = t._parse(c);

-

-					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, '<span class="mceItemObject" $1>');

-				h = h.replace(/<embed([^>]*)\/>/gi, '<span class="mceItemEmbed" $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=/gi, '_value=') + ' class="mceItemParam"></span>'});

-				h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');

-

-				o.content = h;

-			});

+			ed.onBeforeSetContent.add(t._objectsToSpans, t);

 

 			ed.onSetContent.add(function() {

 				t._spansToImgs(ed.getBody());

@@ -173,17 +162,17 @@
 			});

 

 			ed.onPostProcess.add(function(ed, o) {

-				o.content = o.content.replace(/_value=/g, 'value=');

+				o.content = o.content.replace(/_mce_value=/g, 'value=');

 			});

 

-			if (ed.getParam('media_use_script')) {

-				function getAttr(s, n) {

-					n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);

+			function getAttr(s, n) {

+				n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);

 

-					return n ? ed.dom.decode(n[1]) : '';

-				};

+				return n ? ed.dom.decode(n[1]) : '';

+			};

 

-				ed.onPostProcess.add(function(ed, o) {

+			ed.onPostProcess.add(function(ed, o) {

+				if (ed.getParam('media_use_script')) {

 					o.content = o.content.replace(/<img[^>]+>/g, function(im) {

 						var cl = getAttr(im, 'class');

 

@@ -196,8 +185,8 @@
 

 						return im;

 					});

-				});

-			}

+				}

+			});

 		},

 

 		getInfo : function() {

@@ -211,35 +200,72 @@
 		},

 

 		// Private methods

+		_objectsToSpans : function(ed, o) {

+			var t = this, h = o.content;

+

+			h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {

+				var o = t._parse(c);

+

+				return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'

+			});

+

+			h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');

+			h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');

+			h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');

+			h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');

+			h = h.replace(/<\/embed>/gi, '');

+			h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});

+			h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');

+

+			o.content = h;

+		},

 

 		_buildObj : function(o, n) {

-			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title);

+			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc;

+			

+			stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash';

 

 			p.width = o.width = dom.getAttrib(n, 'width') || 100;

 			p.height = o.height = dom.getAttrib(n, 'height') || 100;

 

-			ob = dom.create('span', {

-				mce_name : 'object',

-				classid : "clsid:" + o.classid,

-				codebase : o.codebase,

-				width : o.width,

-				height : o.height

-			});

-

 			if (p.src)

 				p.src = ed.convertURL(p.src, 'src', n);

 

+			if (stc) {

+				ob = dom.create('span', {

+					id : p.id,

+					mce_name : 'object',

+					type : 'application/x-shockwave-flash',

+					data : p.src,

+					style : dom.getAttrib(n, 'style'),

+					width : o.width,

+					height : o.height

+				});

+			} else {

+				ob = dom.create('span', {

+					id : p.id,

+					mce_name : 'object',

+					classid : "clsid:" + o.classid,

+					style : dom.getAttrib(n, 'style'),

+					codebase : o.codebase,

+					width : o.width,

+					height : o.height

+				});

+			}

+

 			each (p, function(v, k) {

-				if (!/^(width|height|codebase|classid)$/.test(k)) {

+				if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {

 					// Use url instead of src in IE for Windows media

-					if (o.type == 'application/x-mplayer2' && k == 'src')

+					if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)

 						k = 'url';

 

-					dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v});

+					if (v)

+						dom.add(ob, 'span', {mce_name : 'param', name : k, '_mce_value' : v});

 				}

 			});

 

-			dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p));

+			if (!stc)

+				dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));

 

 			return ob;

 		},

@@ -313,18 +339,21 @@
 		},

 

 		_createImg : function(cl, n) {

-			var im, dom = this.editor.dom, pa = {}, ti = '';

+			var im, dom = this.editor.dom, pa = {}, ti = '', args;

+

+			args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality'];	

 

 			// Create image

 			im = dom.create('img', {

 				src : this.url + '/img/trans.gif',

 				width : dom.getAttrib(n, 'width') || 100,

 				height : dom.getAttrib(n, 'height') || 100,

+				style : dom.getAttrib(n, 'style'),

 				'class' : cl

 			});

 

 			// Setup base parameters

-			each(['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode'], function(na) {

+			each(args, function(na) {

 				var v = dom.getAttrib(n, na);

 

 				if (v)

@@ -334,7 +363,7 @@
 			// Add optional parameters

 			each(dom.select('span', n), function(n) {

 				if (dom.hasClass(n, 'mceItemParam'))

-					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value');

+					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value');

 			});

 

 			// Use src not movie

@@ -343,6 +372,17 @@
 				delete pa.movie;

 			}

 

+			// Merge with embed args

+			n = dom.select('.mceItemEmbed', n)[0];

+			if (n) {

+				each(args, function(na) {

+					var v = dom.getAttrib(n, na);

+

+					if (v && !pa[na])

+						pa[na] = v;

+				});

+			}

+

 			delete pa.width;

 			delete pa.height;

 

diff --git a/program/js/tiny_mce/plugins/media/js/media.js b/program/js/tiny_mce/plugins/media/js/media.js
index f04d5d9c3..86cfa9856 100644
--- a/program/js/tiny_mce/plugins/media/js/media.js
+++ b/program/js/tiny_mce/plugins/media/js/media.js
@@ -183,7 +183,7 @@ function insertMedia() {
 	tinyMCEPopup.restoreSelection();

 

 	if (!AutoValidator.validate(f)) {

-		alert(ed.getLang('invalid_data'));

+		tinyMCEPopup.alert(ed.getLang('invalid_data'));

 		return false;

 	}

 

@@ -218,7 +218,7 @@ function insertMedia() {
 				break;

 		}

 

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

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

 			ed.execCommand('mceRepaint');

 

 		fe.title = serializeParameters();

@@ -359,7 +359,9 @@ function changedType(t) {
 	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';

+

+	if (t)

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

 }

 

 function serializeParameters() {

@@ -467,7 +469,7 @@ function setBool(pl, p, n) {
 	if (typeof(pl[n]) == "undefined")

 		return;

 

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

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

 }

 

 function setStr(pl, p, n) {

@@ -488,7 +490,7 @@ function getBool(p, n, d, tv, fv) {
 	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";

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

 

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

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

 }

 

 function getStr(p, n, d) {

@@ -600,7 +602,7 @@ function generatePreview(c) {
 

 	// Avoid annoying warning about insecure items

 	if (!tinymce.isIE || document.location.protocol != 'https:') {

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

+		h += '<object classid="' + 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] + '">';

diff --git a/program/js/tiny_mce/plugins/media/media.htm b/program/js/tiny_mce/plugins/media/media.htm
index 8b3bc1d6b..911c03dcc 100644
--- a/program/js/tiny_mce/plugins/media/media.htm
+++ b/program/js/tiny_mce/plugins/media/media.htm
@@ -9,7 +9,6 @@
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>

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

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

-	<base target="_self" />

 </head>

 <body style="display: none">

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

@@ -52,7 +51,7 @@
 							</tr>

 							<tr id="linklistrow">

 								<td><label for="linklist">{#media_dlg.list}</label></td>

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

+								<td id="linklistcontainer"><select id="linklist"><option value=""></option></select></td>

 							</tr>

 							<tr>

 								<td><label for="width">{#media_dlg.size}</label></td>

@@ -260,8 +259,7 @@
 							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>

 							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>

 

-							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>

-							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>

+

 						</tr>

 

 						<tr>