Permalink
Browse files

Fixed a few minor issues.

  • Loading branch information...
1 parent 9cd23d9 commit 164471a44a259ce51ca89da71688d076bd82cce8 @spocke spocke committed Nov 20, 2012
Showing with 9 additions and 5 deletions.
  1. +2 −0 changelog.txt
  2. +6 −4 jscripts/tiny_mce/classes/Editor.js
  3. +1 −1 jscripts/tiny_mce/classes/UndoManager.js
View
2 changelog.txt
@@ -8,6 +8,8 @@ Version 3.5.8 (2012-11-20)
Fixed bug where the latest WebKit versions would produce span elements when deleting text between blocks.
Fixed bug where the autolink plugin would produce DOM exceptions when pressing shift+enter inside a block element.
Fixed bug where toggling of blockquotes when using br enter mode would produce an exception.
+ Fixed bug where focusing out of the body of the editor wouldn't properly add an undo level.
+ Fixed issue with warning message being displayed on IE 9+ about the meta header fix for IE 8.
Version 3.5.7 (2012-09-20)
Changed table row properties dialog to not update multiple rows when row type is header or footer.
Fixed bug in hyperlink dialog for IE9 where links with no target attr set had target value of --
View
10 jscripts/tiny_mce/classes/Editor.js
@@ -522,10 +522,12 @@
t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';
// IE8 doesn't support carets behind images setting ie7_compat would force IE8+ to run in IE7 compat mode.
- if (s.ie7_compat)
- t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';
- else
- t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
+ if (tinymce.isIE8) {
+ if (s.ie7_compat)
+ t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';
+ else
+ t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
+ }
t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
View
2 jscripts/tiny_mce/classes/UndoManager.js
@@ -73,7 +73,7 @@
// Add undo level on save contents, drag end and blur/focusout
editor.onSaveContent.add(addNonTypingUndoLevel);
editor.dom.bind(editor.dom.getRoot(), 'dragend', addNonTypingUndoLevel);
- editor.dom.bind(editor.getDoc(), tinymce.isGecko ? 'blur' : 'focusout', function(e) {
+ editor.dom.bind(editor.getBody(), 'focusout', function(e) {
if (!editor.removed && self.typing) {
addNonTypingUndoLevel();
}

0 comments on commit 164471a

Please sign in to comment.