X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fconfig.js;h=f7a2ad7c876f8f6ab361d5f784d479ab3acd0880;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hp=caa8d539598fcdb7ccf969e2fb5adf72a2f7e10e;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git diff --git a/_source/core/config.js b/_source/core/config.js index caa8d53..f7a2ad7 100644 --- a/_source/core/config.js +++ b/_source/core/config.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -40,7 +40,7 @@ CKEDITOR.config = * // Do not load any custom configuration file. * CKEDITOR.replace( 'myfiled', { customConfig : '' } ); */ - customConfig : CKEDITOR.getUrl( 'config.js' ), + customConfig : 'config.js', /** * Whether the replaced element (usually a textarea) is to be updated @@ -63,13 +63,14 @@ CKEDITOR.config = baseHref : '', /** - * The CSS file to be used to apply style to the contents. It should + * The CSS file(s) to be used to apply style to the contents. It should * reflect the CSS used in the final pages where the contents are to be * used. - * @type String + * @type String|Array * @default '<CKEditor folder>/contents.css' * @example * config.contentsCss = '/css/mysitestyles.css'; + * config.contentsCss = ['/css/mysitestyles.css', '/css/anotherfile.css']; */ contentsCss : CKEDITOR.basePath + 'contents.css', @@ -166,6 +167,20 @@ CKEDITOR.config = docType : '', /** + * Sets the 'id' attribute to be used on body if it doesn't have one. + * @type String + * @default '' + */ + bodyId : '', + + /** + * Sets the 'class' attribute to be used on body if it doesn't have one. + * @type String + * @default '' + */ + bodyClass : '', + + /** * Indicates whether the contents to be edited are being inputted as a full * HTML page. A full page includes the <html>, <head> and * <body> tags. The final output will also reflect this setting, @@ -178,13 +193,14 @@ CKEDITOR.config = fullPage : false, /** - * The editor height, in CSS size format or pixel integer. + * The height of editing area( content ), in relative or absolute, e.g. 30px, 5em. + * Note: Percentage unit is not supported yet. e.g. 30%. * @type Number|String * @default '200' * @example * config.height = 500; - * @example * config.height = '25em'; + * config.height = '300px'; */ height : 200, @@ -196,7 +212,7 @@ CKEDITOR.config = * @type String * @example */ - plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc', + plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,div,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,showborders,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc', /** * List of additional plugins to be loaded. This is a tool setting which @@ -281,7 +297,6 @@ CKEDITOR.config = * config.baseFloatZIndex = 2000 */ baseFloatZIndex : 10000 - }; // PACKAGER_RENAME( CKEDITOR.config )