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

5 files changed, 6 insertions, 3 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
index 4ac4e4dfb..a1a8f9bd3 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
@@ -12,7 +12,7 @@ a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !impo
 span.mceItemNbsp {background: #DDD}

 td.mceSelected, th.mceSelected {background-color:#3399ff !important}

 img {border:0;}

-table {cursor:default}

+table, img, hr, .mceItemAnchor {cursor:default}

 table td, table th {cursor:text}

 ins {border-bottom:1px solid green; text-decoration: none; color:green}

 del {color:red; text-decoration:line-through}

@@ -34,6 +34,7 @@ scrollbar-track-color:#F5F5F5;
 

 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

 font[face=mceinline] {font-family:inherit !important}

+*[contentEditable]:focus {outline:0}

 

 .mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}

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

@@ -42,5 +43,6 @@ font[face=mceinline] {font-family:inherit !important}
 .mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}

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

 .mceItemVideo {background-image:url(../../img/video.gif)}

+.mceItemAudio {background-image:url(../../img/video.gif)}

 .mceItemIframe {background-image:url(../../img/iframe.gif)}

 .mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
index 12cfb419b..13a5cb030 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
index 8996c7493..7fc57f2bc 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
index bd5d2550c..c0dcc6cac 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
index df596bf78..0916c34e8 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
@@ -51,14 +51,14 @@
 .o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}

 

 /* ListBox */

-.o2k7Skin .mceListBox {margin-left:3px}

+.o2k7Skin .mceListBox  {padding-left: 3px}

 .o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}

 .o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}

 .o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}

 .o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}

 .o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}

 .o2k7Skin .mceListBoxDisabled .mceText {color:gray}

-.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden}

+.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden; margin-left:3px}

 .o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px}

 .o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}

 

@@ -106,6 +106,7 @@
 .o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}

 .o2k7Skin .mceMenu span.mceMenuLine {display:none}

 .o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}

+.o2k7Skin .mceMenuItem td, .o2k7Skin .mceMenuItem th {line-height: normal}

 

 /* Progress,Resize */

 .o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}