B = {input:1,button:1,select:1,textarea:1,label:1},\r
C = X({a:1},B),\r
D = X({iframe:1},C),\r
- 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},\r
+ E = {hr:1,ul:1,menu:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist: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},\r
F = {ins:1,del:1,script:1,style:1},\r
- 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),\r
- H = X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1},G),\r
+ 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,wbr:1},F),\r
+ H = X({sub:1,img:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1,mark:1},G),\r
I = X({p:1},H),\r
J = X({iframe:1},H,B),\r
- K = {img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},\r
+ K = {img:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,mark:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1},\r
\r
L = X({a:1},J),\r
M = {tr:1},\r
U = {head:1,body:1},\r
V = {html:1};\r
\r
- var block = {address:1,blockquote:1,center:1,dir:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,menu:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};\r
+ var block = {address:1,blockquote:1,center:1,dir:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};\r
\r
return /** @lends CKEDITOR.dtd */ {\r
\r
* @type Object\r
* @example\r
*/\r
- $blockLimit : { body:1,div:1,td:1,th:1,caption:1,form:1 },\r
+ $blockLimit : { body:1,div:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,audio:1,video:1,details:1,datagrid:1,datalist:1,td:1,th:1,caption:1,form:1 },\r
\r
/**\r
* List of inline (<span> like) elements.\r
* @type Object\r
* @example\r
*/\r
- $empty : {area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1},\r
+ $empty : {area:1,base:1,br:1,col:1,hr:1,img:1,input:1,link:1,meta:1,param:1,wbr:1},\r
\r
/**\r
* List of list item elements, like "li" or "dd".\r
$listItem : {dd:1,dt:1,li:1},\r
\r
/**\r
- * List of list root elements.\r
- * @type Object\r
- * @example\r
- */\r
- $list: { ul:1,ol:1,dl:1},\r
+ * List of list root elements.\r
+ * @type Object\r
+ * @example\r
+ */\r
+ $list: {ul:1,ol:1,dl:1},\r
\r
/**\r
* Elements that accept text nodes, but are not possible to edit into\r
* @type Object\r
* @example\r
*/\r
- $nonEditable : {applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1},\r
+ $nonEditable : {applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1,audio:1,video:1},\r
+\r
+ /**\r
+ * List of block tags with each one a singleton element lives in the corresponding structure for description.\r
+ */\r
+ $captionBlock : { caption:1, legend:1 },\r
\r
/**\r
* List of elements that can be ignored if empty, like "b" or "span".\r
* @type Object\r
* @example\r
*/\r
- $removeEmpty : {abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1},\r
+ $removeEmpty : {abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1,mark:1},\r
\r
/**\r
* List of elements that have tabindex set to zero by default.\r
noscript : P,\r
td : P,\r
br : {},\r
+ wbr : {},\r
th : P,\r
center : P,\r
kbd : L,\r
pre : X(G,C),\r
p : L,\r
em : L,\r
- dfn : L\r
+ dfn : L,\r
+ //HTML5\r
+ section : P,\r
+ header : P,\r
+ footer : P,\r
+ nav : P,\r
+ article : P,\r
+ aside : P,\r
+ figure: P,\r
+ dialog : P,\r
+ hgroup : P,\r
+ mark : L,\r
+ time : L,\r
+ meter : L,\r
+ menu : L,\r
+ command : L,\r
+ keygen : L,\r
+ output : L,\r
+ progress : O,\r
+ audio : O,\r
+ video : O,\r
+ details : O,\r
+ datagrid : O,\r
+ datalist : O\r
};\r
})();\r
\r
Got questions, comments, patches, etc.? Contact Jason Woofenden