diff options
author | iionly <iionly@gmx.de> | 2013-02-19 20:15:34 +0100 |
---|---|---|
committer | iionly <iionly@gmx.de> | 2013-02-19 20:15:34 +0100 |
commit | 4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 (patch) | |
tree | 38a3320f982d5343b11ac63cab158053756db952 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js | |
parent | d7ca5d846ccf328ec8940950c4e50e8648bab58a (diff) | |
download | elgg-4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23.tar.gz elgg-4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23.tar.bz2 |
Tinymce plugin: update to version 3.5.8 of Tinymce editor
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js')
-rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js index 546b69c0d..f0b7c6eef 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js @@ -395,12 +395,14 @@ var ImageDialog = { if (v == '0')
img.style.border = isIE ? '0' : '0 none none';
else {
- if (b.length == 3 && b[isIE ? 2 : 1])
- bStyle = b[isIE ? 2 : 1];
+ var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);
+
+ if (b.length == 3 && b[isOldIE ? 2 : 1])
+ bStyle = b[isOldIE ? 2 : 1];
else if (!bStyle || bStyle == 'none')
bStyle = 'solid';
if (b.length == 3 && b[isIE ? 0 : 2])
- bColor = b[isIE ? 0 : 2];
+ bColor = b[isOldIE ? 0 : 2];
else if (!bColor || bColor == 'none')
bColor = 'black';
img.style.border = v + 'px ' + bStyle + ' ' + bColor;
|