soutade/Dynastie
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Update tinyMCE to version 3.5.10

Browse Source
This commit is contained in:
Gregory Soutade
2014-01-04 13:28:46 +01:00
parent 93f9ff8a57
commit 26fa4b91b9
55 changed files with 2496 additions and 2026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js vendored
View File

@@ -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;