Index: /CKEditor/branches/versions/3.4.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 5765)
+++ /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 5766)
@@ -123,4 +123,5 @@
#5781 : Firefox: Editing was not possible in an empty document.
#5293 : Firefox: Unwanted BR tags were being left in the editor output when it should be empty.
+ #5280 : IE: Scrollbars where reacting improperly when clicking in the bar space.
Updated the following language files:
- #5962 : German;
Index: /CKEditor/branches/versions/3.4.x/_dev/packager/packagefilegen_full.html
===================================================================
--- /CKEditor/branches/versions/3.4.x/_dev/packager/packagefilegen_full.html (revision 5765)
+++ /CKEditor/branches/versions/3.4.x/_dev/packager/packagefilegen_full.html (revision 5766)
@@ -80,5 +80,5 @@
var path = downloaded[i].replace( CKEDITOR.basePath, '' );
- if ( path == 'config.js' )
+ if ( path == 'config.js' || /\/styles\/default\.js/.test( path ) )
continue;
Index: /CKEditor/branches/versions/3.4.x/_source/lang/pt-br.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/lang/pt-br.js (revision 5765)
+++ /CKEditor/branches/versions/3.4.x/_source/lang/pt-br.js (revision 5766)
@@ -5,5 +5,5 @@
/**
-* @fileOverview
+* @fileOverview
*/
Index: /CKEditor/branches/versions/3.4.x/_source/lang/tr.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/lang/tr.js (revision 5765)
+++ /CKEditor/branches/versions/3.4.x/_source/lang/tr.js (revision 5766)
@@ -5,5 +5,5 @@
/**
-* @fileOverview
+* @fileOverview
*/
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/selection/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/selection/plugin.js (revision 5765)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/selection/plugin.js (revision 5766)
@@ -193,4 +193,18 @@
restoreEnabled = 1;
});
+
+ // In IE6/7 the blinking cursor appears, but contents are
+ // not editable. (#5634)
+ if ( CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.version < 8 || CKEDITOR.env.quirks ) )
+ {
+ // The 'click' event is not fired when clicking the
+ // scrollbars, so we can use it to check whether
+ // the empty space following has been clicked.
+ html.on( 'click', function( evt )
+ {
+ if ( evt.data.getTarget().getName() == 'html' )
+ editor.getSelection().getRanges()[ 0 ].select();
+ });
+ }
// IE fires the "selectionchange" event when clicking
Index: /CKEditor/branches/versions/3.4.x/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.4.x/_source/plugins/wysiwygarea/plugin.js (revision 5765)
+++ /CKEditor/branches/versions/3.4.x/_source/plugins/wysiwygarea/plugin.js (revision 5766)
@@ -299,6 +299,6 @@
{
var element = fixedBlock.getNext( isNotWhitespace );
- if ( element &&
- element.type == CKEDITOR.NODE_ELEMENT &&
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
!nonExitableElementNames[ element.getName() ] )
{
@@ -309,6 +309,6 @@
{
element = fixedBlock.getPrevious( isNotWhitespace );
- if ( element &&
- element.type == CKEDITOR.NODE_ELEMENT &&
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
!nonExitableElementNames[ element.getName() ] )
{
@@ -977,8 +977,4 @@
{
editor.focus();
-
- // In IE7 the blinking cursor appears, but contents are not editable. (#5634)
- if ( CKEDITOR.env.ie7Compat )
- editor.getSelection().getRanges()[ 0 ].select();
} );
} );