From 6843acc9fced3dc1261e019ad4552b6e4c340ec7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 06:08:58 -0400
Subject: [PATCH] Merged changes to skin folders
---
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 546b69c..f0b7c6e 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 @@
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;
--
Gitblit v1.9.1