X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fcore%2Fdtd.js;h=970a16a0fc5c0e8be972f749a2725cd0081bf581;hb=1056598c95187351dc58f4991d331e2258d038b5;hp=f569ed09573217fe6d1e1ea482414233041fe8c2;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git diff --git a/_source/core/dtd.js b/_source/core/dtd.js index f569ed0..970a16a 100644 --- a/_source/core/dtd.js +++ b/_source/core/dtd.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -10,16 +10,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license */ /** - * Holds and object representation of the HTML DTD to be used by the editor in - * its internal operations. - * - * Each element in the DTD is represented by a - * property in this object. Each property contains the list of elements that - * can be contained by the element. Text is represented by the "#" property. - * + * @namespace Holds and object representation of the HTML DTD to be used by the + * editor in its internal operations.
+ *
+ * Each element in the DTD is represented by a property in this object. Each + * property contains the list of elements that can be contained by the element. + * Text is represented by the "#" property.
+ *
* Several special grouping properties are also available. Their names start * with the "$" character. - * @namespace * @example * // Check if "div" can be contained in a "p" element. * alert( !!CKEDITOR.dtd[ 'p' ][ 'div' ] ); "false" @@ -39,7 +38,7 @@ CKEDITOR.dtd = (function() C = X({a:1},B), D = X({iframe:1},C), E = {hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1}, - F = {ins:1,del:1,script:1}, + F = {ins:1,del:1,script:1,style:1}, G = X({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1},F), H = X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G), I = X({p:1},H), @@ -81,8 +80,14 @@ CKEDITOR.dtd = (function() */ $blockLimit : { body:1,div:1,td:1,th:1,caption:1,form:1 }, + /** + * List of inline (<span> like) elements. + */ $inline : L, // Just like span. + /** + * list of elements that can be children at <body>. + */ $body : X({script:1,style:1}, block), $cdata : {script:1,style:1}, @@ -176,7 +181,6 @@ CKEDITOR.dtd = (function() label : L, table : {thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1}, code : L, - script : N, tfoot : M, cite : L, li : P,