Wordpress 2.6.2

[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 58d2fafb7343a0763a51cbd7602c5a8678963c2d..0f0cfd6448b81ed229523999263604f6cad6d2d1 100644 (file)
--- a/wp-includes/js/tinymce/plugins/media/js/media.js
+++ b/wp-includes/js/tinymce/plugins/media/js/media.js
@@ -598,14 +598,17 @@ function generatePreview(c) {
        pl.name = !pl.name ? 'eobj' : pl.name;
        pl.align = !pl.align ? '' : pl.align;
 
-       h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+       // 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 + '">';
 
-       for (n in pl) {
-               h += '<param name="' + n + '" value="' + pl[n] + '">';
+               for (n in pl) {
+                       h += '<param name="' + n + '" value="' + pl[n] + '">';
 
-               // Add extra url parameter if it's an absolute URL
-               if (n == 'src' && pl[n].indexOf('://') != -1)
-                       h += '<param name="url" value="' + pl[n] + '" />';
+                       // Add extra url parameter if it's an absolute URL
+                       if (n == 'src' && pl[n].indexOf('://') != -1)
+                               h += '<param name="url" value="' + pl[n] + '" />';
+               }
        }
 
        h += '<embed type="' + type + '" ';
@@ -613,7 +616,11 @@ function generatePreview(c) {
        for (n in pl)
                h += n + '="' + pl[n] + '" ';
 
-       h += '></embed></object>';
+       h += '></embed>';
+
+       // Avoid annoying warning about insecure items
+       if (!tinymce.isIE || document.location.protocol != 'https:')
+               h += '</object>';
 
        p.innerHTML = "<!-- x --->" + h;
 }