vanilla ckeditor-3.2.2

[ckeditor.git] / _source / plugins / clipboard / plugin.js

diff --git a/_source/plugins/clipboard/plugin.js b/_source/plugins/clipboard/plugin.js
index 23c58bf..f3cb0c0 100644 (file)
--- a/_source/plugins/clipboard/plugin.js
+++ b/_source/plugins/clipboard/plugin.js
@@ -68,6 +68,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        {\r
                exec : function( editor, data )\r
                {\r
+                       this.type == 'cut' && fixCut( editor );\r
+\r
                        var success = tryToCutCopy( editor, this.type );\r
 \r
                        if ( !success )\r
@@ -182,18 +184,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        range = new CKEDITOR.dom.range( doc );\r
 \r
                // Create container to paste into\r
-               var pastebin = new CKEDITOR.dom.element( mode == 'text' ? 'textarea' : 'div', doc );\r
+               var pastebin = new CKEDITOR.dom.element( mode == 'text' ? 'textarea' : CKEDITOR.env.webkit ? 'body' : 'div', doc );\r
                pastebin.setAttribute( 'id', 'cke_pastebin' );\r
                // Safari requires a filler node inside the div to have the content pasted into it. (#4882)\r
                CKEDITOR.env.webkit && pastebin.append( doc.createText( '\xa0' ) );\r
                doc.getBody().append( pastebin );\r
 \r
-               // It's definitely a better user experience if we make the paste-bin pretty unnoticed\r
-               // by pulling it off the screen.\r
                pastebin.setStyles(\r
                        {\r
                                position : 'absolute',\r
-                               left : '-1000px',\r
                                // Position the bin exactly at the position of the selected element\r
                                // to avoid any subsequent document scroll.\r
                                top : sel.getStartElement().getDocumentPosition().y + 'px',\r
@@ -202,6 +201,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                overflow : 'hidden'\r
                        });\r
 \r
+               // It's definitely a better user experience if we make the paste-bin pretty unnoticed\r
+               // by pulling it off the screen.\r
+               pastebin.setStyle( this.config.contentsLangDirection == 'ltr' ? 'left' : 'right', '-1000px' );\r
+\r
                var bms = sel.createBookmarks();\r
 \r
                // Turn off design mode temporarily before give focus to the paste bin.\r
@@ -248,6 +251,36 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                }, 0 );\r
        }\r
 \r
+       // Cutting off control type element in IE standards breaks the selection entirely. (#4881)\r
+       function fixCut( editor )\r
+       {\r
+               if ( !CKEDITOR.env.ie || editor.document.$.compatMode == 'BackCompat' )\r
+                       return;\r
+\r
+               var sel = editor.getSelection();\r
+               var control;\r
+               if( ( sel.getType() == CKEDITOR.SELECTION_ELEMENT ) && ( control = sel.getSelectedElement() ) )\r
+               {\r
+                       var range = sel.getRanges()[ 0 ];\r
+                       var dummy = editor.document.createText( '' );\r
+                       dummy.insertBefore( control );\r
+                       range.setStartBefore( dummy );\r
+                       range.setEndAfter( control );\r
+                       sel.selectRanges( [ range ] );\r
+\r
+                       // Clear up the fix if the paste wasn't succeeded.\r
+                       setTimeout( function()\r
+                       {\r
+                               // Element still online?\r
+                               if ( control.getParent() )\r
+                               {\r
+                                       dummy.remove();\r
+                                       sel.selectElement( control );\r
+                               }\r
+                       }, 0 );\r
+               }\r
+       }\r
+\r
        // Register the plugin.\r
        CKEDITOR.plugins.add( 'clipboard',\r
                {\r
@@ -318,7 +351,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        body.on( ( (mode == 'text' && CKEDITOR.env.ie) || CKEDITOR.env.webkit ) ? 'paste' : 'beforepaste',\r
                                                function( evt )\r
                                                {\r
-                                                       if ( depressBeforePasteEvent )\r
+                                                       if ( depressBeforeEvent )\r
                                                                return;\r
 \r
                                                        getClipboardData.call( editor, evt, mode, function ( data )\r
@@ -334,21 +367,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                        } );\r
                                                });\r
 \r
+                                       body.on( 'beforecut', function() { !depressBeforeEvent && fixCut( editor ); } );\r
                                });\r
 \r
                                // If the "contextmenu" plugin is loaded, register the listeners.\r
                                if ( editor.contextMenu )\r
                                {\r
-                                       var depressBeforePasteEvent;\r
+                                       var depressBeforeEvent;\r
                                        function stateFromNamedCommand( command )\r
                                        {\r
-                                               // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste',\r
+                                               // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste(copy/cut)',\r
                                                // guard to distinguish from the ordinary sources( either\r
                                                // keyboard paste or execCommand ) (#4874).\r
-                                               CKEDITOR.env.ie && command == 'Paste'&& ( depressBeforePasteEvent = 1 );\r
+                                               CKEDITOR.env.ie && ( depressBeforeEvent = 1 );\r
 \r
                                                var retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;\r
-                                               depressBeforePasteEvent = 0;\r
+                                               depressBeforeEvent = 0;\r
                                                return retval;\r
                                        }\r
 \r