Wordpress 2.7.1

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / media / js / media.js

diff --git a/wp-includes/js/tinymce/plugins/media/js/media.js b/wp-includes/js/tinymce/plugins/media/js/media.js
index 0f0cfd6448b81ed229523999263604f6cad6d2d1..27439fe52c48897c9c1906893c216702ffd90f8f 100644 (file)
--- a/wp-includes/js/tinymce/plugins/media/js/media.js
+++ b/wp-includes/js/tinymce/plugins/media/js/media.js
@@ -183,7 +183,7 @@ function insertMedia() {
        tinyMCEPopup.restoreSelection();
 
        if (!AutoValidator.validate(f)) {
-               alert(ed.getLang('invalid_data'));
+               tinyMCEPopup.alert(ed.getLang('invalid_data'));
                return false;
        }
 
@@ -359,7 +359,9 @@ function changedType(t) {
        d.getElementById('shockwave_options').style.display = 'none';
        d.getElementById('wmp_options').style.display = 'none';
        d.getElementById('rmp_options').style.display = 'none';
-       d.getElementById(t + '_options').style.display = 'block';
+
+       if (t)
+               d.getElementById(t + '_options').style.display = 'block';
 }
 
 function serializeParameters() {
@@ -600,7 +602,7 @@ function generatePreview(c) {
 
        // Avoid annoying warning about insecure items
        if (!tinymce.isIE || document.location.protocol != 'https:') {
-               h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+               h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
 
                for (n in pl) {
                        h += '<param name="' + n + '" value="' + pl[n] + '">';