Commit 35268dec authored by Stanislas Rolland's avatar Stanislas Rolland Committed by Wouter Wolters
Browse files

[BUGFIX] Click-enlarge problem when an image is inside ul li OR ol li

lib.parseFunc_RTE is not correctly configured by css_styled_content.
ul and ol elements must be recursively parsed through lib.parseFunc_RTE
(not lib.parseFunc). li element must be included in
nonTypoTagStdWrap.encapsLines.encapsTagList so that unwrapped content
of li elements is not wrapped in paragraphs.

Releases: master, 6.2
Resolves: #61954
Change-Id: I916b385d32a11909f7c0b9b9458d86237da1be1b
Reviewed-on: http://review.typo3.org/33613


Reviewed-by: default avatarMarkus Klein <klein.t3@reelworx.at>
Tested-by: default avatarMarkus Klein <klein.t3@reelworx.at>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
parent b7be26da
......@@ -114,12 +114,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -147,12 +141,14 @@ lib.parseFunc_RTE {
nav < .div
section < .div
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......
......@@ -100,12 +100,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -122,12 +116,14 @@ lib.parseFunc_RTE {
div.stripNL = 1
div.callRecursive = 1
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......@@ -1848,4 +1844,4 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
/* Fix for unordered and ordered list with image "In text, left" */
.csc-textpic-intext-left ol, .csc-textpic-intext-left ul {padding-left: 40px; overflow: auto; }
)
\ No newline at end of file
)
......@@ -100,12 +100,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -126,12 +120,14 @@ lib.parseFunc_RTE {
div.stripNL = 1
div.callRecursive = 1
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......@@ -1741,4 +1737,4 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
/* Fix for unordered and ordered list with image "In text, left" */
.csc-textpic-intext-left ol, .csc-textpic-intext-left ul {padding-left: 40px; overflow: auto; }
)
\ No newline at end of file
)
......@@ -114,12 +114,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -147,12 +141,14 @@ lib.parseFunc_RTE {
nav < .div
section < .div
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......@@ -2222,4 +2218,4 @@ plugin.tx_cssstyledcontent._CSS_DEFAULT_STYLE (
TABLE.contenttable-color-242 { background-color: {$styles.content.table.backgroundColor.242}; }
TABLE.contenttable-color-243 { background-color: {$styles.content.table.backgroundColor.243}; }
TABLE.contenttable-color-244 { background-color: {$styles.content.table.backgroundColor.244}; }
)
\ No newline at end of file
)
......@@ -114,12 +114,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -147,12 +141,14 @@ lib.parseFunc_RTE {
nav < .div
section < .div
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......
......@@ -114,12 +114,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -147,12 +141,14 @@ lib.parseFunc_RTE {
nav < .div
section < .div
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......
......@@ -114,12 +114,6 @@ lib.parseFunc_RTE {
blockquote.callRecursive.tagStdWrap.HTMLparser = 1
blockquote.callRecursive.tagStdWrap.HTMLparser.tags.blockquote.overrideAttribs = style="margin-bottom:0;margin-top:0;"
ol.stripNL=1
ol.stdWrap.parseFunc = < lib.parseFunc
ul.stripNL=1
ul.stdWrap.parseFunc = < lib.parseFunc
table.stripNL=1
table.stdWrap.HTMLparser = 1
table.stdWrap.HTMLparser.tags.table.fixAttrib.class {
......@@ -147,12 +141,14 @@ lib.parseFunc_RTE {
nav < .div
section < .div
# Definition list processing
# List processing
dl < .div
dd < .div
ol < .div
ul < .div
}
nonTypoTagStdWrap.encapsLines {
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt,li
remapTag.DIV = P
nonWrappedTag = P
innerStdWrap_all.ifBlank = &nbsp;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment