Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.0.2
[ckeditor.git]
/
_source
/
core
/
dtd.js
diff --git
a/_source/core/dtd.js
b/_source/core/dtd.js
index
6e83bf8
..
45e801c
100644
(file)
--- a/
_source/core/dtd.js
+++ b/
_source/core/dtd.js
@@
-66,6
+66,8
@@
CKEDITOR.dtd = (function()
*/
\r
$block : block,
\r
\r
*/
\r
$block : block,
\r
\r
+ $inline : L, // Just like span.
\r
+
\r
$body : X({script:1}, block),
\r
\r
$cdata : {script:1,style:1},
\r
$body : X({script:1}, block),
\r
\r
$cdata : {script:1,style:1},
\r
@@
-97,7
+99,7
@@
CKEDITOR.dtd = (function()
* @type Object
\r
* @example
\r
*/
\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},
\r
+ $nonEditable : {applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1,param:1},
\r
\r
/**
\r
* List of elements that can be ignored if empty, like "b" or "span".
\r
\r
/**
\r
* List of elements that can be ignored if empty, like "b" or "span".
\r
@@
-144,7
+146,7
@@
CKEDITOR.dtd = (function()
form : X(A,D,E,I),
\r
select : {optgroup:1,option:1},
\r
font : L,
\r
form : X(A,D,E,I),
\r
select : {optgroup:1,option:1},
\r
font : L,
\r
- ins : P,
\r
+ ins : L,
\r
menu : Q,
\r
abbr : L,
\r
label : L,
\r
menu : Q,
\r
abbr : L,
\r
label : L,
\r
@@
-179,7
+181,7
@@
CKEDITOR.dtd = (function()
map : X({area:1,form:1,p:1},A,F,E),
\r
applet : O,
\r
dl : {dt:1,dd:1},
\r
map : X({area:1,form:1,p:1},A,F,E),
\r
applet : O,
\r
dl : {dt:1,dd:1},
\r
- del : P,
\r
+ del : L,
\r
isindex : {},
\r
fieldset : X({legend:1},K),
\r
thead : M,
\r
isindex : {},
\r
fieldset : X({legend:1},K),
\r
thead : M,
\r