Merge pull request #592 from fermionic/20130126-richtext-feature-fixes

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / advimage / js / image.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js b/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
index 546b69c0de705f4e51886264a1c2cb650652123c..f0b7c6eef58ce254a70697e9190c2a4768a0ee6d 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -395,12 +395,14 @@ var ImageDialog = {
                                        if (v == '0')\r
                                                img.style.border = isIE ? '0' : '0 none none';\r
                                        else {\r
-                                               if (b.length == 3 && b[isIE ? 2 : 1])\r
-                                                       bStyle = b[isIE ? 2 : 1];\r
+                                               var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);\r
+\r
+                                               if (b.length == 3 && b[isOldIE ? 2 : 1])\r
+                                                       bStyle = b[isOldIE ? 2 : 1];\r
                                                else if (!bStyle || bStyle == 'none')\r
                                                        bStyle = 'solid';\r
                                                if (b.length == 3 && b[isIE ? 0 : 2])\r
-                                                       bColor = b[isIE ? 0 : 2];\r
+                                                       bColor = b[isOldIE ? 0 : 2];\r
                                                else if (!bColor || bColor == 'none')\r
                                                        bColor = 'black';\r
                                                img.style.border = v + 'px ' + bStyle + ' ' + bColor;\r