Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Johan Sörlin authored December 15, 2010
2  changelog.txt
... ...
@@ -1,6 +1,8 @@
1 1
 Version 3.3.9.3 (2010-xx-xx)
2 2
 	Fixed issue where WebKit wouldn't correctly apply ins/del in xhtmlxtras plugin.
3 3
 	Fixed bug where paste as plaintext on WebKit wouldn't produce br and p elements correctly.
  4
+	Fixed bug where the confirm dialog texts would be incorrectly placed due to recent IE 9 workarounds in the window.css.
  5
+	Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.
4 6
 Version 3.3.9.2 (2010-09-29)
5 7
 	Fixed bug where placing the caret in IE 9 beta 1 would not work correctly if you clicked out side the document body element.
6 8
 	Fixed bug where IE 9 beta 1 wouldn't resize the editor correctly since the events didn't fire as previous versions did.
4  jscripts/tiny_mce/classes/Editor.js
@@ -918,8 +918,8 @@
918 918
 					{inline : 'u'}
919 919
 				],
920 920
 
921  
-				forecolor : {inline : 'span', styles : {color : '%value'}},
922  
-				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},
  921
+				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},
  922
+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},
923 923
 				fontname : {inline : 'span', styles : {fontFamily : '%value'}},
924 924
 				fontsize : {inline : 'span', styles : {fontSize : '%value'}},
925 925
 				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},
2  jscripts/tiny_mce/classes/Formatter.js
@@ -240,7 +240,7 @@
240 240
 						}
241 241
 
242 242
 						// Is it valid to wrap this item
243  
-						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {
  243
+						if ((format.wrap_links !== false || nodeName != 'a') && isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {
244 244
 							// Start wrapping
245 245
 							if (!currentWrapElm) {
246 246
 								// Wrap the node
2  jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -93,7 +93,7 @@
93 93
 .clearlooks2.ie9 .mceTop .mceCenter {clip:auto;}
94 94
 .clearlooks2.ie9 .mceMiddle {clip:auto;}
95 95
 .clearlooks2.ie9 .mceMiddle .mceLeft, .clearlooks2.ie9 .mceMiddle .mceRight {top: 23px;}
96  
-.clearlooks2.ie9 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {top:13px;}
  96
+.clearlooks2.ie9 .mceAlert .mceMiddle span, .clearlooks2.ie9 .mceConfirm .mceMiddle span {top:13px;}
97 97
 .clearlooks2.ie9 .mceModal .mceMiddle {top:23px}
98 98
 .clearlooks2.ie9 .mceModal .mceMiddle .mceLeft, .clearlooks2.ie9 .mceModal .mceMiddle .mceRight {top: 0}
99 99
 .clearlooks2.ie9 .mceMiddle .mceIcon {top:13px}

0 notes on commit b486be8

Please sign in to comment.
Something went wrong with that request. Please try again.