update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks

2 files changed, 5 insertions, 10 deletions

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css b/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
deleted file mode 100755
index 1bf6a7586..000000000
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}

-.mceItemShockWave {background-image: url(../img/shockwave.gif);}

-.mceItemFlash {background-image:url(../img/flash.gif);}

-.mceItemQuickTime {background-image:url(../img/quicktime.gif);}

-.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}

-.mceItemRealMedia {background-image:url(../img/realmedia.gif);}

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css b/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
index 2d087944d..0c45c7ff6 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css
@@ -1,12 +1,12 @@
-#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }

+#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }

 #hspace, #vspace { width: 50px }

 #flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }

-#flash_base, #flash_flashvars { width: 240px }

+#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }

 #width, #height { width: 40px }

 #src, #media_type { width: 250px }

 #class { width: 120px }

-#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }

-.panel_wrapper div.current { height: 390px; overflow: auto }

+#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }

+.panel_wrapper div.current { height: 420px; overflow: auto }

 #flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }

 .mceAddSelectValue { background-color: #DDDDDD }

 #qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }

@@ -14,3 +14,4 @@
 #rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }

 #shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }

 #qt_qtsrc { width: 200px }

+iframe {border: 1px solid gray}