Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Backported some of the more critical fixes from the 3.4 fork to the 3…

….3 branch.
  • Loading branch information...
commit b486be8a3bf04a1acbf4144380e5537a64d01400 1 parent 9bf622d
@spocke spocke authored
View
2  changelog.txt
@@ -1,6 +1,8 @@
Version 3.3.9.3 (2010-xx-xx)
Fixed issue where WebKit wouldn't correctly apply ins/del in xhtmlxtras plugin.
Fixed bug where paste as plaintext on WebKit wouldn't produce br and p elements correctly.
+ Fixed bug where the confirm dialog texts would be incorrectly placed due to recent IE 9 workarounds in the window.css.
+ Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.
Version 3.3.9.2 (2010-09-29)
Fixed bug where placing the caret in IE 9 beta 1 would not work correctly if you clicked out side the document body element.
Fixed bug where IE 9 beta 1 wouldn't resize the editor correctly since the events didn't fire as previous versions did.
View
4 jscripts/tiny_mce/classes/Editor.js
@@ -918,8 +918,8 @@
{inline : 'u'}
],
- forecolor : {inline : 'span', styles : {color : '%value'}},
- hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},
+ forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},
+ hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},
fontname : {inline : 'span', styles : {fontFamily : '%value'}},
fontsize : {inline : 'span', styles : {fontSize : '%value'}},
fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},
View
2  jscripts/tiny_mce/classes/Formatter.js
@@ -240,7 +240,7 @@
}
// Is it valid to wrap this item
- if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {
+ if ((format.wrap_links !== false || nodeName != 'a') && isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {
// Start wrapping
if (!currentWrapElm) {
// Wrap the node
View
2  jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -93,7 +93,7 @@
.clearlooks2.ie9 .mceTop .mceCenter {clip:auto;}
.clearlooks2.ie9 .mceMiddle {clip:auto;}
.clearlooks2.ie9 .mceMiddle .mceLeft, .clearlooks2.ie9 .mceMiddle .mceRight {top: 23px;}
-.clearlooks2.ie9 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {top:13px;}
+.clearlooks2.ie9 .mceAlert .mceMiddle span, .clearlooks2.ie9 .mceConfirm .mceMiddle span {top:13px;}
.clearlooks2.ie9 .mceModal .mceMiddle {top:23px}
.clearlooks2.ie9 .mceModal .mceMiddle .mceLeft, .clearlooks2.ie9 .mceModal .mceMiddle .mceRight {top: 0}
.clearlooks2.ie9 .mceMiddle .mceIcon {top:13px}
Please sign in to comment.
Something went wrong with that request. Please try again.