diff options
| author | alecpl <alec@alec.pl> | 2008-07-18 14:59:01 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2008-07-18 14:59:01 +0000 |
| commit | 18240a9201d193a5a2420f8644fa05b7bfbceeec (patch) | |
| tree | 79f1f65e1eede1f8f5e8bf87960594c286b600e8 /program/js/tiny_mce/plugins/media/js/media.js | |
| parent | bc0fe54235ae4f5cd4a74be91beb1f9953eb7b03 (diff) | |
- Updated TinyMCE to version 3.1.0.1
Diffstat (limited to 'program/js/tiny_mce/plugins/media/js/media.js')
| -rw-r--r-- | program/js/tiny_mce/plugins/media/js/media.js | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/program/js/tiny_mce/plugins/media/js/media.js b/program/js/tiny_mce/plugins/media/js/media.js index 2877d16b1..f04d5d9c3 100644 --- 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;
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;
}
|