var nonExitableElementNames = { table:1,pre:1 };\r
\r
// Matching an empty paragraph at the end of document.\r
- var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center|li)[^>]*>\s*(?:<br[^>]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;\r
+ var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:<br[^>]*>| |\u00A0| )?\s*(:?<\/\1>)?(?=\s*$|<\/body>)/gi;\r
\r
var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );\r
\r
+ function checkReadOnly( selection )\r
+ {\r
+ if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )\r
+ return selection.getSelectedElement().isReadOnly();\r
+ else\r
+ return selection.getCommonAncestor().isReadOnly();\r
+ }\r
+\r
function onInsertHtml( evt )\r
{\r
if ( this.mode == 'wysiwyg' )\r
{\r
this.focus();\r
- this.fire( 'saveSnapshot' );\r
\r
- var selection = this.getSelection(),\r
- data = evt.data;\r
+ var selection = this.getSelection();\r
+ if ( checkReadOnly( selection ) )\r
+ return;\r
+\r
+ var data = evt.data;\r
+ this.fire( 'saveSnapshot' );\r
\r
if ( this.dataProcessor )\r
data = this.dataProcessor.toHtml( data );\r
selection.unlock();\r
\r
var $sel = selection.getNative();\r
+\r
+ // Delete control selections to avoid IE bugs on pasteHTML.\r
if ( $sel.type == 'Control' )\r
$sel.clear();\r
- $sel.createRange().pasteHTML( data );\r
+ else if ( selection.getType() == CKEDITOR.SELECTION_TEXT )\r
+ {\r
+ // Due to IE bugs on handling contenteditable=false blocks\r
+ // (#6005), we need to make some checks and eventually\r
+ // delete the selection first.\r
+\r
+ var range = selection.getRanges()[0],\r
+ endContainer = range && range.endContainer;\r
+\r
+ if ( endContainer &&\r
+ endContainer.type == CKEDITOR.NODE_ELEMENT &&\r
+ endContainer.getAttribute( 'contenteditable' ) == 'false' &&\r
+ range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) )\r
+ {\r
+ range.setEndAfter( range.endContainer );\r
+ range.deleteContents();\r
+ }\r
+ }\r
+\r
+ try\r
+ {\r
+ $sel.createRange().pasteHTML( data );\r
+ }\r
+ catch (e) {}\r
\r
if ( selIsLocked )\r
this.getSelection().lock();\r
if ( this.mode == 'wysiwyg' )\r
{\r
this.focus();\r
+\r
+ var selection = this.getSelection();\r
+ if ( checkReadOnly( selection ) )\r
+ return;\r
+\r
this.fire( 'saveSnapshot' );\r
\r
- var element = evt.data,\r
+ var ranges = selection.getRanges(),\r
+ element = evt.data,\r
elementName = element.getName(),\r
isBlock = CKEDITOR.dtd.$block[ elementName ];\r
\r
- var selection = this.getSelection(),\r
- ranges = selection.getRanges();\r
-\r
var selIsLocked = selection.isLocked;\r
\r
if ( selIsLocked )\r
function restoreDirty( editor )\r
{\r
if ( !editor.checkDirty() )\r
- setTimeout( function(){ editor.resetDirty(); } );\r
+ setTimeout( function(){ editor.resetDirty(); }, 0 );\r
}\r
\r
var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ),\r
{\r
restoreDirty( editor );\r
\r
+ // Memorize scroll position to restore it later (#4472).\r
+ var hostDocument = editor.element.getDocument();\r
+ var hostDocumentElement = hostDocument.getDocumentElement();\r
+ var scrollTop = hostDocumentElement.$.scrollTop;\r
+ var scrollLeft = hostDocumentElement.$.scrollLeft;\r
+\r
// Simulating keyboard character input by dispatching a keydown of white-space text.\r
var keyEventSimulate = doc.$.createEvent( "KeyEvents" );\r
keyEventSimulate.initKeyEvent( 'keypress', true, true, win.$, false,\r
false, false, false, 0, 32 );\r
doc.$.dispatchEvent( keyEventSimulate );\r
\r
+ if ( scrollTop != hostDocumentElement.$.scrollTop || scrollLeft != hostDocumentElement.$.scrollLeft )\r
+ hostDocument.getWindow().$.scrollTo( scrollLeft, scrollTop );\r
+\r
// Restore the original document status by placing the cursor before a bogus br created (#5021).\r
bodyChildsNum && body.getFirst().remove();\r
doc.getBody().appendBogus();\r
' allowTransparency="true"' +\r
'></iframe>' );\r
\r
+ // Running inside of Firefox chrome the load event doesn't bubble like in a normal page (#5689)\r
+ if ( document.location.protocol == 'chrome:' )\r
+ CKEDITOR.event.useCapture = true;\r
+\r
// With FF, it's better to load the data on iframe.load. (#3894,#4058)\r
iframe.on( 'load', function( ev )\r
{\r
doc.close();\r
});\r
\r
+ // Reset adjustment back to default (#5689)\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
} );\r
}\r
\r
+ // Prevent the browser opening links in read-only blocks. (#6032)\r
+ domDocument.on( 'click', function( ev )\r
+ {\r
+ ev = ev.data;\r
+ if ( ev.getTarget().is( 'a' ) && ev.$.button != 2 )\r
+ ev.preventDefault();\r
+ });\r
+\r
// Webkit: avoid from editing form control elements content.\r
if ( CKEDITOR.env.webkit )\r
{\r
{\r
if ( isLoadingData )\r
isPendingFocus = true;\r
- else if ( editor.window )\r
+ // Temporary solution caused by #6025, supposed be unified by #6154.\r
+ else if ( CKEDITOR.env.opera && editor.document )\r
+ {\r
+ editor.document.getBody().focus();\r
+\r
+ editor.selectionChange();\r
+ }\r
+ else if ( !CKEDITOR.env.opera && editor.window )\r
{\r
editor.window.focus();\r
\r
if ( element.type == CKEDITOR.NODE_ELEMENT\r
&& ( element.is( 'input' ) || element.is( 'textarea' ) ) )\r
{\r
- element.setAttribute( 'contentEditable', false );\r
+ if ( !element.isReadOnly() )\r
+ {\r
+ element.setAttribute( 'contentEditable', false );\r
+ // We should flag that the element was locked by our code so\r
+ // it'll be editable by the editor functions (#6046).\r
+ element.setCustomData( '_cke_notReadOnly', 1 );\r
+ }\r
}\r
});\r
\r
Got questions, comments, patches, etc.? Contact Jason Woofenden