diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-07-30 08:53:45 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-07-30 08:53:45 +0200 |
| commit | 750fcf8ece50e8d3b34439723d3ed788808e94f6 (patch) | |
| tree | aaf532dbbfaaf2b3922e6e90ab9263b661eb018d /program/js/tiny_mce/plugins/advimage | |
| parent | baecd8becccd7786632c1cda895123293ceb1408 (diff) | |
Update to TinyMCE 3.5.6
Diffstat (limited to 'program/js/tiny_mce/plugins/advimage')
| -rw-r--r-- | program/js/tiny_mce/plugins/advimage/js/image.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/program/js/tiny_mce/plugins/advimage/js/image.js b/program/js/tiny_mce/plugins/advimage/js/image.js index 546b69c0d..f0b7c6eef 100644 --- a/program/js/tiny_mce/plugins/advimage/js/image.js +++ b/program/js/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;
|