Ticket #8322: 8322.patch

_source/plugins/selection/plugin.js

@@ -5 +5 @@
 
 (function()
 {
+        var isIERange = !window.getSelection;
+
         // #### checkSelectionChange : START
 
         // The selection change check basically saves the element parent tree of
@@ -679 +681 @@
                  * IE BUG: The selection's document may be a different document than the
                  * editor document. Return null if that is the case.
                  */
-                if ( CKEDITOR.env.ie )
+                if ( isIERange )
                 {
                         var range = this.getNative().createRange();
                         if ( !range
@@ -709 +711 @@
                  * var selection = editor.getSelection().<strong>getNative()</strong>;
                  */
                 getNative :
-                        CKEDITOR.env.ie ?
+                        isIERange ?
                                 function()
                                 {
                                         return this._.cache.nativeSel || ( this._.cache.nativeSel = this.document.$.selection );
@@ -739 +741 @@
                  *     alert( 'A text is selected' );
                  */
                 getType :
-                        CKEDITOR.env.ie ?
+                        isIERange ?
                                 function()
                                 {
                                         var cache = this._.cache;
@@ -816 +818 @@
                  */
                 getRanges : (function()
                 {
-                        var func = CKEDITOR.env.ie ?
+                        var func = isIERange ?
                                 ( function()
                                 {
                                         function getNodeIndex( node ) { return new CKEDITOR.dom.node( node ).getIndex(); }
@@ -1373 +1375 @@
                         var text = '',
                                 nativeSel = this.getNative();
                         if ( this.getType() == CKEDITOR.SELECTION_TEXT )
-                                text = CKEDITOR.env.ie ? nativeSel.createRange().text : nativeSel.toString();
+                                text = isIERange ? nativeSel.createRange().text : nativeSel.toString();
 
                         return ( cache.selectedText = text );
                 },
@@ -1506 +1508 @@
                                 return;
                         }
 
-                        if ( CKEDITOR.env.ie )
+                        if ( isIERange )
                         {
                                 if ( ranges.length > 1 )
                                 {
@@ -1713 +1715 @@
                         start.scrollIntoView();
                 }
         };
-})();
 
-( function()
-{
         var notWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),
                         fillerTextRegex = /\ufeff|\u00a0/,
                         nonCells = { table:1,tbody:1,tr:1 };
 
         CKEDITOR.dom.range.prototype.select =
-                CKEDITOR.env.ie ?
+                isIERange ?
                         // V2
                         function( forceExpand )
                         {
@@ -1844 +1843 @@
                         {
                                 this.document.getSelection().selectRanges( [ this ] );
                         };
-} )();
+})();

_source/plugins/wysiwygarea/plugin.js

@@ -93 +93 @@
 
                 if ( CKEDITOR.env.ie )
                 {
-                        var $sel = selection.getNative();
+                        var $sel = this.document.$.selection;
 
                         // Delete control selections to avoid IE bugs on pasteHTML.
                         if ( $sel.type == 'Control' )