if ( this.dataProcessor )\r
data = this.dataProcessor.toHtml( data );\r
\r
+ if ( !data )\r
+ return;\r
+\r
// HTML insertion only considers the first range.\r
var selection = this.getSelection(),\r
range = selection.getRanges()[ 0 ];\r
if ( range.checkReadOnly() )\r
return;\r
\r
+ // Opera: force block splitting when pasted content contains block. (#7801)\r
+ if ( CKEDITOR.env.opera )\r
+ {\r
+ var path = new CKEDITOR.dom.elementPath( range.startContainer );\r
+ if ( path.block )\r
+ {\r
+ var nodes = CKEDITOR.htmlParser.fragment.fromHtml( data, false ).children;\r
+ for ( var i = 0, count = nodes.length; i < count; i++ )\r
+ {\r
+ if ( nodes[ i ]._.isBlockLike )\r
+ {\r
+ range.splitBlock( this.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );\r
+ range.insertNode( range.document.createText( '' ) );\r
+ range.select();\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
if ( CKEDITOR.env.ie )\r
{\r
var selIsLocked = selection.isLocked;\r
}\r
}\r
\r
- try\r
- {\r
- $sel.createRange().pasteHTML( data );\r
- }\r
- catch (e) {}\r
+ $sel.createRange().pasteHTML( data );\r
\r
if ( selIsLocked )\r
this.getSelection().lock();\r
&& !pathBlock.is( 'pre' )\r
&& !pathBlock.getBogus() )\r
{\r
- editor.fire( 'updateSnapshot' );\r
- restoreDirty( editor );\r
pathBlock.appendBogus();\r
}\r
}\r
&& blockLimit.getName() == 'body'\r
&& !path.block )\r
{\r
- editor.fire( 'updateSnapshot' );\r
- restoreDirty( editor );\r
- CKEDITOR.env.ie && restoreSelection( selection );\r
-\r
var fixedBlock = range.fixBlock( true,\r
editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );\r
\r
var testPath = new CKEDITOR.dom.elementPath( testRange.startContainer );\r
if ( !testPath.blockLimit.is( 'body') )\r
{\r
- editor.fire( 'updateSnapshot' );\r
- restoreDirty( editor );\r
- CKEDITOR.env.ie && restoreSelection( selection );\r
-\r
var paddingBlock;\r
if ( enterMode != CKEDITOR.ENTER_BR )\r
paddingBlock = body.append( editor.document.createElement( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) );\r
if ( document.location.protocol == 'chrome:' )\r
CKEDITOR.event.useCapture = false;\r
\r
- // The container must be visible when creating the iframe in FF (#5956)\r
- var element = editor.element,\r
- isHidden = CKEDITOR.env.gecko && !element.isVisible(),\r
- previousStyles = {};\r
- if ( isHidden )\r
- {\r
- element.show();\r
- previousStyles = {\r
- position : element.getStyle( 'position' ),\r
- top : element.getStyle( 'top' )\r
- };\r
- element.setStyles( { position : 'absolute', top : '-3000px' } );\r
- }\r
-\r
mainElement.append( iframe );\r
-\r
- if ( isHidden )\r
- {\r
- setTimeout( function()\r
- {\r
- element.hide();\r
- element.setStyles( previousStyles );\r
- }, 1000 );\r
- }\r
};\r
\r
// The script that launches the bootstrap logic on 'domReady', so the document\r
keystrokeHandler.blockedKeystrokes[ 8 ] = !editable;\r
keystrokeHandler.attach( domDocument );\r
\r
- if ( CKEDITOR.env.ie )\r
+ domDocument.getDocumentElement().addClass( domDocument.$.compatMode );\r
+ // Override keystroke behaviors.\r
+ editable && domDocument.on( 'keydown', function( evt )\r
{\r
- domDocument.getDocumentElement().addClass( domDocument.$.compatMode );\r
- // Override keystrokes which should have deletion behavior\r
- // on control types in IE . (#4047)\r
- editable && domDocument.on( 'keydown', function( evt )\r
+ var keyCode = evt.data.getKeystroke();\r
+\r
+ // Backspace OR Delete.\r
+ if ( keyCode in { 8 : 1, 46 : 1 } )\r
{\r
- var keyCode = evt.data.getKeystroke();\r
+ var sel = editor.getSelection(),\r
+ selected = sel.getSelectedElement(),\r
+ range = sel.getRanges()[ 0 ];\r
\r
- // Backspace OR Delete.\r
- if ( keyCode in { 8 : 1, 46 : 1 } )\r
+ // Override keystrokes which should have deletion behavior\r
+ // on fully selected element . (#4047) (#7645)\r
+ if ( selected )\r
{\r
- var sel = editor.getSelection(),\r
- control = sel.getSelectedElement();\r
-\r
- if ( control )\r
- {\r
- // Make undo snapshot.\r
- editor.fire( 'saveSnapshot' );\r
+ // Make undo snapshot.\r
+ editor.fire( 'saveSnapshot' );\r
\r
- // Delete any element that 'hasLayout' (e.g. hr,table) in IE8 will\r
- // break up the selection, safely manage it here. (#4795)\r
- var bookmark = sel.getRanges()[ 0 ].createBookmark();\r
- // Remove the control manually.\r
- control.remove();\r
- sel.selectBookmarks( [ bookmark ] );\r
+ // Delete any element that 'hasLayout' (e.g. hr,table) in IE8 will\r
+ // break up the selection, safely manage it here. (#4795)\r
+ range.moveToPosition( selected, CKEDITOR.POSITION_BEFORE_START );\r
+ // Remove the control manually.\r
+ selected.remove();\r
+ range.select();\r
\r
- editor.fire( 'saveSnapshot' );\r
+ editor.fire( 'saveSnapshot' );\r
\r
- evt.data.preventDefault();\r
- }\r
+ evt.data.preventDefault();\r
+ return;\r
}\r
- } );\r
+ }\r
+ } );\r
\r
- // PageUp/PageDown scrolling is broken in document\r
- // with standard doctype, manually fix it. (#4736)\r
- if ( domDocument.$.compatMode == 'CSS1Compat' )\r
+ // PageUp/PageDown scrolling is broken in document\r
+ // with standard doctype, manually fix it. (#4736)\r
+ if ( CKEDITOR.env.ie && domDocument.$.compatMode == 'CSS1Compat' )\r
+ {\r
+ var pageUpDownKeys = { 33 : 1, 34 : 1 };\r
+ domDocument.on( 'keydown', function( evt )\r
{\r
- var pageUpDownKeys = { 33 : 1, 34 : 1 };\r
- domDocument.on( 'keydown', function( evt )\r
+ if ( evt.data.getKeystroke() in pageUpDownKeys )\r
{\r
- if ( evt.data.getKeystroke() in pageUpDownKeys )\r
+ setTimeout( function ()\r
{\r
- setTimeout( function ()\r
- {\r
- editor.getSelection().scrollIntoView();\r
- }, 0 );\r
- }\r
- } );\r
- }\r
+ editor.getSelection().scrollIntoView();\r
+ }, 0 );\r
+ }\r
+ } );\r
+ }\r
\r
- // Prevent IE from leaving new paragraph after deleting all contents in body. (#6966)\r
- editor.config.enterMode != CKEDITOR.ENTER_P\r
- && domDocument.on( 'selectionchange', function()\r
- {\r
- var body = domDocument.getBody(),\r
- range = editor.getSelection().getRanges()[ 0 ];\r
+ // Prevent IE from leaving new paragraph after deleting all contents in body. (#6966)\r
+ if ( CKEDITOR.env.ie && editor.config.enterMode != CKEDITOR.ENTER_P )\r
+ {\r
+ domDocument.on( 'selectionchange', function()\r
+ {\r
+ var body = domDocument.getBody(),\r
+ range = editor.getSelection().getRanges()[ 0 ];\r
\r
- if ( body.getHtml().match( /^<p> <\/p>$/i )\r
- && range.startContainer.equals( body ) )\r
+ if ( body.getHtml().match( /^<p> <\/p>$/i )\r
+ && range.startContainer.equals( body ) )\r
+ {\r
+ // Avoid the ambiguity from a real user cursor position.\r
+ setTimeout( function ()\r
{\r
- // Avoid the ambiguity from a real user cursor position.\r
- setTimeout( function ()\r
+ range = editor.getSelection().getRanges()[ 0 ];\r
+ if ( !range.startContainer.equals ( 'body' ) )\r
{\r
- range = editor.getSelection().getRanges()[ 0 ];\r
- if ( !range.startContainer.equals ( 'body' ) )\r
- {\r
- body.getFirst().remove( 1 );\r
- range.moveToElementEditEnd( body );\r
- range.select( 1 );\r
- }\r
- }, 0 );\r
- }\r
- });\r
+ body.getFirst().remove( 1 );\r
+ range.moveToElementEditEnd( body );\r
+ range.select( 1 );\r
+ }\r
+ }, 0 );\r
+ }\r
+ });\r
}\r
\r
// Adds the document body as a context menu target.\r
if ( fireMode )\r
{\r
editor.mode = 'wysiwyg';\r
- editor.fire( 'mode' );\r
+ editor.fire( 'mode', { previousMode : editor._.previousMode } );\r
fireMode = false;\r
}\r
\r
\r
if ( isLoadingData )\r
isPendingFocus = true;\r
- // Temporary solution caused by #6025, supposed be unified by #6154.\r
- else if ( CKEDITOR.env.opera && editor.document )\r
- {\r
- // Required for Opera when switching focus\r
- // from another iframe, e.g. panels. (#6444)\r
- var iframe = editor.window.$.frameElement;\r
- iframe.blur(), iframe.focus();\r
- editor.document.getBody().focus();\r
-\r
- editor.selectionChange();\r
- }\r
- else if ( !CKEDITOR.env.opera && win )\r
+ else if ( win )\r
{\r
// AIR needs a while to focus when moving from a link.\r
CKEDITOR.env.air ? setTimeout( function () { win.focus(); }, 0 ) : win.focus();\r
editor.on( 'insertElement', onInsert( doInsertElement ), null, null, 20 );\r
editor.on( 'insertText', onInsert( doInsertText ), null, null, 20 );\r
// Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)\r
- editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );\r
+ editor.on( 'selectionChange', function( evt )\r
+ {\r
+ if ( editor.readOnly )\r
+ return;\r
+\r
+ var sel = editor.getSelection();\r
+ // Do it only when selection is not locked. (#8222)\r
+ if ( sel && !sel.isLocked )\r
+ {\r
+ var isDirty = editor.checkDirty();\r
+ editor.fire( 'saveSnapshot', { contentOnly : 1 } );\r
+ onSelectionChangeFixBody.call( this, evt );\r
+ editor.fire( 'updateSnapshot' );\r
+ !isDirty && editor.resetDirty();\r
+ }\r
+\r
+ }, null, null, 1 );\r
});\r
\r
var titleBackup;\r
{\r
// We should flag that the element was locked by our code so\r
// it'll be editable by the editor functions (#6046).\r
- if ( !element.isReadOnly() )\r
+ var readonly = element.getAttribute( 'contenteditable' ) == 'false';\r
+ if ( !readonly )\r
+ {\r
element.data( 'cke-editable', element.hasAttribute( 'contenteditable' ) ? 'true' : '1' );\r
- element.setAttribute( 'contentEditable', false );\r
+ element.setAttribute( 'contenteditable', false );\r
+ }\r
}\r
});\r
\r
Got questions, comments, patches, etc.? Contact Jason Woofenden