}\r
}\r
\r
- // When enterMode set to block, we'll establing new paragraph only if we're\r
- // selecting inline contents right under body. (#3657)\r
- if ( enterMode != CKEDITOR.ENTER_BR\r
- && range.collapsed\r
- && blockLimit.getName() == 'body'\r
- && !path.block )\r
+ // When we're in block enter mode, a new paragraph will be established\r
+ // to encapsulate inline contents right under body. (#3657)\r
+ if ( editor.config.autoParagraph !== false\r
+ && enterMode != CKEDITOR.ENTER_BR\r
+ && range.collapsed\r
+ && blockLimit.getName() == 'body'\r
+ && !path.block )\r
{\r
editor.fire( 'updateSnapshot' );\r
restoreDirty( editor );\r
\r
init : function( editor )\r
{\r
- var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )\r
+ var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR && editor.config.autoParagraph !== false )\r
? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;\r
\r
var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );\r
\r
body.spellcheck = !editor.config.disableNativeSpellChecker;\r
\r
+ var editable = !editor.readOnly;\r
+\r
if ( CKEDITOR.env.ie )\r
{\r
// Don't display the focus border.\r
// Disable and re-enable the body to avoid IE from\r
// taking the editing focus at startup. (#141 / #523)\r
body.disabled = true;\r
- body.contentEditable = true;\r
+ body.contentEditable = editable;\r
body.removeAttribute( 'disabled' );\r
}\r
else\r
// Prefer 'contentEditable' instead of 'designMode'. (#3593)\r
if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900\r
|| CKEDITOR.env.opera )\r
- domDocument.$.body.contentEditable = true;\r
+ domDocument.$.body.contentEditable = editable;\r
else if ( CKEDITOR.env.webkit )\r
- domDocument.$.body.parentNode.contentEditable = true;\r
+ domDocument.$.body.parentNode.contentEditable = editable;\r
else\r
- domDocument.$.designMode = 'on';\r
+ domDocument.$.designMode = editable? 'off' : 'on';\r
}, 0 );\r
}\r
\r
- CKEDITOR.env.gecko && CKEDITOR.tools.setTimeout( activateEditing, 0, null, editor );\r
+ editable && CKEDITOR.env.gecko && CKEDITOR.tools.setTimeout( activateEditing, 0, null, editor );\r
\r
domWindow = editor.window = new CKEDITOR.dom.window( domWindow );\r
domDocument = editor.document = new CKEDITOR.dom.document( domDocument );\r
\r
- domDocument.on( 'dblclick', function( evt )\r
+ editable && domDocument.on( 'dblclick', function( evt )\r
{\r
var element = evt.data.getTarget(),\r
data = { element : element, dialog : '' };\r
\r
// IE standard compliant in editing frame doesn't focus the editor when\r
// clicking outside actual content, manually apply the focus. (#1659)\r
- if ( CKEDITOR.env.ie\r
- && domDocument.$.compatMode == 'CSS1Compat'\r
+ if ( editable &&\r
+ CKEDITOR.env.ie && domDocument.$.compatMode == 'CSS1Compat'\r
|| CKEDITOR.env.gecko\r
|| CKEDITOR.env.opera )\r
{\r
{\r
var doc = editor.document;\r
\r
- if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )\r
+ if ( editable && CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )\r
blinkCursor();\r
else if ( CKEDITOR.env.opera )\r
doc.getBody().focus();\r
});\r
\r
var keystrokeHandler = editor.keystrokeHandler;\r
- if ( keystrokeHandler )\r
- keystrokeHandler.attach( domDocument );\r
+ // Prevent backspace from navigating off the page.\r
+ keystrokeHandler.blockedKeystrokes[ 8 ] = !editable;\r
+ keystrokeHandler.attach( domDocument );\r
\r
if ( CKEDITOR.env.ie )\r
{\r
domDocument.getDocumentElement().addClass( domDocument.$.compatMode );\r
// Override keystrokes which should have deletion behavior\r
// on control types in IE . (#4047)\r
- domDocument.on( 'keydown', function( evt )\r
+ editable && domDocument.on( 'keydown', function( evt )\r
{\r
var keyCode = evt.data.getKeystroke();\r
\r
{\r
editor.docType = docType = match;\r
return '';\r
+ }).replace( /<\?xml\s[^\?]*\?>/i, function( match )\r
+ {\r
+ editor.xmlDeclaration = match;\r
+ return '';\r
});\r
}\r
\r
var config = editor.config,\r
fullPage = config.fullPage,\r
docType = fullPage && editor.docType,\r
+ xmlDeclaration = fullPage && editor.xmlDeclaration,\r
doc = iframe.getFrameDocument();\r
\r
var data = fullPage\r
if ( config.ignoreEmptyParagraph )\r
data = data.replace( emptyParagraphRegexp, function( match, lookback ) { return lookback; } );\r
\r
+ if ( xmlDeclaration )\r
+ data = xmlDeclaration + '\n' + data;\r
if ( docType )\r
data = docType + '\n' + data;\r
\r
editor.document.$.title = frameLabel;\r
});\r
\r
+ editor.on( 'readOnly', function()\r
+ {\r
+ if ( editor.mode == 'wysiwyg' )\r
+ {\r
+ // Symply reload the wysiwyg area. It'll take care of read-only.\r
+ var wysiwyg = editor.getMode();\r
+ wysiwyg.loadData( wysiwyg.getData() );\r
+ }\r
+ });\r
+\r
// IE>=8 stricts mode doesn't have 'contentEditable' in effect\r
// on element unless it has layout. (#5562)\r
if ( CKEDITOR.document.$.documentMode >= 8 )\r
}\r
// Set the HTML style to 100% to have the text cursor in affect (#6341)\r
else if ( CKEDITOR.env.gecko )\r
+ {\r
editor.addCss( 'html { height: 100% !important; }' );\r
+ editor.addCss( 'img:-moz-broken { -moz-force-broken-image-icon : 1; width : 24px; height : 24px; }' );\r
+ }\r
+\r
+ /* #3658: [IE6] Editor document has horizontal scrollbar on long lines\r
+ To prevent this misbehavior, we show the scrollbar always */\r
+ /* #6341: The text cursor must be set on the editor area. */\r
+ /* #6632: Avoid having "text" shape of cursor in IE7 scrollbars.*/\r
+ editor.addCss( 'html { _overflow-y: scroll; cursor: text; *cursor:auto;}' );\r
+ // Use correct cursor for these elements\r
+ editor.addCss( 'img, input, textarea { cursor: default;}' );\r
\r
// Switch on design mode for a short while and close it after then.\r
function blinkCursor( retry )\r
{\r
+ if ( editor.readOnly )\r
+ return;\r
+\r
CKEDITOR.tools.tryThese(\r
function()\r
{\r
*/\r
\r
/**\r
+ * Whether automatically create wrapping blocks around inline contents inside document body,\r
+ * this helps to ensure the integrality of the block enter mode.\r
+ * <strong>Note:</strong> Changing the default value might introduce unpredictable usability issues.\r
+ * @name CKEDITOR.config.autoParagraph\r
+ * @since 3.6\r
+ * @type Boolean\r
+ * @default true\r
+ * @example\r
+ * config.autoParagraph = false;\r
+ */\r
+\r
+/**\r
* Fired when some elements are added to the document\r
* @name CKEDITOR.editor#ariaWidget\r
* @event\r
Got questions, comments, patches, etc.? Contact Jason Woofenden