cable 0.9.15 → 0.9.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (142) hide show
  1. data/VERSION +1 -1
  2. data/public/javascripts/tinymce/langs/en.js +54 -2
  3. data/public/javascripts/tinymce/plugins/advhr/langs/en_dlg.js +2 -0
  4. data/public/javascripts/tinymce/plugins/advhr/rule.htm +30 -29
  5. data/public/javascripts/tinymce/plugins/advimage/image.htm +34 -31
  6. data/public/javascripts/tinymce/plugins/advimage/js/image.js +4 -2
  7. data/public/javascripts/tinymce/plugins/advimage/langs/en_dlg.js +2 -0
  8. data/public/javascripts/tinymce/plugins/advlink/js/advlink.js +5 -10
  9. data/public/javascripts/tinymce/plugins/advlink/langs/en_dlg.js +4 -2
  10. data/public/javascripts/tinymce/plugins/advlink/link.htm +34 -29
  11. data/public/javascripts/tinymce/plugins/advlist/editor_plugin.js +1 -1
  12. data/public/javascripts/tinymce/plugins/advlist/editor_plugin_src.js +3 -3
  13. data/public/javascripts/tinymce/plugins/autolink/editor_plugin.js +1 -0
  14. data/public/javascripts/tinymce/plugins/autolink/editor_plugin_src.js +169 -0
  15. data/public/javascripts/tinymce/plugins/autosave/editor_plugin.js +1 -1
  16. data/public/javascripts/tinymce/plugins/autosave/editor_plugin_src.js +13 -4
  17. data/public/javascripts/tinymce/plugins/bbcode/editor_plugin.js +1 -1
  18. data/public/javascripts/tinymce/plugins/bbcode/editor_plugin_src.js +1 -1
  19. data/public/javascripts/tinymce/plugins/contextmenu/editor_plugin.js +1 -1
  20. data/public/javascripts/tinymce/plugins/contextmenu/editor_plugin_src.js +23 -14
  21. data/public/javascripts/tinymce/plugins/emotions/emotions.htm +15 -14
  22. data/public/javascripts/tinymce/plugins/fullpage/css/fullpage.css +6 -4
  23. data/public/javascripts/tinymce/plugins/fullpage/editor_plugin.js +1 -1
  24. data/public/javascripts/tinymce/plugins/fullpage/editor_plugin_src.js +53 -8
  25. data/public/javascripts/tinymce/plugins/fullpage/fullpage.htm +2 -2
  26. data/public/javascripts/tinymce/plugins/fullpage/js/fullpage.js +45 -19
  27. data/public/javascripts/tinymce/plugins/fullscreen/editor_plugin.js +1 -1
  28. data/public/javascripts/tinymce/plugins/fullscreen/editor_plugin_src.js +10 -2
  29. data/public/javascripts/tinymce/plugins/inlinepopups/editor_plugin.js +1 -1
  30. data/public/javascripts/tinymce/plugins/inlinepopups/editor_plugin_src.js +76 -15
  31. data/public/javascripts/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css +0 -10
  32. data/public/javascripts/tinymce/plugins/layer/editor_plugin.js +1 -1
  33. data/public/javascripts/tinymce/plugins/layer/editor_plugin_src.js +2 -0
  34. data/public/javascripts/tinymce/plugins/legacyoutput/editor_plugin.js +1 -1
  35. data/public/javascripts/tinymce/plugins/legacyoutput/editor_plugin_src.js +29 -26
  36. data/public/javascripts/tinymce/plugins/lists/editor_plugin.js +1 -0
  37. data/public/javascripts/tinymce/plugins/lists/editor_plugin_src.js +617 -0
  38. data/public/javascripts/tinymce/plugins/media/css/media.css +5 -4
  39. data/public/javascripts/tinymce/plugins/media/editor_plugin.js +1 -1
  40. data/public/javascripts/tinymce/plugins/media/editor_plugin_src.js +652 -296
  41. data/public/javascripts/tinymce/plugins/media/js/media.js +327 -603
  42. data/public/javascripts/tinymce/plugins/media/langs/en_dlg.js +8 -2
  43. data/public/javascripts/tinymce/plugins/media/media.htm +283 -288
  44. data/public/javascripts/tinymce/plugins/media/moxieplayer.swf +0 -0
  45. data/public/javascripts/tinymce/plugins/nonbreaking/editor_plugin.js +1 -1
  46. data/public/javascripts/tinymce/plugins/nonbreaking/editor_plugin_src.js +1 -1
  47. data/public/javascripts/tinymce/plugins/pagebreak/editor_plugin.js +1 -1
  48. data/public/javascripts/tinymce/plugins/pagebreak/editor_plugin_src.js +1 -4
  49. data/public/javascripts/tinymce/plugins/paste/editor_plugin.js +1 -1
  50. data/public/javascripts/tinymce/plugins/paste/editor_plugin_src.js +106 -128
  51. data/public/javascripts/tinymce/plugins/searchreplace/editor_plugin.js +1 -1
  52. data/public/javascripts/tinymce/plugins/searchreplace/editor_plugin_src.js +4 -0
  53. data/public/javascripts/tinymce/plugins/searchreplace/js/searchreplace.js +14 -10
  54. data/public/javascripts/tinymce/plugins/searchreplace/searchreplace.htm +17 -16
  55. data/public/javascripts/tinymce/plugins/spellchecker/editor_plugin.js +1 -1
  56. data/public/javascripts/tinymce/plugins/spellchecker/editor_plugin_src.js +55 -37
  57. data/public/javascripts/tinymce/plugins/style/js/props.js +2 -8
  58. data/public/javascripts/tinymce/plugins/style/langs/en_dlg.js +8 -1
  59. data/public/javascripts/tinymce/plugins/style/props.htm +513 -398
  60. data/public/javascripts/tinymce/plugins/tabfocus/editor_plugin.js +1 -1
  61. data/public/javascripts/tinymce/plugins/tabfocus/editor_plugin_src.js +30 -28
  62. data/public/javascripts/tinymce/plugins/table/cell.htm +12 -12
  63. data/public/javascripts/tinymce/plugins/table/editor_plugin.js +1 -1
  64. data/public/javascripts/tinymce/plugins/table/editor_plugin_src.js +85 -26
  65. data/public/javascripts/tinymce/plugins/table/js/cell.js +9 -11
  66. data/public/javascripts/tinymce/plugins/table/js/row.js +13 -18
  67. data/public/javascripts/tinymce/plugins/table/js/table.js +8 -12
  68. data/public/javascripts/tinymce/plugins/table/langs/en_dlg.js +1 -1
  69. data/public/javascripts/tinymce/plugins/table/merge_cells.htm +11 -11
  70. data/public/javascripts/tinymce/plugins/table/row.htm +10 -8
  71. data/public/javascripts/tinymce/plugins/table/table.htm +54 -53
  72. data/public/javascripts/tinymce/plugins/template/js/template.js +1 -1
  73. data/public/javascripts/tinymce/plugins/visualchars/editor_plugin.js +1 -1
  74. data/public/javascripts/tinymce/plugins/visualchars/editor_plugin_src.js +1 -1
  75. data/public/javascripts/tinymce/plugins/wordcount/editor_plugin.js +1 -1
  76. data/public/javascripts/tinymce/plugins/wordcount/editor_plugin_src.js +35 -19
  77. data/public/javascripts/tinymce/plugins/xhtmlxtras/abbr.htm +6 -5
  78. data/public/javascripts/tinymce/plugins/xhtmlxtras/acronym.htm +6 -5
  79. data/public/javascripts/tinymce/plugins/xhtmlxtras/attributes.htm +6 -5
  80. data/public/javascripts/tinymce/plugins/xhtmlxtras/cite.htm +5 -4
  81. data/public/javascripts/tinymce/plugins/xhtmlxtras/del.htm +9 -8
  82. data/public/javascripts/tinymce/plugins/xhtmlxtras/ins.htm +11 -10
  83. data/public/javascripts/tinymce/plugins/xhtmlxtras/js/attributes.js +0 -1
  84. data/public/javascripts/tinymce/plugins/xhtmlxtras/js/del.js +2 -2
  85. data/public/javascripts/tinymce/plugins/xhtmlxtras/js/element_common.js +3 -5
  86. data/public/javascripts/tinymce/plugins/xhtmlxtras/js/ins.js +4 -3
  87. data/public/javascripts/tinymce/themes/advanced/about.htm +3 -5
  88. data/public/javascripts/tinymce/themes/advanced/anchor.htm +5 -5
  89. data/public/javascripts/tinymce/themes/advanced/charmap.htm +39 -40
  90. data/public/javascripts/tinymce/themes/advanced/color_picker.htm +10 -9
  91. data/public/javascripts/tinymce/themes/advanced/editor_template.js +1 -1
  92. data/public/javascripts/tinymce/themes/advanced/editor_template_src.js +171 -40
  93. data/public/javascripts/tinymce/themes/advanced/image.htm +51 -51
  94. data/public/javascripts/tinymce/{plugins/media → themes/advanced}/img/flash.gif +0 -0
  95. data/public/javascripts/tinymce/themes/advanced/img/iframe.gif +0 -0
  96. data/public/javascripts/tinymce/{plugins/pagebreak → themes/advanced}/img/pagebreak.gif +0 -0
  97. data/public/javascripts/tinymce/{plugins/media → themes/advanced}/img/quicktime.gif +0 -0
  98. data/public/javascripts/tinymce/{plugins/media → themes/advanced}/img/realmedia.gif +0 -0
  99. data/public/javascripts/tinymce/{plugins/media → themes/advanced}/img/shockwave.gif +0 -0
  100. data/public/javascripts/tinymce/{plugins/media → themes/advanced}/img/trans.gif +0 -0
  101. data/public/javascripts/tinymce/themes/advanced/img/video.gif +0 -0
  102. data/public/javascripts/tinymce/{plugins/media → themes/advanced}/img/windowsmedia.gif +0 -0
  103. data/public/javascripts/tinymce/themes/advanced/js/about.js +1 -0
  104. data/public/javascripts/tinymce/themes/advanced/js/anchor.js +5 -0
  105. data/public/javascripts/tinymce/themes/advanced/js/charmap.js +26 -6
  106. data/public/javascripts/tinymce/themes/advanced/js/color_picker.js +108 -32
  107. data/public/javascripts/tinymce/themes/advanced/js/image.js +3 -1
  108. data/public/javascripts/tinymce/themes/advanced/js/link.js +4 -7
  109. data/public/javascripts/tinymce/themes/advanced/js/source_editor.js +1 -1
  110. data/public/javascripts/tinymce/themes/advanced/langs/en.js +8 -2
  111. data/public/javascripts/tinymce/themes/advanced/langs/en_dlg.js +6 -3
  112. data/public/javascripts/tinymce/themes/advanced/link.htm +27 -28
  113. data/public/javascripts/tinymce/themes/advanced/shortcuts.htm +47 -0
  114. data/public/javascripts/tinymce/themes/advanced/skins/default/content.css +11 -0
  115. data/public/javascripts/tinymce/themes/advanced/skins/default/ui.css +4 -4
  116. data/public/javascripts/tinymce/themes/advanced/skins/highcontrast/content.css +23 -0
  117. data/public/javascripts/tinymce/themes/advanced/skins/highcontrast/dialog.css +105 -0
  118. data/public/javascripts/tinymce/themes/advanced/skins/highcontrast/ui.css +101 -0
  119. data/public/javascripts/tinymce/themes/advanced/skins/o2k7/content.css +10 -0
  120. data/public/javascripts/tinymce/themes/advanced/skins/o2k7/dialog.css +1 -0
  121. data/public/javascripts/tinymce/themes/advanced/skins/o2k7/ui.css +5 -4
  122. data/public/javascripts/tinymce/themes/advanced/skins/o2k7/ui_black.css +1 -1
  123. data/public/javascripts/tinymce/themes/advanced/skins/o2k7/ui_silver.css +1 -1
  124. data/public/javascripts/tinymce/themes/advanced/source_editor.htm +3 -3
  125. data/public/javascripts/tinymce/themes/simple/editor_template.js +1 -1
  126. data/public/javascripts/tinymce/themes/simple/editor_template_src.js +1 -2
  127. data/public/javascripts/tinymce/tiny_mce.js +1 -1
  128. data/public/javascripts/tinymce/tiny_mce_popup.js +1 -1
  129. data/public/javascripts/tinymce/tiny_mce_src.js +6383 -4025
  130. data/public/javascripts/tinymce/utils/form_utils.js +14 -4
  131. data/public/javascripts/tinymce/utils/mctabs.js +95 -10
  132. data/public/javascripts/tinymce/utils/validate.js +34 -2
  133. metadata +50 -93
  134. data/public/javascripts/tinymce/plugins/media/css/content.css +0 -6
  135. data/public/javascripts/tinymce/plugins/media/img/flv_player.swf +0 -0
  136. data/public/javascripts/tinymce/plugins/pagebreak/css/content.css +0 -1
  137. data/public/javascripts/tinymce/plugins/pagebreak/img/trans.gif +0 -0
  138. data/public/javascripts/tinymce/plugins/pdw/editor_plugin.js +0 -4
  139. data/public/javascripts/tinymce/plugins/pdw/editor_plugin_src.js +0 -158
  140. data/public/javascripts/tinymce/plugins/pdw/img/toolbars.gif +0 -0
  141. data/public/javascripts/tinymce/plugins/pdw/langs/en.js +0 -3
  142. data/public/javascripts/tinymce/plugins/pdw/langs/nl.js +0 -3
@@ -1,12 +1,12 @@
1
- #id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
1
+ #id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
2
2
  #hspace, #vspace { width: 50px }
3
3
  #flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
4
- #flash_base, #flash_flashvars { width: 240px }
4
+ #flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }
5
5
  #width, #height { width: 40px }
6
6
  #src, #media_type { width: 250px }
7
7
  #class { width: 120px }
8
- #prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }
9
- .panel_wrapper div.current { height: 390px; overflow: auto }
8
+ #prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }
9
+ .panel_wrapper div.current { height: 420px; overflow: auto }
10
10
  #flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
11
11
  .mceAddSelectValue { background-color: #DDDDDD }
12
12
  #qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
@@ -14,3 +14,4 @@
14
14
  #rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
15
15
  #shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
16
16
  #qt_qtsrc { width: 200px }
17
+ iframe {border: 1px solid gray}
@@ -1 +1 @@
1
- (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&&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","data"];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}if(!f.src){f.src=f.data;delete f.data}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)})();
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)})();
@@ -9,187 +9,205 @@
9
9
  */
10
10
 
11
11
  (function() {
12
- var each = tinymce.each;
12
+ var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,
13
+ mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;
14
+
15
+ // Media types supported by this plugin
16
+ mediaTypes = [
17
+ // Type, clsid:s, mime types, codebase
18
+ ["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"],
19
+ ["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],
20
+ ["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"],
21
+ ["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],
22
+ ["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"],
23
+ ["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"],
24
+ ["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],
25
+ ["Iframe"],
26
+ ["Video"]
27
+ ];
28
+
29
+ function toArray(obj) {
30
+ var undef, out, i;
31
+
32
+ if (obj && !obj.splice) {
33
+ out = [];
34
+
35
+ for (i = 0; true; i++) {
36
+ if (obj[i])
37
+ out[i] = obj[i];
38
+ else
39
+ break;
40
+ }
41
+
42
+ return out;
43
+ }
44
+
45
+ return obj;
46
+ };
13
47
 
14
48
  tinymce.create('tinymce.plugins.MediaPlugin', {
15
49
  init : function(ed, url) {
16
- var t = this;
17
-
18
- t.editor = ed;
19
- t.url = url;
50
+ var self = this, lookup = {}, i, y, item, name;
20
51
 
21
- function isMediaElm(n) {
22
- return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
52
+ function isMediaImg(node) {
53
+ return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');
23
54
  };
24
55
 
25
- ed.onPreInit.add(function() {
26
- // Force in _value parameter this extra parameter is required for older Opera versions
27
- ed.serializer.addRules('param[name|value|_mce_value]');
28
- });
56
+ self.editor = ed;
57
+ self.url = url;
29
58
 
30
- // Register commands
31
- ed.addCommand('mceMedia', function() {
32
- ed.windowManager.open({
33
- file : url + '/media.htm',
34
- width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
35
- height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
36
- inline : 1
37
- }, {
38
- plugin_url : url
39
- });
40
- });
59
+ // Parse media types into a lookup table
60
+ scriptRegExp = '';
61
+ for (i = 0; i < mediaTypes.length; i++) {
62
+ name = mediaTypes[i][0];
41
63
 
42
- // Register buttons
43
- ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
64
+ item = {
65
+ name : name,
66
+ clsids : tinymce.explode(mediaTypes[i][1] || ''),
67
+ mimes : tinymce.explode(mediaTypes[i][2] || ''),
68
+ codebase : mediaTypes[i][3]
69
+ };
70
+
71
+ for (y = 0; y < item.clsids.length; y++)
72
+ lookup['clsid:' + item.clsids[y]] = item;
73
+
74
+ for (y = 0; y < item.mimes.length; y++)
75
+ lookup[item.mimes[y]] = item;
76
+
77
+ lookup['mceItem' + name] = item;
78
+ lookup[name.toLowerCase()] = item;
44
79
 
45
- ed.onNodeChange.add(function(ed, cm, n) {
46
- cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));
80
+ scriptRegExp += (scriptRegExp ? '|' : '') + name;
81
+ }
82
+
83
+ // Handle the media_types setting
84
+ tinymce.each(ed.getParam("media_types",
85
+ "video=mp4,m4v,ogv,webm;" +
86
+ "silverlight=xap;" +
87
+ "flash=swf,flv;" +
88
+ "shockwave=dcr;" +
89
+ "quicktime=mov,qt,mpg,mp3,mpeg;" +
90
+ "shockwave=dcr;" +
91
+ "windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +
92
+ "realmedia=rm,ra,ram;" +
93
+ "java=jar"
94
+ ).split(';'), function(item) {
95
+ var i, extensions, type;
96
+
97
+ item = item.split(/=/);
98
+ extensions = tinymce.explode(item[1].toLowerCase());
99
+ for (i = 0; i < extensions.length; i++) {
100
+ type = lookup[item[0].toLowerCase()];
101
+
102
+ if (type)
103
+ lookup[extensions[i]] = type;
104
+ }
47
105
  });
48
106
 
49
- ed.onInit.add(function() {
50
- var lo = {
51
- mceItemFlash : 'flash',
52
- mceItemShockWave : 'shockwave',
53
- mceItemWindowsMedia : 'windowsmedia',
54
- mceItemQuickTime : 'quicktime',
55
- mceItemRealMedia : 'realmedia'
56
- };
107
+ scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');
108
+ self.lookup = lookup;
57
109
 
58
- ed.selection.onSetContent.add(function() {
59
- t._spansToImgs(ed.getBody());
110
+ ed.onPreInit.add(function() {
111
+ // Allow video elements
112
+ ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');
113
+
114
+ // Convert video elements to image placeholder
115
+ ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {
116
+ var i = nodes.length;
117
+
118
+ while (i--)
119
+ self.objectToImg(nodes[i]);
60
120
  });
61
121
 
62
- ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);
122
+ // Convert image placeholders to video elements
123
+ ed.serializer.addNodeFilter('img', function(nodes, name, args) {
124
+ var i = nodes.length, node;
63
125
 
64
- if (ed.settings.content_css !== false)
65
- ed.dom.loadCSS(url + "/css/content.css");
126
+ while (i--) {
127
+ node = nodes[i];
128
+ if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)
129
+ self.imgToObject(node, args);
130
+ }
131
+ });
132
+ });
66
133
 
134
+ ed.onInit.add(function() {
135
+ // Display "media" instead of "img" in element path
67
136
  if (ed.theme && ed.theme.onResolveName) {
68
- ed.theme.onResolveName.add(function(th, o) {
69
- if (o.name == 'img') {
70
- each(lo, function(v, k) {
71
- if (ed.dom.hasClass(o.node, k)) {
72
- o.name = v;
73
- o.title = ed.dom.getAttrib(o.node, 'title');
74
- return false;
75
- }
76
- });
77
- }
137
+ ed.theme.onResolveName.add(function(theme, path_object) {
138
+ if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))
139
+ path_object.name = 'media';
78
140
  });
79
141
  }
80
142
 
143
+ // Add contect menu if it's loaded
81
144
  if (ed && ed.plugins.contextmenu) {
82
- ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
83
- if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {
84
- m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
85
- }
145
+ ed.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {
146
+ if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)
147
+ menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
86
148
  });
87
149
  }
88
150
  });
89
151
 
90
- ed.onBeforeSetContent.add(t._objectsToSpans, t);
91
-
92
- ed.onSetContent.add(function() {
93
- t._spansToImgs(ed.getBody());
94
- });
95
-
96
- ed.onPreProcess.add(function(ed, o) {
97
- var dom = ed.dom;
152
+ // Register commands
153
+ ed.addCommand('mceMedia', function() {
154
+ var data, img;
98
155
 
99
- if (o.set) {
100
- t._spansToImgs(o.node);
156
+ img = ed.selection.getNode();
157
+ if (isMediaImg(img)) {
158
+ data = JSON.parse(ed.dom.getAttrib(img, 'data-mce-json'));
101
159
 
102
- each(dom.select('IMG', o.node), function(n) {
103
- var p;
160
+ // Add some extra properties to the data object
161
+ tinymce.each(rootAttributes, function(name) {
162
+ var value = ed.dom.getAttrib(img, name);
104
163
 
105
- if (isMediaElm(n)) {
106
- p = t._parse(n.title);
107
- dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
108
- dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
109
- }
164
+ if (value)
165
+ data[name] = value;
110
166
  });
167
+
168
+ data.type = self.getType(img.className).name.toLowerCase();
111
169
  }
112
170
 
113
- if (o.get) {
114
- each(dom.select('IMG', o.node), function(n) {
115
- var ci, cb, mt;
116
-
117
- if (ed.getParam('media_use_script')) {
118
- if (isMediaElm(n))
119
- n.className = n.className.replace(/mceItem/g, 'mceTemp');
120
-
121
- return;
122
- }
123
-
124
- switch (n.className) {
125
- case 'mceItemFlash':
126
- ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
127
- cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
128
- mt = 'application/x-shockwave-flash';
129
- break;
130
-
131
- case 'mceItemShockWave':
132
- ci = '166b1bca-3f9c-11cf-8075-444553540000';
133
- cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
134
- mt = 'application/x-director';
135
- break;
136
-
137
- case 'mceItemWindowsMedia':
138
- ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
139
- cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
140
- mt = 'application/x-mplayer2';
141
- break;
142
-
143
- case 'mceItemQuickTime':
144
- ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
145
- cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
146
- mt = 'video/quicktime';
147
- break;
148
-
149
- case 'mceItemRealMedia':
150
- ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
151
- cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
152
- mt = 'audio/x-pn-realaudio-plugin';
153
- break;
154
- }
155
-
156
- if (ci) {
157
- dom.replace(t._buildObj({
158
- classid : ci,
159
- codebase : cb,
160
- type : mt
161
- }, n), n);
162
- }
163
- });
171
+ if (!data) {
172
+ data = {
173
+ type : 'flash',
174
+ video: {sources:[]},
175
+ params: {}
176
+ };
164
177
  }
165
- });
166
178
 
167
- ed.onPostProcess.add(function(ed, o) {
168
- o.content = o.content.replace(/_mce_value=/g, 'value=');
179
+ ed.windowManager.open({
180
+ file : url + '/media.htm',
181
+ width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
182
+ height : 500 + parseInt(ed.getLang('media.delta_height', 0)),
183
+ inline : 1
184
+ }, {
185
+ plugin_url : url,
186
+ data : data
187
+ });
169
188
  });
170
189
 
171
- function getAttr(s, n) {
172
- n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
190
+ // Register buttons
191
+ ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
173
192
 
174
- return n ? ed.dom.decode(n[1]) : '';
175
- };
193
+ // Update media selection status
194
+ ed.onNodeChange.add(function(ed, cm, node) {
195
+ cm.setActive('media', isMediaImg(node));
196
+ });
197
+ },
176
198
 
177
- ed.onPostProcess.add(function(ed, o) {
178
- if (ed.getParam('media_use_script')) {
179
- o.content = o.content.replace(/<img[^>]+>/g, function(im) {
180
- var cl = getAttr(im, 'class');
199
+ convertUrl : function(url, force_absolute) {
200
+ var self = this, editor = self.editor, settings = editor.settings,
201
+ urlConverter = settings.url_converter,
202
+ urlConverterScope = settings.url_converter_scope || self;
181
203
 
182
- if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {
183
- at = t._parse(getAttr(im, 'title'));
184
- at.width = getAttr(im, 'width');
185
- at.height = getAttr(im, 'height');
186
- im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
187
- }
204
+ if (!url)
205
+ return url;
188
206
 
189
- return im;
190
- });
191
- }
192
- });
207
+ if (force_absolute)
208
+ return editor.documentBaseURI.toAbsolute(url);
209
+
210
+ return urlConverter.call(urlConverterScope, url, 'src', 'object');
193
211
  },
194
212
 
195
213
  getInfo : function() {
@@ -202,210 +220,548 @@
202
220
  };
203
221
  },
204
222
 
205
- // Private methods
206
- _objectsToSpans : function(ed, o) {
207
- var t = this, h = o.content;
223
+ /**
224
+ * Converts the JSON data object to an img node.
225
+ */
226
+ dataToImg : function(data, force_absolute) {
227
+ var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;
228
+
229
+ data.params.src = self.convertUrl(data.params.src, force_absolute);
208
230
 
209
- h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
210
- var o = t._parse(c);
231
+ attrs = data.video.attrs;
232
+ if (attrs)
233
+ attrs.src = self.convertUrl(attrs.src, force_absolute);
211
234
 
212
- return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
235
+ if (attrs)
236
+ attrs.poster = self.convertUrl(attrs.poster, force_absolute);
237
+
238
+ sources = toArray(data.video.sources);
239
+ if (sources) {
240
+ for (i = 0; i < sources.length; i++)
241
+ sources[i].src = self.convertUrl(sources[i].src, force_absolute);
242
+ }
243
+
244
+ img = self.editor.dom.create('img', {
245
+ id : data.id,
246
+ style : data.style,
247
+ align : data.align,
248
+ src : self.editor.theme.url + '/img/trans.gif',
249
+ 'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,
250
+ 'data-mce-json' : JSON.serialize(data, "'")
213
251
  });
214
252
 
215
- h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
216
- h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');
217
- h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
218
- h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');
219
- h = h.replace(/<\/embed>/gi, '');
220
- h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});
221
- h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
253
+ img.width = data.width || "320";
254
+ img.height = data.height || "240";
222
255
 
223
- o.content = h;
256
+ return img;
224
257
  },
225
258
 
226
- _buildObj : function(o, n) {
227
- var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc;
228
-
229
- stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash';
230
-
231
- p.width = o.width = dom.getAttrib(n, 'width') || 100;
232
- p.height = o.height = dom.getAttrib(n, 'height') || 100;
233
-
234
- if (p.src)
235
- p.src = ed.convertURL(p.src, 'src', n);
236
-
237
- if (stc) {
238
- ob = dom.create('span', {
239
- id : p.id,
240
- _mce_name : 'object',
241
- type : 'application/x-shockwave-flash',
242
- data : p.src,
243
- style : dom.getAttrib(n, 'style'),
244
- width : o.width,
245
- height : o.height
246
- });
247
- } else {
248
- ob = dom.create('span', {
249
- id : p.id,
250
- _mce_name : 'object',
251
- classid : "clsid:" + o.classid,
252
- style : dom.getAttrib(n, 'style'),
253
- codebase : o.codebase,
254
- width : o.width,
255
- height : o.height
259
+ /**
260
+ * Converts the JSON data object to a HTML string.
261
+ */
262
+ dataToHtml : function(data, force_absolute) {
263
+ return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {force_absolute : force_absolute});
264
+ },
265
+
266
+ /**
267
+ * Converts the JSON data object to a HTML string.
268
+ */
269
+ htmlToData : function(html) {
270
+ var fragment, img, data;
271
+
272
+ data = {
273
+ type : 'flash',
274
+ video: {sources:[]},
275
+ params: {}
276
+ };
277
+
278
+ fragment = this.editor.parser.parse(html);
279
+ img = fragment.getAll('img')[0];
280
+
281
+ if (img) {
282
+ data = JSON.parse(img.attr('data-mce-json'));
283
+ data.type = this.getType(img.attr('class')).name.toLowerCase();
284
+
285
+ // Add some extra properties to the data object
286
+ tinymce.each(rootAttributes, function(name) {
287
+ var value = img.attr(name);
288
+
289
+ if (value)
290
+ data[name] = value;
256
291
  });
257
292
  }
258
293
 
259
- each (p, function(v, k) {
260
- if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {
261
- // Use url instead of src in IE for Windows media
262
- if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)
263
- k = 'url';
294
+ return data;
295
+ },
296
+
297
+ /**
298
+ * Get type item by extension, class, clsid or mime type.
299
+ *
300
+ * @method getType
301
+ * @param {String} value Value to get type item by.
302
+ * @return {Object} Type item object or undefined.
303
+ */
304
+ getType : function(value) {
305
+ var i, values, typeItem;
306
+
307
+ // Find type by checking the classes
308
+ values = tinymce.explode(value, ' ');
309
+ for (i = 0; i < values.length; i++) {
310
+ typeItem = this.lookup[values[i]];
311
+
312
+ if (typeItem)
313
+ return typeItem;
314
+ }
315
+ },
316
+
317
+ /**
318
+ * Converts a tinymce.html.Node image element to video/object/embed.
319
+ */
320
+ imgToObject : function(node, args) {
321
+ var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,
322
+ source, sources, params, param, typeItem, i, item, mp4Source, replacement,
323
+ posterSrc, style;
324
+
325
+ // Adds the flash player
326
+ function addPlayer(video_src, poster_src) {
327
+ var baseUri, flashVars, flashVarsOutput, params, flashPlayer;
328
+
329
+ flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));
330
+ if (flashPlayer) {
331
+ baseUri = editor.documentBaseURI;
332
+ data.params.src = flashPlayer;
333
+
334
+ // Convert the movie url to absolute urls
335
+ if (editor.getParam('flash_video_player_absvideourl', true)) {
336
+ video_src = baseUri.toAbsolute(video_src || '', true);
337
+ poster_src = baseUri.toAbsolute(poster_src || '', true);
338
+ }
339
+
340
+ // Generate flash vars
341
+ flashVarsOutput = '';
342
+ flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});
343
+ tinymce.each(flashVars, function(value, name) {
344
+ // Replace $url and $poster variables in flashvars value
345
+ value = value.replace(/\$url/, video_src || '');
346
+ value = value.replace(/\$poster/, poster_src || '');
347
+
348
+ if (value.length > 0)
349
+ flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);
350
+ });
351
+
352
+ if (flashVarsOutput.length)
353
+ data.params.flashvars = flashVarsOutput;
264
354
 
265
- if (v)
266
- dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v});
355
+ params = editor.getParam('flash_video_player_params', {
356
+ allowfullscreen: true,
357
+ allowscriptaccess: true
358
+ });
359
+
360
+ tinymce.each(params, function(value, name) {
361
+ data.params[name] = "" + value;
362
+ });
267
363
  }
268
- });
364
+ };
269
365
 
270
- if (!stc)
271
- dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));
366
+ data = JSON.parse(node.attr('data-mce-json'));
367
+ typeItem = this.getType(node.attr('class'));
272
368
 
273
- return ob;
274
- },
369
+ style = node.attr('data-mce-style')
370
+ if (!style) {
371
+ style = node.attr('style');
275
372
 
276
- _spansToImgs : function(p) {
277
- var t = this, dom = t.editor.dom, im, ci;
373
+ if (style)
374
+ style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));
375
+ }
278
376
 
279
- each(dom.select('span', p), function(n) {
280
- // Convert object into image
281
- if (dom.getAttrib(n, 'class') == 'mceItemObject') {
282
- ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
377
+ // Handle iframe
378
+ if (typeItem.name === 'Iframe') {
379
+ replacement = new Node('iframe', 1);
283
380
 
284
- switch (ci) {
285
- case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
286
- dom.replace(t._createImg('mceItemFlash', n), n);
287
- break;
381
+ tinymce.each(rootAttributes, function(name) {
382
+ var value = node.attr(name);
288
383
 
289
- case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
290
- dom.replace(t._createImg('mceItemShockWave', n), n);
291
- break;
384
+ if (name == 'class' && value)
385
+ value = value.replace(/mceItem.+ ?/g, '');
292
386
 
293
- case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
294
- case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
295
- case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
296
- dom.replace(t._createImg('mceItemWindowsMedia', n), n);
297
- break;
387
+ if (value && value.length > 0)
388
+ replacement.attr(name, value);
389
+ });
298
390
 
299
- case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
300
- dom.replace(t._createImg('mceItemQuickTime', n), n);
301
- break;
391
+ for (name in data.params)
392
+ replacement.attr(name, data.params[name]);
302
393
 
303
- case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
304
- dom.replace(t._createImg('mceItemRealMedia', n), n);
305
- break;
394
+ replacement.attr({
395
+ style: style,
396
+ src: data.params.src
397
+ });
306
398
 
307
- default:
308
- dom.replace(t._createImg('mceItemFlash', n), n);
309
- }
310
-
311
- return;
399
+ node.replace(replacement);
400
+
401
+ return;
402
+ }
403
+
404
+ // Handle scripts
405
+ if (this.editor.settings.media_use_script) {
406
+ replacement = new Node('script', 1).attr('type', 'text/javascript');
407
+
408
+ value = new Node('#text', 3);
409
+ value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {
410
+ width: node.attr('width'),
411
+ height: node.attr('height')
412
+ })) + ');';
413
+
414
+ replacement.append(value);
415
+ node.replace(replacement);
416
+
417
+ return;
418
+ }
419
+
420
+ // Add HTML5 video element
421
+ if (typeItem.name === 'Video' && data.video.sources[0]) {
422
+ // Create new object element
423
+ video = new Node('video', 1).attr(tinymce.extend({
424
+ id : node.attr('id'),
425
+ width: node.attr('width'),
426
+ height: node.attr('height'),
427
+ style : style
428
+ }, data.video.attrs));
429
+
430
+ // Get poster source and use that for flash fallback
431
+ if (data.video.attrs)
432
+ posterSrc = data.video.attrs.poster;
433
+
434
+ sources = data.video.sources = toArray(data.video.sources);
435
+ for (i = 0; i < sources.length; i++) {
436
+ if (/\.mp4$/.test(sources[i].src))
437
+ mp4Source = sources[i].src;
312
438
  }
313
439
 
314
- // Convert embed into image
315
- if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {
316
- switch (dom.getAttrib(n, 'type')) {
317
- case 'application/x-shockwave-flash':
318
- dom.replace(t._createImg('mceItemFlash', n), n);
319
- break;
440
+ if (!sources[0].type) {
441
+ video.attr('src', sources[0].src);
442
+ sources.splice(0, 1);
443
+ }
320
444
 
321
- case 'application/x-director':
322
- dom.replace(t._createImg('mceItemShockWave', n), n);
323
- break;
445
+ for (i = 0; i < sources.length; i++) {
446
+ source = new Node('source', 1).attr(sources[i]);
447
+ source.shortEnded = true;
448
+ video.append(source);
449
+ }
324
450
 
325
- case 'application/x-mplayer2':
326
- dom.replace(t._createImg('mceItemWindowsMedia', n), n);
327
- break;
451
+ // Create flash fallback for video if we have a mp4 source
452
+ if (mp4Source) {
453
+ addPlayer(mp4Source, posterSrc);
454
+ typeItem = self.getType('flash');
455
+ } else
456
+ data.params.src = '';
457
+ }
328
458
 
329
- case 'video/quicktime':
330
- dom.replace(t._createImg('mceItemQuickTime', n), n);
331
- break;
459
+ // Do we have a params src then we can generate object
460
+ if (data.params.src) {
461
+ // Is flv movie add player for it
462
+ if (/\.flv$/i.test(data.params.src))
463
+ addPlayer(data.params.src, '');
464
+
465
+ if (args && args.force_absolute)
466
+ data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);
467
+
468
+ // Create new object element
469
+ object = new Node('object', 1).attr({
470
+ id : node.attr('id'),
471
+ width: node.attr('width'),
472
+ height: node.attr('height'),
473
+ style : style
474
+ });
332
475
 
333
- case 'audio/x-pn-realaudio-plugin':
334
- dom.replace(t._createImg('mceItemRealMedia', n), n);
335
- break;
476
+ tinymce.each(rootAttributes, function(name) {
477
+ if (data[name] && name != 'type')
478
+ object.attr(name, data[name]);
479
+ });
336
480
 
337
- default:
338
- dom.replace(t._createImg('mceItemFlash', n), n);
339
- }
340
- }
341
- });
481
+ // Add params
482
+ for (name in data.params) {
483
+ param = new Node('param', 1);
484
+ param.shortEnded = true;
485
+ value = data.params[name];
486
+
487
+ // Windows media needs to use url instead of src for the media URL
488
+ if (name === 'src' && typeItem.name === 'WindowsMedia')
489
+ name = 'url';
490
+
491
+ param.attr({name: name, value: value});
492
+ object.append(param);
493
+ }
494
+
495
+ // Setup add type and classid if strict is disabled
496
+ if (this.editor.getParam('media_strict', true)) {
497
+ object.attr({
498
+ data: data.params.src,
499
+ type: typeItem.mimes[0]
500
+ });
501
+ } else {
502
+ object.attr({
503
+ classid: "clsid:" + typeItem.clsids[0],
504
+ codebase: typeItem.codebase
505
+ });
506
+
507
+ embed = new Node('embed', 1);
508
+ embed.shortEnded = true;
509
+ embed.attr({
510
+ id: node.attr('id'),
511
+ width: node.attr('width'),
512
+ height: node.attr('height'),
513
+ style : style,
514
+ type: typeItem.mimes[0]
515
+ });
516
+
517
+ for (name in data.params)
518
+ embed.attr(name, data.params[name]);
519
+
520
+ tinymce.each(rootAttributes, function(name) {
521
+ if (data[name] && name != 'type')
522
+ embed.attr(name, data[name]);
523
+ });
524
+
525
+ object.append(embed);
526
+ }
527
+
528
+ // Insert raw HTML
529
+ if (data.object_html) {
530
+ value = new Node('#text', 3);
531
+ value.raw = true;
532
+ value.value = data.object_html;
533
+ object.append(value);
534
+ }
535
+
536
+ // Append object to video element if it exists
537
+ if (video)
538
+ video.append(object);
539
+ }
540
+
541
+ if (video) {
542
+ // Insert raw HTML
543
+ if (data.video_html) {
544
+ value = new Node('#text', 3);
545
+ value.raw = true;
546
+ value.value = data.video_html;
547
+ video.append(value);
548
+ }
549
+ }
550
+
551
+ if (video || object)
552
+ node.replace(video || object);
553
+ else
554
+ node.remove();
342
555
  },
343
556
 
344
- _createImg : function(cl, n) {
345
- var im, dom = this.editor.dom, pa = {}, ti = '', args;
557
+ /**
558
+ * Converts a tinymce.html.Node video/object/embed to an img element.
559
+ *
560
+ * The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:
561
+ * <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />
562
+ *
563
+ * The JSON structure will be like this:
564
+ * {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}
565
+ */
566
+ objectToImg : function(node) {
567
+ var object, embed, video, iframe, img, name, id, width, height, style, i, html,
568
+ param, params, source, sources, data, type, lookup = this.lookup,
569
+ matches, attrs, urlConverter = this.editor.settings.url_converter,
570
+ urlConverterScope = this.editor.settings.url_converter_scope;
571
+
572
+ function getInnerHTML(node) {
573
+ return new tinymce.html.Serializer({
574
+ inner: true,
575
+ validate: false
576
+ }).serialize(node);
577
+ };
346
578
 
347
- args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];
579
+ // If node isn't in document
580
+ if (!node.parent)
581
+ return;
348
582
 
349
- // Create image
350
- im = dom.create('img', {
351
- src : this.url + '/img/trans.gif',
352
- width : dom.getAttrib(n, 'width') || 100,
353
- height : dom.getAttrib(n, 'height') || 100,
354
- style : dom.getAttrib(n, 'style'),
355
- 'class' : cl
356
- });
583
+ // Handle media scripts
584
+ if (node.name === 'script') {
585
+ if (node.firstChild)
586
+ matches = scriptRegExp.exec(node.firstChild.value);
357
587
 
358
- // Setup base parameters
359
- each(args, function(na) {
360
- var v = dom.getAttrib(n, na);
588
+ if (!matches)
589
+ return;
361
590
 
362
- if (v)
363
- pa[na] = v;
364
- });
591
+ type = matches[1];
592
+ data = {video : {}, params : JSON.parse(matches[2])};
593
+ width = data.params.width;
594
+ height = data.params.height;
595
+ }
596
+
597
+ // Setup data objects
598
+ data = data || {
599
+ video : {},
600
+ params : {}
601
+ };
365
602
 
366
- // Add optional parameters
367
- each(dom.select('span', n), function(n) {
368
- if (dom.hasClass(n, 'mceItemParam'))
369
- pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value');
603
+ // Setup new image object
604
+ img = new Node('img', 1);
605
+ img.attr({
606
+ src : this.editor.theme.url + '/img/trans.gif'
370
607
  });
371
608
 
372
- // Use src not movie
373
- if (pa.movie) {
374
- pa.src = pa.movie;
375
- delete pa.movie;
609
+ // Video element
610
+ name = node.name;
611
+ if (name === 'video') {
612
+ video = node;
613
+ object = node.getAll('object')[0];
614
+ embed = node.getAll('embed')[0];
615
+ width = video.attr('width');
616
+ height = video.attr('height');
617
+ id = video.attr('id');
618
+ data.video = {attrs : {}, sources : []};
619
+
620
+ // Get all video attributes
621
+ attrs = data.video.attrs;
622
+ for (name in video.attributes.map)
623
+ attrs[name] = video.attributes.map[name];
624
+
625
+ source = node.attr('src');
626
+ if (source)
627
+ data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', 'video')});
628
+
629
+ // Get all sources
630
+ sources = video.getAll("source");
631
+ for (i = 0; i < sources.length; i++) {
632
+ source = sources[i].remove();
633
+
634
+ data.video.sources.push({
635
+ src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),
636
+ type: source.attr('type'),
637
+ media: source.attr('media')
638
+ });
639
+ }
640
+
641
+ // Convert the poster URL
642
+ if (attrs.poster)
643
+ attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', 'video');
644
+ }
645
+
646
+ // Object element
647
+ if (node.name === 'object') {
648
+ object = node;
649
+ embed = node.getAll('embed')[0];
650
+ }
651
+
652
+ // Embed element
653
+ if (node.name === 'embed')
654
+ embed = node;
655
+
656
+ // Iframe element
657
+ if (node.name === 'iframe') {
658
+ iframe = node;
659
+ type = 'Iframe';
660
+ }
661
+
662
+ if (object) {
663
+ // Get width/height
664
+ width = width || object.attr('width');
665
+ height = height || object.attr('height');
666
+ style = style || object.attr('style');
667
+ id = id || object.attr('id');
668
+
669
+ // Get all object params
670
+ params = object.getAll("param");
671
+ for (i = 0; i < params.length; i++) {
672
+ param = params[i];
673
+ name = param.remove().attr('name');
674
+
675
+ if (!excludedAttrs[name])
676
+ data.params[name] = param.attr('value');
677
+ }
678
+
679
+ data.params.src = data.params.src || object.attr('data');
376
680
  }
377
681
 
378
- // No src try data
379
- if (!pa.src) {
380
- pa.src = pa.data;
381
- delete pa.data;
682
+ if (embed) {
683
+ // Get width/height
684
+ width = width || embed.attr('width');
685
+ height = height || embed.attr('height');
686
+ style = style || embed.attr('style');
687
+ id = id || embed.attr('id');
688
+
689
+ // Get all embed attributes
690
+ for (name in embed.attributes.map) {
691
+ if (!excludedAttrs[name] && !data.params[name])
692
+ data.params[name] = embed.attributes.map[name];
693
+ }
382
694
  }
383
695
 
384
- // Merge with embed args
385
- n = dom.select('.mceItemEmbed', n)[0];
386
- if (n) {
387
- each(args, function(na) {
388
- var v = dom.getAttrib(n, na);
696
+ if (iframe) {
697
+ // Get width/height
698
+ width = iframe.attr('width');
699
+ height = iframe.attr('height');
700
+ style = style || iframe.attr('style');
701
+ id = iframe.attr('id');
389
702
 
390
- if (v && !pa[na])
391
- pa[na] = v;
703
+ tinymce.each(rootAttributes, function(name) {
704
+ img.attr(name, iframe.attr(name));
392
705
  });
706
+
707
+ // Get all iframe attributes
708
+ for (name in iframe.attributes.map) {
709
+ if (!excludedAttrs[name] && !data.params[name])
710
+ data.params[name] = iframe.attributes.map[name];
711
+ }
393
712
  }
394
713
 
395
- delete pa.width;
396
- delete pa.height;
714
+ // Use src not movie
715
+ if (data.params.movie) {
716
+ data.params.src = data.params.src || data.params.movie;
717
+ delete data.params.movie;
718
+ }
397
719
 
398
- im.title = this._serialize(pa);
720
+ // Convert the URL to relative/absolute depending on configuration
721
+ if (data.params.src)
722
+ data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');
399
723
 
400
- return im;
401
- },
724
+ if (video)
725
+ type = lookup.video.name;
402
726
 
403
- _parse : function(s) {
404
- return tinymce.util.JSON.parse('{' + s + '}');
405
- },
727
+ if (object && !type)
728
+ type = (lookup[(object.attr('clsid') || '').toLowerCase()] || lookup[(object.attr('type') || '').toLowerCase()] || {}).name;
406
729
 
407
- _serialize : function(o) {
408
- return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');
730
+ if (embed && !type)
731
+ type = (lookup[(embed.attr('type') || '').toLowerCase()] || {}).name;
732
+
733
+ // Replace the video/object/embed element with a placeholder image containing the data
734
+ node.replace(img);
735
+
736
+ // Remove embed
737
+ if (embed)
738
+ embed.remove();
739
+
740
+ // Serialize the inner HTML of the object element
741
+ if (object) {
742
+ html = getInnerHTML(object.remove());
743
+
744
+ if (html)
745
+ data.object_html = html;
746
+ }
747
+
748
+ // Serialize the inner HTML of the video element
749
+ if (video) {
750
+ html = getInnerHTML(video.remove());
751
+
752
+ if (html)
753
+ data.video_html = html;
754
+ }
755
+
756
+ // Set width/height of placeholder
757
+ img.attr({
758
+ id : id,
759
+ 'class' : 'mceItemMedia mceItem' + (type || 'Flash'),
760
+ style : style,
761
+ width : width || "320",
762
+ height : height || "240",
763
+ "data-mce-json" : JSON.serialize(data, "'")
764
+ });
409
765
  }
410
766
  });
411
767