Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.

5 files changed, 404 insertions, 183 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
index 66219078c..37b4320bd 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mp3,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=g.parse(n.dom.getAttrib(i,"data-mce-json"));tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},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}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||"320";n.height=m.height||"240";return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(x,n){var t=this,o=t.editor,A,E,j,s,F,w,D,u,k,C,r,p,y,B,m,v,l,z;function q(i,G){var K,J,L,I,H;H=o.getParam("flash_video_player_url",t.convertUrl(t.url+"/moxieplayer.swf"));if(H){K=o.documentBaseURI;D.params.src=H;if(o.getParam("flash_video_player_absvideourl",true)){i=K.toAbsolute(i||"",true);G=K.toAbsolute(G||"",true)}L="";J=o.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(J,function(N,M){N=N.replace(/\$url/,i||"");N=N.replace(/\$poster/,G||"");if(N.length>0){L+=(L?"&":"")+M+"="+escape(N)}});if(L.length){D.params.flashvars=L}I=o.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(I,function(N,M){D.params[M]=""+N})}}D=g.parse(x.attr("data-mce-json"));p=this.getType(x.attr("class"));z=x.attr("data-mce-style");if(!z){z=x.attr("style");if(z){z=o.dom.serializeStyle(o.dom.parseStyle(z,"img"))}}if(p.name==="Iframe"){v=new b("iframe",1);tinymce.each(d,function(i){var G=x.attr(i);if(i=="class"&&G){G=G.replace(/mceItem.+ ?/g,"")}if(G&&G.length>0){v.attr(i,G)}});for(F in D.params){v.attr(F,D.params[F])}v.attr({style:z,src:D.params.src});x.replace(v);return}if(this.editor.settings.media_use_script){v=new b("script",1).attr("type","text/javascript");w=new b("#text",3);w.value="write"+p.name+"("+g.serialize(tinymce.extend(D.params,{width:x.attr("width"),height:x.attr("height")}))+");";v.append(w);x.replace(v);return}if(p.name==="Video"&&D.video.sources[0]){A=new b("video",1).attr(tinymce.extend({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z},D.video.attrs));if(D.video.attrs){l=D.video.attrs.poster}k=D.video.sources=c(D.video.sources);for(y=0;y<k.length;y++){if(/\.mp4$/.test(k[y].src)){m=k[y].src}}if(!k[0].type){A.attr("src",k[0].src);k.splice(0,1)}for(y=0;y<k.length;y++){u=new b("source",1).attr(k[y]);u.shortEnded=true;A.append(u)}if(m){q(m,l);p=t.getType("flash")}else{D.params.src=""}}if(D.params.src){if(/\.flv$/i.test(D.params.src)){q(D.params.src,"")}if(n&&n.force_absolute){D.params.src=o.documentBaseURI.toAbsolute(D.params.src)}E=new b("object",1).attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z});tinymce.each(d,function(i){if(D[i]&&i!="type"){E.attr(i,D[i])}});for(F in D.params){r=new b("param",1);r.shortEnded=true;w=D.params[F];if(F==="src"&&p.name==="WindowsMedia"){F="url"}r.attr({name:F,value:w});E.append(r)}if(this.editor.getParam("media_strict",true)){E.attr({data:D.params.src,type:p.mimes[0]})}else{E.attr({classid:"clsid:"+p.clsids[0],codebase:p.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z,type:p.mimes[0]});for(F in D.params){j.attr(F,D.params[F])}tinymce.each(d,function(i){if(D[i]&&i!="type"){j.attr(i,D[i])}});E.append(j)}if(D.object_html){w=new b("#text",3);w.raw=true;w.value=D.object_html;E.append(w)}if(A){A.append(E)}}if(A){if(D.video_html){w=new b("#text",3);w.raw=true;w.value=D.video_html;A.append(w)}}if(A||E){x.replace(A||E)}else{x.remove()}},objectToImg:function(y){var F,j,A,p,G,H,u,w,t,B,z,q,o,D,x,k,E,n,C=this.lookup,l,v,s=this.editor.settings.url_converter,m=this.editor.settings.url_converter_scope;function r(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}if(!y.parent){return}if(y.name==="script"){if(y.firstChild){l=a.exec(y.firstChild.value)}if(!l){return}n=l[1];E={video:{},params:g.parse(l[2])};w=E.params.width;t=E.params.height}E=E||{video:{},params:{}};G=new b("img",1);G.attr({src:this.editor.theme.url+"/img/trans.gif"});H=y.name;if(H==="video"){A=y;F=y.getAll("object")[0];j=y.getAll("embed")[0];w=A.attr("width");t=A.attr("height");u=A.attr("id");E.video={attrs:{},sources:[]};v=E.video.attrs;for(H in A.attributes.map){v[H]=A.attributes.map[H]}x=y.attr("src");if(x){E.video.sources.push({src:s.call(m,x,"src","video")})}k=A.getAll("source");for(z=0;z<k.length;z++){x=k[z].remove();E.video.sources.push({src:s.call(m,x.attr("src"),"src","source"),type:x.attr("type"),media:x.attr("media")})}if(v.poster){v.poster=s.call(m,v.poster,"poster","video")}}if(y.name==="object"){F=y;j=y.getAll("embed")[0]}if(y.name==="embed"){j=y}if(y.name==="iframe"){p=y;n="Iframe"}if(F){w=w||F.attr("width");t=t||F.attr("height");B=B||F.attr("style");u=u||F.attr("id");D=F.getAll("param");for(z=0;z<D.length;z++){o=D[z];H=o.remove().attr("name");if(!h[H]){E.params[H]=o.attr("value")}}E.params.src=E.params.src||F.attr("data")}if(j){w=w||j.attr("width");t=t||j.attr("height");B=B||j.attr("style");u=u||j.attr("id");for(H in j.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=j.attributes.map[H]}}}if(p){w=p.attr("width");t=p.attr("height");B=B||p.attr("style");u=p.attr("id");tinymce.each(d,function(i){G.attr(i,p.attr(i))});for(H in p.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=p.attributes.map[H]}}}if(E.params.movie){E.params.src=E.params.src||E.params.movie;delete E.params.movie}if(E.params.src){E.params.src=s.call(m,E.params.src,"src","object")}if(A){n=C.video.name}if(F&&!n){n=(C[(F.attr("clsid")||"").toLowerCase()]||C[(F.attr("type")||"").toLowerCase()]||{}).name}if(j&&!n){n=(C[(j.attr("type")||"").toLowerCase()]||{}).name}y.replace(G);if(j){j.remove()}if(F){q=r(F.remove());if(q){E.object_html=q}}if(A){q=r(A.remove());if(q){E.video_html=q}}G.attr({id:u,"class":"mceItemMedia mceItem"+(n||"Flash"),style:B,width:w||"320",height:t||"240","data-mce-json":g.serialize(E,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
+(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=n.dom.getAttrib(i,"data-mce-json");if(s){s=g.parse(s);tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},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}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,hspace:m.hspace,vspace:m.vspace,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||(m.type=="audio"?"300":"320");n.height=m.height||(m.type=="audio"?"32":"240");return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{forced_root_block:"",force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(z,o){var u=this,p=u.editor,C,H,j,t,I,y,G,w,k,E,s,q,A,D,m,x,l,B,F;function r(i,n){var M,L,N,K,J;J=p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"));if(J){M=p.documentBaseURI;G.params.src=J;if(p.getParam("flash_video_player_absvideourl",true)){i=M.toAbsolute(i||"",true);n=M.toAbsolute(n||"",true)}N="";L=p.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(L,function(P,O){P=P.replace(/\$url/,i||"");P=P.replace(/\$poster/,n||"");if(P.length>0){N+=(N?"&":"")+O+"="+escape(P)}});if(N.length){G.params.flashvars=N}K=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(K,function(P,O){G.params[O]=""+P})}}G=z.attr("data-mce-json");if(!G){return}G=g.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}if(q.name==="Iframe"){x=new b("iframe",1);tinymce.each(d,function(i){var n=z.attr(i);if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&n.length>0){x.attr(i,n)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new b("script",1).attr("type","text/javascript");y=new b("#text",3);y.value="write"+q.name+"("+g.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new b("video",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A<k.length;A++){if(/\.mp4$/.test(k[A].src)){m=k[A].src}}if(!k[0].type){C.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;C.append(w)}if(m){r(m,l);q=u.getType("flash")}else{G.params.src=""}}if(q.name==="Audio"&&G.video.sources[0]){F=new b("audio",1).attr(tinymce.extend({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);if(!k[0].type){F.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new b("source",1).attr(k[A]);w.shortEnded=true;F.append(w)}G.params.src=""}if(q.name==="EmbeddedAudio"){j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:z.attr("type")});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});G.params.src=""}if(G.params.src){if(/\.flv$/i.test(G.params.src)){r(G.params.src,"")}if(o&&o.force_absolute){G.params.src=p.documentBaseURI.toAbsolute(G.params.src)}H=new b("object",1).attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B});tinymce.each(d,function(i){var n=G[i];if(i=="class"&&n){n=n.replace(/mceItem.+ ?/g,"")}if(n&&i!="type"){H.attr(i,n)}});for(I in G.params){s=new b("param",1);s.shortEnded=true;y=G.params[I];if(I==="src"&&q.name==="WindowsMedia"){I="url"}s.attr({name:I,value:y});H.append(s)}if(this.editor.getParam("media_strict",true)){H.attr({data:G.params.src,type:q.mimes[0]})}else{H.attr({classid:"clsid:"+q.clsids[0],codebase:q.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:z.attr("width"),height:z.attr("height"),style:B,type:q.mimes[0]});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(d,function(i){if(G[i]&&i!="type"){j.attr(i,G[i])}});H.append(j)}if(G.object_html){y=new b("#text",3);y.raw=true;y.value=G.object_html;H.append(y)}if(C){C.append(H)}}if(C){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;C.append(y)}}if(F){if(G.video_html){y=new b("#text",3);y.raw=true;y.value=G.video_html;F.append(y)}}var v=C||F||H||j;if(v){z.replace(v)}else{z.remove()}},objectToImg:function(C){var L,k,F,s,M,N,y,A,x,G,E,t,q,I,B,l,K,o,H=this.lookup,m,z,v=this.editor.settings.url_converter,n=this.editor.settings.url_converter_scope,w,r,D,j;function u(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}function J(O,i){return H[(O.attr(i)||"").toLowerCase()]}function p(O){var i=O.replace(/^.*\.([^.]+)$/,"$1");return H[i.toLowerCase()||""]}if(!C.parent){return}if(C.name==="script"){if(C.firstChild){m=a.exec(C.firstChild.value)}if(!m){return}o=m[1];K={video:{},params:g.parse(m[2])};A=K.params.width;x=K.params.height}K=K||{video:{},params:{}};M=new b("img",1);M.attr({src:this.editor.theme.url+"/img/trans.gif"});N=C.name;if(N==="video"||N=="audio"){F=C;L=C.getAll("object")[0];k=C.getAll("embed")[0];A=F.attr("width");x=F.attr("height");y=F.attr("id");K.video={attrs:{},sources:[]};z=K.video.attrs;for(N in F.attributes.map){z[N]=F.attributes.map[N]}B=C.attr("src");if(B){K.video.sources.push({src:v.call(n,B,"src",C.name)})}l=F.getAll("source");for(E=0;E<l.length;E++){B=l[E].remove();K.video.sources.push({src:v.call(n,B.attr("src"),"src","source"),type:B.attr("type"),media:B.attr("media")})}if(z.poster){z.poster=v.call(n,z.poster,"poster",C.name)}}if(C.name==="object"){L=C;k=C.getAll("embed")[0]}if(C.name==="embed"){k=C}if(C.name==="iframe"){s=C;o="Iframe"}if(L){A=A||L.attr("width");x=x||L.attr("height");G=G||L.attr("style");y=y||L.attr("id");w=w||L.attr("hspace");r=r||L.attr("vspace");D=D||L.attr("align");j=j||L.attr("bgcolor");K.name=L.attr("name");I=L.getAll("param");for(E=0;E<I.length;E++){q=I[E];N=q.remove().attr("name");if(!h[N]){K.params[N]=q.attr("value")}}K.params.src=K.params.src||L.attr("data")}if(k){A=A||k.attr("width");x=x||k.attr("height");G=G||k.attr("style");y=y||k.attr("id");w=w||k.attr("hspace");r=r||k.attr("vspace");D=D||k.attr("align");j=j||k.attr("bgcolor");for(N in k.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=k.attributes.map[N]}}}if(s){A=s.attr("width");x=s.attr("height");G=G||s.attr("style");y=s.attr("id");w=s.attr("hspace");r=s.attr("vspace");D=s.attr("align");j=s.attr("bgcolor");tinymce.each(d,function(i){M.attr(i,s.attr(i))});for(N in s.attributes.map){if(!h[N]&&!K.params[N]){K.params[N]=s.attributes.map[N]}}}if(K.params.movie){K.params.src=K.params.src||K.params.movie;delete K.params.movie}if(K.params.src){K.params.src=v.call(n,K.params.src,"src","object")}if(F){if(C.name==="video"){o=H.video.name}else{if(C.name==="audio"){o=H.audio.name}}}if(L&&!o){o=(J(L,"clsid")||J(L,"classid")||J(L,"type")||{}).name}if(k&&!o){o=(J(k,"type")||p(K.params.src)||{}).name}if(k&&o=="EmbeddedAudio"){K.params.type=k.attr("type")}C.replace(M);if(k){k.remove()}if(L){t=u(L.remove());if(t){K.object_html=t}}if(F){t=u(F.remove());if(t){K.video_html=t}}K.hspace=w;K.vspace=r;K.align=D;K.bgcolor=j;M.attr({id:y,"class":"mceItemMedia mceItem"+(o||"Flash"),style:G,width:A||(C.name=="audio"?"300":"320"),height:x||(C.name=="audio"?"32":"240"),hspace:w,vspace:r,align:D,bgcolor:j,"data-mce-json":g.serialize(K,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
index e640bd366..ea79db18a 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
@@ -23,7 +23,9 @@
 		["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],

 		["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],

 		["Iframe"],

-		["Video"]

+		["Video"],

+		["EmbeddedAudio"],

+		["Audio"]

 	];

 

 	function toArray(obj) {

@@ -86,11 +88,12 @@
 				"silverlight=xap;" +

 				"flash=swf,flv;" +

 				"shockwave=dcr;" +

-				"quicktime=mov,qt,mpg,mp3,mpeg;" +

+				"quicktime=mov,qt,mpg,mpeg;" +

 				"shockwave=dcr;" +

 				"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +

 				"realmedia=rm,ra,ram;" +

-				"java=jar"

+				"java=jar;" +

+				"audio=mp3,ogg"

 			).split(';'), function(item) {

 				var i, extensions, type;

 

@@ -155,17 +158,20 @@
 

 				img = ed.selection.getNode();

 				if (isMediaImg(img)) {

-					data = JSON.parse(ed.dom.getAttrib(img, 'data-mce-json'));

+					data = ed.dom.getAttrib(img, 'data-mce-json');

+					if (data) {

+						data = JSON.parse(data);

 

-					// Add some extra properties to the data object

-					tinymce.each(rootAttributes, function(name) {

-						var value = ed.dom.getAttrib(img, name);

+						// Add some extra properties to the data object

+						tinymce.each(rootAttributes, function(name) {

+							var value = ed.dom.getAttrib(img, name);

 

-						if (value)

-							data[name] = value;

-					});

+							if (value)

+								data[name] = value;

+						});

 

-					data.type = self.getType(img.className).name.toLowerCase();

+						data.type = self.getType(img.className).name.toLowerCase();

+					}

 				}

 

 				if (!data) {

@@ -245,13 +251,15 @@
 				id : data.id,

 				style : data.style,

 				align : data.align,

+				hspace : data.hspace,

+				vspace : data.vspace,

 				src : self.editor.theme.url + '/img/trans.gif',

 				'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,

 				'data-mce-json' : JSON.serialize(data, "'")

 			});

 

-			img.width = data.width || "320";

-			img.height = data.height || "240";

+			img.width = data.width || (data.type == 'audio' ? "300" : "320");

+			img.height = data.height || (data.type == 'audio' ? "32" : "240");

 

 			return img;

 		},

@@ -260,7 +268,7 @@
 		 * Converts the JSON data object to a HTML string.

 		 */

 		dataToHtml : function(data, force_absolute) {

-			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {force_absolute : force_absolute});

+			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {forced_root_block : '', force_absolute : force_absolute});

 		},

 

 		/**

@@ -320,7 +328,7 @@
 		imgToObject : function(node, args) {

 			var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,

 				source, sources, params, param, typeItem, i, item, mp4Source, replacement,

-				posterSrc, style;

+				posterSrc, style, audio;

 

 			// Adds the flash player

 			function addPlayer(video_src, poster_src) {

@@ -363,7 +371,11 @@
 				}

 			};

 

-			data = JSON.parse(node.attr('data-mce-json'));

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

+			if (!data)

+				return;

+

+			data = JSON.parse(data);

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

 

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

@@ -456,6 +468,57 @@
 					data.params.src = '';

 			}

 

+			// Add HTML5 audio element

+			if (typeItem.name === 'Audio' && data.video.sources[0]) {

+				// Create new object element

+				audio = new Node('audio', 1).attr(tinymce.extend({

+					id : node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style

+				}, data.video.attrs));

+

+				// Get poster source and use that for flash fallback

+				if (data.video.attrs)

+					posterSrc = data.video.attrs.poster;

+

+				sources = data.video.sources = toArray(data.video.sources);

+				if (!sources[0].type) {

+					audio.attr('src', sources[0].src);

+					sources.splice(0, 1);

+				}

+

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

+					source = new Node('source', 1).attr(sources[i]);

+					source.shortEnded = true;

+					audio.append(source);

+				}

+

+				data.params.src = '';

+			}

+

+			if (typeItem.name === 'EmbeddedAudio') {

+				embed = new Node('embed', 1);

+				embed.shortEnded = true;

+				embed.attr({

+					id: node.attr('id'),

+					width: node.attr('width'),

+					height: node.attr('height'),

+					style : style,

+					type: node.attr('type')

+				});

+

+				for (name in data.params)

+					embed.attr(name, data.params[name]);

+

+				tinymce.each(rootAttributes, function(name) {

+					if (data[name] && name != 'type')

+						embed.attr(name, data[name]);

+				});

+

+				data.params.src = '';

+			}

+

 			// Do we have a params src then we can generate object

 			if (data.params.src) {

 				// Is flv movie add player for it

@@ -474,8 +537,13 @@
 				});

 

 				tinymce.each(rootAttributes, function(name) {

-					if (data[name] && name != 'type')

-						object.attr(name, data[name]);

+					var value = data[name];

+

+					if (name == 'class' && value)

+						value = value.replace(/mceItem.+ ?/g, '');

+

+					if (value && name != 'type')

+						object.attr(name, value);

 				});

 

 				// Add params

@@ -548,8 +616,19 @@
 				}

 			}

 

-			if (video || object)

-				node.replace(video || object);

+			if (audio) {

+				// Insert raw HTML

+				if (data.video_html) {

+					value = new Node('#text', 3);

+					value.raw = true;

+					value.value = data.video_html;

+					audio.append(value);

+				}

+			}

+

+			var n = video || audio || object || embed;

+			if (n)

+				node.replace(n);

 			else

 				node.remove();

 		},

@@ -567,7 +646,8 @@
 			var object, embed, video, iframe, img, name, id, width, height, style, i, html,

 				param, params, source, sources, data, type, lookup = this.lookup,

 				matches, attrs, urlConverter = this.editor.settings.url_converter,

-				urlConverterScope = this.editor.settings.url_converter_scope;

+				urlConverterScope = this.editor.settings.url_converter_scope,

+				hspace, vspace, align, bgcolor;

 

 			function getInnerHTML(node) {

 				return new tinymce.html.Serializer({

@@ -576,6 +656,15 @@
 				}).serialize(node);

 			};

 

+			function lookupAttribute(o, attr) {

+				return lookup[(o.attr(attr) || '').toLowerCase()];

+			}

+

+			function lookupExtension(src) {

+				var ext = src.replace(/^.*\.([^.]+)$/, '$1');

+				return lookup[ext.toLowerCase() || ''];

+			}

+

 			// If node isn't in document

 			if (!node.parent)

 				return;

@@ -608,7 +697,7 @@
 

 			// Video element

 			name = node.name;

-			if (name === 'video') {

+			if (name === 'video' || name == 'audio') {

 				video = node;

 				object = node.getAll('object')[0];

 				embed = node.getAll('embed')[0];

@@ -624,7 +713,7 @@
 

 				source = node.attr('src');

 				if (source)

-					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', 'video')});

+					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', node.name)});

 

 				// Get all sources

 				sources = video.getAll("source");

@@ -640,7 +729,7 @@
 

 				// Convert the poster URL

 				if (attrs.poster)

-					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', 'video');

+					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', node.name);

 			}

 

 			// Object element

@@ -665,6 +754,11 @@
 				height = height || object.attr('height');

 				style = style || object.attr('style');

 				id = id || object.attr('id');

+				hspace = hspace || object.attr('hspace');

+				vspace = vspace || object.attr('vspace');

+				align = align || object.attr('align');

+				bgcolor = bgcolor || object.attr('bgcolor');

+				data.name = object.attr('name');

 

 				// Get all object params

 				params = object.getAll("param");

@@ -685,6 +779,10 @@
 				height = height || embed.attr('height');

 				style = style || embed.attr('style');

 				id = id || embed.attr('id');

+				hspace = hspace || embed.attr('hspace');

+				vspace = vspace || embed.attr('vspace');

+				align = align || embed.attr('align');

+				bgcolor = bgcolor || embed.attr('bgcolor');

 

 				// Get all embed attributes

 				for (name in embed.attributes.map) {

@@ -699,6 +797,10 @@
 				height = iframe.attr('height');

 				style = style || iframe.attr('style');

 				id = iframe.attr('id');

+				hspace = iframe.attr('hspace');

+				vspace = iframe.attr('vspace');

+				align = iframe.attr('align');

+				bgcolor = iframe.attr('bgcolor');

 

 				tinymce.each(rootAttributes, function(name) {

 					img.attr(name, iframe.attr(name));

@@ -721,14 +823,23 @@
 			if (data.params.src)

 				data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');

 

-			if (video)

-				type = lookup.video.name;

+			if (video) {

+				if (node.name === 'video')

+					type = lookup.video.name;

+				else if (node.name === 'audio')

+					type = lookup.audio.name;

+			}

 

 			if (object && !type)

-				type = (lookup[(object.attr('clsid') || '').toLowerCase()] || lookup[(object.attr('type') || '').toLowerCase()] || {}).name;

+				type = (lookupAttribute(object, 'clsid') || lookupAttribute(object, 'classid') || lookupAttribute(object, 'type') || {}).name;

 

 			if (embed && !type)

-				type = (lookup[(embed.attr('type') || '').toLowerCase()] || {}).name;

+				type = (lookupAttribute(embed, 'type') || lookupExtension(data.params.src) || {}).name;

+

+			// for embedded audio we preserve the original specified type

+			if (embed && type == 'EmbeddedAudio') {

+				data.params.type = embed.attr('type');

+			}

 

 			// Replace the video/object/embed element with a placeholder image containing the data

 			node.replace(img);

@@ -753,13 +864,22 @@
 					data.video_html = html;

 			}

 

+			data.hspace = hspace;

+			data.vspace = vspace;

+			data.align = align;

+			data.bgcolor = bgcolor;

+

 			// Set width/height of placeholder

 			img.attr({

 				id : id,

 				'class' : 'mceItemMedia mceItem' + (type || 'Flash'),

 				style : style,

-				width : width || "320",

-				height : height || "240",

+				width : width || (node.name == 'audio' ? "300" : "320"),

+				height : height || (node.name == 'audio' ? "32" : "240"),

+				hspace : hspace,

+				vspace : vspace,

+				align : align,

+				bgcolor : bgcolor,

 				"data-mce-json" : JSON.serialize(data, "'")

 			});

 		}

@@ -767,4 +887,4 @@
 

 	// Register plugin

 	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);

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

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index 30ad65617..c4ec45303 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -8,6 +8,33 @@
 		return document.getElementById(id);

 	}

 

+	function clone(obj) {

+		var i, len, copy, attr;

+

+		if (null == obj || "object" != typeof obj)

+			return obj;

+

+		// Handle Array

+		if ('length' in obj) {

+			copy = [];

+

+			for (i = 0, len = obj.length; i < len; ++i) {

+				copy[i] = clone(obj[i]);

+			}

+

+			return copy;

+		}

+

+		// Handle Object

+		copy = {};

+		for (attr in obj) {

+			if (obj.hasOwnProperty(attr))

+				copy[attr] = clone(obj[attr]);

+		}

+

+		return copy;

+	}

+

 	function getVal(id) {

 		var elm = get(id);

 

@@ -20,17 +47,18 @@
 		return elm.value;

 	}

 

-	function setVal(id, value) {

+	function setVal(id, value, name) {

 		if (typeof(value) != 'undefined') {

 			var elm = get(id);

 

 			if (elm.nodeName == "SELECT")

 				selectByValue(document.forms[0], id, value);

 			else if (elm.type == "checkbox") {

-				if (typeof(value) == 'string')

-					elm.checked = value.toLowerCase() === 'true' ? true : false;

-				else

-					elm.checked = !!value;

+				if (typeof(value) == 'string') {

+					value = value.toLowerCase();

+					value = (!name && value === 'true') || (name && value === name.toLowerCase());

+				}

+				elm.checked = !!value;

 			} else

 				elm.value = value;

 		}

@@ -46,8 +74,10 @@
 			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

 			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');

 			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

-			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');

-			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');

+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource1','video_altsource1','media','media');

+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('video_filebrowser_altsource2','video_altsource2','media','media');

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

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

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

 

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

@@ -59,18 +89,28 @@
 			if (isVisible('filebrowser'))

 				get('src').style.width = '230px';

 

-			if (isVisible('filebrowser_altsource1'))

+			if (isVisible('video_filebrowser_altsource1'))

 				get('video_altsource1').style.width = '220px';

 

-			if (isVisible('filebrowser_altsource2'))

+			if (isVisible('video_filebrowser_altsource2'))

 				get('video_altsource2').style.width = '220px';

 

+			if (isVisible('audio_filebrowser_altsource1'))

+				get('audio_altsource1').style.width = '220px';

+

+			if (isVisible('audio_filebrowser_altsource2'))

+				get('audio_altsource2').style.width = '220px';

+

 			if (isVisible('filebrowser_poster'))

 				get('video_poster').style.width = '220px';

 

-			this.data = tinyMCEPopup.getWindowArg('data');

+			editor.dom.setOuterHTML(get('media_type'), this.getMediaTypeHTML(editor));

+

+			this.data = clone(tinyMCEPopup.getWindowArg('data'));

 			this.dataToForm();

 			this.preview();

+

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

 		},

 

 		insert : function() {

@@ -88,7 +128,7 @@
 		},

 

 		moveStates : function(to_form, field) {

-			var data = this.data, editor = this.editor, data = this.data,

+			var data = this.data, editor = this.editor,

 				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;

 

 			defaultStates = {

@@ -136,7 +176,7 @@
 

 						if (type == 'global')

 							list = data;

-						else if (type == 'video') {

+						else if (type == 'video' || type == 'audio') {

 							list = data.video.attrs;

 

 							if (!list && !to_form)

@@ -146,12 +186,12 @@
 

 						if (list) {

 							if (to_form) {

-								setVal(formItemName, list[name]);

+								setVal(formItemName, list[name], type == 'video' || type == 'audio' ? name : '');

 							} else {

 								delete list[name];

 

 								value = getVal(formItemName);

-								if (type == 'video' && value === true)

+								if ((type == 'video' || type == 'audio') && value === true)

 									value = name;

 

 								if (defaultStates[formItemName]) {

@@ -184,7 +224,7 @@
 					setVal('media_type', data.type);

 				}

 

-				if (data.type == "video") {

+				if (data.type == "video" || data.type == "audio") {

 					if (!data.video.sources)

 						data.video.sources = [];

 

@@ -194,11 +234,13 @@
 

 			// Hide all fieldsets and show the one active

 			get('video_options').style.display = 'none';

+			get('audio_options').style.display = 'none';

 			get('flash_options').style.display = 'none';

 			get('quicktime_options').style.display = 'none';

 			get('shockwave_options').style.display = 'none';

 			get('windowsmedia_options').style.display = 'none';

 			get('realmedia_options').style.display = 'none';

+			get('embeddedaudio_options').style.display = 'none';

 

 			if (get(data.type + '_options'))

 				get(data.type + '_options').style.display = 'block';

@@ -210,7 +252,9 @@
 			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');

 			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');

 			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');

-			setOptions('video', 'poster,autoplay,loop,preload,controls');

+			setOptions('video', 'poster,autoplay,loop,muted,preload,controls');

+			setOptions('audio', 'autoplay,loop,preload,controls');

+			setOptions('embeddedaudio', 'autoplay,loop,controls');

 			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');

 

 			if (to_form) {

@@ -225,12 +269,23 @@
 					src = data.video.sources[2];

 					if (src)

 						setVal('video_altsource2', src.src);

+                } else if (data.type == 'audio') {

+                    if (data.video.sources[0])

+                        setVal('src', data.video.sources[0].src);

+                    

+                    src = data.video.sources[1];

+                    if (src)

+                        setVal('audio_altsource1', src.src);

+                    

+                    src = data.video.sources[2];

+                    if (src)

+                        setVal('audio_altsource2', src.src);

 				} else {

 					// Check flash vars

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

 						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {

 							if (value == '$url')

-								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;

+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src || '';

 						});

 					}

 

@@ -238,7 +293,18 @@
 				}

 			} else {

 				src = getVal("src");

-	

+

+				// YouTube *NEW*

+				if (src.match(/youtu.be\/[a-z1-9.-_]+/)) {

+					data.width = 425;

+					data.height = 350;

+					data.params.frameborder = '0';

+					data.type = 'iframe';

+					src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];

+					setVal('src', src);

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

+				}

+

 				// YouTube

 				if (src.match(/youtube.com(.+)v=([^&]+)/)) {

 					data.width = 425;

@@ -273,12 +339,25 @@
 					src = getVal("video_altsource2");

 					if (src)

 						data.video.sources[2] = {src : src};

+                } else if (data.type == 'audio') {

+                    if (!data.video.sources)

+                        data.video.sources = [];

+                    

+                    data.video.sources[0] = {src : src};

+                    

+                    src = getVal("audio_altsource1");

+                    if (src)

+                        data.video.sources[1] = {src : src};

+                    

+                    src = getVal("audio_altsource2");

+                    if (src)

+                        data.video.sources[2] = {src : src};

 				} else

 					data.params.src = src;

 

 				// Set default size

-				setVal('width', data.width || 320);

-				setVal('height', data.height || 240);

+                setVal('width', data.width || (data.type == 'audio' ? 300 : 320));

+                setVal('height', data.height || (data.type == 'audio' ? 32 : 240));

 			}

 		},

 

@@ -296,7 +375,7 @@
 				this.panel = 'source';

 			} else {

 				if (this.panel == 'source') {

-					this.data = this.editor.plugins.media.htmlToData(getVal('source'));

+					this.data = clone(this.editor.plugins.media.htmlToData(getVal('source')));

 					this.dataToForm();

 					this.panel = '';

 				}

@@ -307,16 +386,16 @@
 		},

 

 		beforeResize : function() {

-			this.width = parseInt(getVal('width') || "320", 10);

-			this.height = parseInt(getVal('height') || "240", 10);

+            this.width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);

+            this.height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);

 		},

 

 		changeSize : function(type) {

 			var width, height, scale, size;

 

 			if (get('constrain').checked) {

-				width = parseInt(getVal('width') || "320", 10);

-				height = parseInt(getVal('height') || "240", 10);

+                width = parseInt(getVal('width') || (this.data.type == 'audio' ? "300" : "320"), 10);

+                height = parseInt(getVal('height') || (this.data.type == 'audio' ? "32" : "240"), 10);

 

 				if (type == 'width') {

 					this.height = Math.round((width / this.width) * height);

@@ -344,6 +423,26 @@
 			}

 

 			return "";

+		},

+

+		getMediaTypeHTML : function(editor) {

+			var html = "";

+			html += '<select id="media_type" name="media_type" onchange="Media.formToData(\'type\');">';

+			html += '<option value="video">HTML5 Video</option>';

+			html += '<option value="audio">HTML5 Audio</option>';

+			html += '<option value="flash">Flash</option>';

+			html += '<option value="quicktime">QuickTime</option>';

+			html += '<option value="shockwave">Shockwave</option>';

+			html += '<option value="windowsmedia">Windows Media</option>';

+			html += '<option value="realmedia">Real Media</option>';

+			html += '<option value="iframe">Iframe</option>';

+

+			if (editor.getParam('media_embedded_audio', false)) {

+				html += '<option value="embeddedaudio">Embedded Audio</option>';

+			}

+			

+			html += '</select>';

+			return html;

 		}

 	};

 

@@ -351,4 +450,4 @@
 	tinyMCEPopup.onInit.add(function() {

 		Media.init();

 	});

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

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
index 29d26a0d4..49412596a 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
@@ -1,109 +1 @@
-tinyMCE.addI18n('en.media_dlg',{

-title:"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",

-flv_options:"Flash video options",

-flv_scalemode:"Scale mode",

-flv_buffer:"Buffer",

-flv_starttime:"Start time",

-flv_defaultvolume:"Default volumne",

-flv_hiddengui:"Hidden GUI",

-flv_autostart:"Auto start",

-flv_loop:"Loop",

-flv_showscalemodes:"Show scale modes",

-flv_smoothvideo:"Smooth video",

-flv_jscallback:"JS Callback",

-html5_video_options:"HTML5 Video Options",

-altsource1:"Alternative source 1",

-altsource2:"Alternative source 2",

-preload:"Preload",

-poster:"Poster",

-

-source:"Source"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.media_dlg',{list:"List",file:"File/URL",advanced:"Advanced",general:"General",title:"Insert/Edit Embedded Media","align_top_left":"Top Left","align_center":"Center","align_left":"Left","align_bottom":"Bottom","align_right":"Right","align_top":"Top","qt_stream_warn":"Streamed RTSP resources should be added to the QT Source field under the Advanced tab.\nYou should also add a non-streamed version to the Source field.",qtsrc:"QT Source",progress:"Progress",sound:"Sound",swstretchvalign:"Stretch V-Align",swstretchhalign:"Stretch H-Align",swstretchstyle:"Stretch Style",scriptcallbacks:"Script Callbacks","align_top_right":"Top Right",uimode:"UI Mode",rate:"Rate",playcount:"Play Count",defaultframe:"Default Frame",currentposition:"Current Position",currentmarker:"Current Marker",captioningid:"Captioning ID",baseurl:"Base URL",balance:"Balance",windowlessvideo:"Windowless Video",stretchtofit:"Stretch to Fit",mute:"Mute",invokeurls:"Invoke URLs",fullscreen:"Full Screen",enabled:"Enabled",autostart:"Auto Start",volume:"Volume",target:"Target",qtsrcchokespeed:"Choke Speed",href:"HREF",endtime:"End Time",starttime:"Start Time",enablejavascript:"Enable JavaScript",correction:"No Correction",targetcache:"Target Cache",playeveryframe:"Play Every Frame",kioskmode:"Kiosk Mode",controller:"Controller",menu:"Show Menu",loop:"Loop",play:"Auto Play",hspace:"H-Space",vspace:"V-Space","class_name":"Class",name:"Name",id:"ID",type:"Type",size:"Dimensions",preview:"Preview","constrain_proportions":"Constrain Proportions",controls:"Controls",numloop:"Num Loops",console:"Console",cache:"Cache",autohref:"Auto HREF",liveconnect:"SWLiveConnect",flashvars:"Flash Vars",base:"Base",bgcolor:"Background",wmode:"WMode",salign:"SAlign",align:"Align",scale:"Scale",quality:"Quality",shuffle:"Shuffle",prefetch:"Prefetch",nojava:"No Java",maintainaspect:"Maintain Aspect",imagestatus:"Image Status",center:"Center",autogotourl:"Auto Goto URL","shockwave_options":"Shockwave Options","rmp_options":"Real Media Player Options","wmp_options":"Windows Media Player Options","qt_options":"QuickTime Options","flash_options":"Flash Options",hidden:"Hidden","align_bottom_left":"Bottom Left","align_bottom_right":"Bottom Right","html5_video_options":"HTML5 Video Options",altsource1:"Alternative source 1",altsource2:"Alternative source 2",preload:"Preload",poster:"Poster",source:"Source","html5_audio_options":"Audio Options","preload_none":"Don\'t Preload","preload_metadata":"Preload video metadata","preload_auto":"Let user\'s browser decide", "embedded_audio_options":"Embedded Audio Options"});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm
index 807a537dc..957d83a68 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/media.htm
@@ -29,15 +29,7 @@
 							<tr>

 								<td><label for="media_type">{#media_dlg.type}</label></td>

 								<td>

-									<select id="media_type" name="media_type" onchange="Media.formToData('type');">

-										<option value="video">HTML5 Video</option>

-										<option value="flash">Flash</option>

-										<option value="quicktime">QuickTime</option>

-										<option value="shockwave">Shockwave</option>

-										<option value="windowsmedia">Windows Media</option>

-										<option value="realmedia">Real Media</option>

-										<option value="iframe">Iframe</option>

-									</select>

+									<select id="media_type"></select>

 								</td>

 							</tr>

 							<tr>

@@ -159,6 +151,17 @@
 								</table>

 							</td>

 						</tr>

+

+						<tr>

+							<td><label for="video_preload">{#media_dlg.preload}</label></td>

+							<td>

+								<select id="video_preload" name="video_preload" onchange="Media.formToData();">

+									<option value="none">{#media_dlg.preload_none}</option> 

+									<option value="metadata">{#media_dlg.preload_metadata}</option>

+									<option value="auto">{#media_dlg.preload_auto}</option>

+								</select>

+							</td>

+						</tr>

 					</table>

 

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

@@ -175,26 +178,133 @@
 							<td>

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

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>

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

+										<td><input type="checkbox" class="checkbox" id="video_muted" name="video_muted" onchange="Media.formToData();" /></td>

+										<td><label for="video_muted">{#media_dlg.mute}</label></td>

 									</tr>

 								</table>

 							</td>

 

 							<td>

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

+											<tr>

+													<td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>

+													<td><label for="video_loop">{#media_dlg.loop}</label></td>

+											</tr>

+									</table>

+							</td>

+

+							<td>

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

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="video_preload" name="video_preload" onchange="Media.formToData();" /></td>

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

+										<td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>

+										<td><label for="video_controls">{#media_dlg.controls}</label></td>

 									</tr>

 								</table>

 							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="embeddedaudio_options">

+					<legend>{#media_dlg.embedded_audio_options}</legend>

 

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

+						<tr>

 							<td>

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

 									<tr>

-										<td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>

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

+										<td><input type="checkbox" class="checkbox" id="embeddedaudio_autoplay" name="audio_autoplay" onchange="Media.formToData();" /></td>

+										<td><label for="audio_autoplay">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="embeddedaudio_loop" name="audio_loop" onchange="Media.formToData();" /></td>

+										<td><label for="audio_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="embeddedaudio_controls" name="audio_controls" onchange="Media.formToData();" /></td>

+										<td><label for="audio_controls">{#media_dlg.controls}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="audio_options">

+					<legend>{#media_dlg.html5_audio_options}</legend>

+

+					<table role="presentation">

+						<tr>

+							<td><label for="audio_altsource1">{#media_dlg.altsource1}</label></td>

+							<td>

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

+									<tr>

+										<td><input type="text" id="audio_altsource1" name="audio_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="audio_altsource1_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="audio_altsource2">{#media_dlg.altsource2}</label></td>

+							<td>

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

+									<tr>

+										<td><input type="text" id="audio_altsource2" name="audio_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>

+										<td id="audio_altsource2_filebrowser">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="audio_preload">{#media_dlg.preload}</label></td>

+							<td>

+								<select id="audio_preload" name="audio_preload" onchange="Media.formToData();">

+									<option value="none">{#media_dlg.preload_none}</option>

+									<option value="metadata">{#media_dlg.preload_metadata}</option>

+									<option value="auto">{#media_dlg.preload_auto}</option>

+								</select>

+							</td>

+						</tr>

+					</table>

+

+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="audio_autoplay" name="audio_autoplay" onchange="Media.formToData();" /></td>

+										<td><label for="audio_autoplay">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="audio_loop" name="audio_loop" onchange="Media.formToData();" /></td>

+										<td><label for="audio_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td>

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

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="audio_controls" name="audio_controls" onchange="Media.formToData();" /></td>

+										<td><label for="audio_controls">{#media_dlg.controls}</label></td>

 									</tr>

 								</table>

 							</td>

@@ -798,7 +908,7 @@
 			<div id="source_panel" class="panel">

 				<fieldset>

 					<legend>{#media_dlg.source}</legend>

-					<textarea id="source" style="width: 100%; height: 390px"></textarea>

+					<textarea id="source" style="width: 99%; height: 390px"></textarea>

 				</fieldset>

 			</div>

 		</div>