mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-10-13 05:55:02 +02:00
Code Issues Releases Wiki Activity

TinyMce Upgrade to 3.5.6 and fixes for youtube and emoticon plugins.

Browse Source
This commit is contained in:
CaMer0n
2012-08-04 00:55:18 +00:00
parent 1601a07bba
commit 10312f4e2a
28 changed files with 3592 additions and 3022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_plugins/tinymce/plugins/advimage/js/image.js
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;