Imported Upstream version 0.2~stable

[roundcube.git] / program / js / tiny_mce / plugins / media / js / media.js

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