wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-12-26 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
mediawiki-extensions-Discus.../tests/cases/wrappers/wrappers-formatted-desktop.html

292 lines
58 KiB
HTML
Raw Normal View History

Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="paragraph" data-mw-thread-id="h-paragraph-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-paragraph-2020-01-22T23:19:00.000Z"></span>paragraph<span data-mw-comment-end="h-paragraph-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-paragraph">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
<p><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-paragraph"></span>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-paragraph"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-paragraph"></span></p>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="preformatted" data-mw-thread-id="h-preformatted-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-preformatted-2020-01-22T23:19:00.000Z"></span>preformatted<span data-mw-comment-end="h-preformatted-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-preformatted">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
<pre><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-preformatted"></span>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-preformatted"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-preformatted"></span></pre>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="div_with_one_comment" data-mw-thread-id="h-div_with_one_comment-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-div_with_one_comment-2020-01-22T23:19:00.000Z"></span>div with one comment<span data-mw-comment-end="h-div_with_one_comment-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<div style="background: beige;"><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment"></span>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment"></span>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
</div>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="two_divs_with_one_comment" data-mw-thread-id="h-two_divs_with_one_comment-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-two_divs_with_one_comment-2020-01-22T23:19:00.000Z"></span>two divs with one comment<span data-mw-comment-end="h-two_divs_with_one_comment-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<div style="background: beige;"><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment"></span>
More test cases for comment wrappers (multiple siblings) For a moment I doubted if we handle this case correctly, but in fact I didn't botch that code *this* badly. Change-Id: I5a9d142e4bd97ac40aa388bb43b65ab1286e3f18
2021-02-02 23:03:45 +00:00
blah
</div>
<div style="background: beige;">
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment"></span>
More test cases for comment wrappers (multiple siblings) For a moment I doubted if we handle this case correctly, but in fact I didn't botch that code *this* badly. Change-Id: I5a9d142e4bd97ac40aa388bb43b65ab1286e3f18
2021-02-02 23:03:45 +00:00
</div>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="div_with_one_comment-htmlcomments" data-mw-thread-id="h-div_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-div_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z"></span>div with one comment, and some HTML comments<span data-mw-comment-end="h-div_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-htmlcomments">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
<div style="background: beige;">
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<i><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-htmlcomments"></span>hello</i><br/>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
<small>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)</small><!-- blah --><span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-htmlcomments"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-htmlcomments"></span>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
</div><!-- blah -->
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="two_divs_with_one_comment-htmlcomments" data-mw-thread-id="h-two_divs_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-two_divs_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z"></span>two divs with one comment, and some HTML comments<span data-mw-comment-end="h-two_divs_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment-htmlcomments">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<div style="background: beige;"><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment-htmlcomments"></span>
More test cases for comment wrappers (multiple siblings) For a moment I doubted if we handle this case correctly, but in fact I didn't botch that code *this* badly. Change-Id: I5a9d142e4bd97ac40aa388bb43b65ab1286e3f18
2021-02-02 23:03:45 +00:00
blah
</div>
<!-- blah -->
<div style="background: beige;">
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment-htmlcomments"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment-htmlcomments"></span>
More test cases for comment wrappers (multiple siblings) For a moment I doubted if we handle this case correctly, but in fact I didn't botch that code *this* badly. Change-Id: I5a9d142e4bd97ac40aa388bb43b65ab1286e3f18
2021-02-02 23:03:45 +00:00
</div><!-- blah -->
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="div_with_one_comment-list_end" data-mw-thread-id="h-div_with_one_comment-list_end-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-div_with_one_comment-list_end-2020-01-22T23:19:00.000Z"></span>div with one comment, ends with a list<span data-mw-comment-end="h-div_with_one_comment-list_end-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_end">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Fix replying outside wrappers for partially indented comments Top-level comments that start or end with a list (inconsistent indentation) would not have triggered the logic for detecting wrappers. Bug: T273692 Change-Id: Idcb4eed73e391f5f86eca2eb05cb3cea0d86f30a
2021-02-08 20:52:30 +00:00
<div style="background: beige;">
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<p><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_end"></span>hello</p>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
<ul><li>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_end"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_end"></span></li></ul>
Fix replying outside wrappers for partially indented comments Top-level comments that start or end with a list (inconsistent indentation) would not have triggered the logic for detecting wrappers. Bug: T273692 Change-Id: Idcb4eed73e391f5f86eca2eb05cb3cea0d86f30a
2021-02-08 20:52:30 +00:00
</div>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="div_with_one_comment-list_start" data-mw-thread-id="h-div_with_one_comment-list_start-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-div_with_one_comment-list_start-2020-01-22T23:19:00.000Z"></span>div with one comment, starts with a list<span data-mw-comment-end="h-div_with_one_comment-list_start-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_start">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Fix replying outside wrappers for partially indented comments Top-level comments that start or end with a list (inconsistent indentation) would not have triggered the logic for detecting wrappers. Bug: T273692 Change-Id: Idcb4eed73e391f5f86eca2eb05cb3cea0d86f30a
2021-02-08 20:52:30 +00:00
<div style="background: beige;">
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<ul><li><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_start"></span>hello</li></ul>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
<p>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_start"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_start"></span></p>
Fix replying outside wrappers for partially indented comments Top-level comments that start or end with a list (inconsistent indentation) would not have triggered the logic for detecting wrappers. Bug: T273692 Change-Id: Idcb4eed73e391f5f86eca2eb05cb3cea0d86f30a
2021-02-08 20:52:30 +00:00
</div>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="table_with_one_comment" data-mw-thread-id="h-table_with_one_comment-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-table_with_one_comment-2020-01-22T23:19:00.000Z"></span>table with one comment<span data-mw-comment-end="h-table_with_one_comment-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_one_comment">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 1)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<table border="1"><tbody><tr><td><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_one_comment"></span>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_one_comment"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_one_comment"></span>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
</td></tr></tbody></table>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="div_with_multiple_comments" data-mw-thread-id="h-div_with_multiple_comments-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-div_with_multiple_comments-2020-01-22T23:19:00.000Z"></span>div with multiple comments<span data-mw-comment-end="h-div_with_multiple_comments-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 3)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<div style="background: beige;"><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments"></span>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments"></span>
<dl><dd><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z"></span>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z"></span></dd></dl><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments-1"></span>
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments-1"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments-1"></span>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
</div>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<div class="mw-heading mw-heading2 ext-discussiontools-init-section"><span class='ext-discussiontools-init-section-subscribeButton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-iconElement oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget' data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"icon":"bellOutline","label":"(discussiontools-topicsubscription-button-subscribe-label)","title":"(discussiontools-topicsubscription-button-subscribe-tooltip)","flags":["progressive"],"classes":["ext-discussiontools-init-section-subscribeButton"]}'><a role='button' title='(discussiontools-topicsubscription-button-subscribe-tooltip)' tabindex='0' rel='nofollow' class='oo-ui-buttonElement-button'><span class='oo-ui-iconElement-icon oo-ui-icon-bellOutline oo-ui-image-progressive'></span><span class='oo-ui-labelElement-label'>(discussiontools-topicsubscription-button-subscribe-label)</span><span class='oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive'></span></a></span><h2 id="table_with_multiple_comments" data-mw-thread-id="h-table_with_multiple_comments-2020-01-22T23:19:00.000Z"><span class="ext-discussiontools-init-section-subscribe mw-editsection-like"><span class="ext-discussiontools-init-section-subscribe-bracket">[</span><a href="" class="ext-discussiontools-init-section-subscribe-link" role="button" tabindex="0" title="(discussiontools-topicsubscription-button-subscribe-tooltip)">(discussiontools-topicsubscription-button-subscribe)</a><span class="ext-discussiontools-init-section-subscribe-bracket">]</span></span><span data-mw-comment-start="" id="h-table_with_multiple_comments-2020-01-22T23:19:00.000Z"></span>table with multiple comments<span data-mw-comment-end="h-table_with_multiple_comments-2020-01-22T23:19:00.000Z"></span></h2><div class="ext-discussiontools-init-section-bar"><div class="ext-discussiontools-init-section-metadata"><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-timestampLabel'>(discussiontools-topicheader-latestcomment: <a href="#c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments">1579735140</a>)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-commentCountLabel'>(discussiontools-topicheader-commentcount: 3)</span><span class='ext-discussiontools-init-section-metaitem ext-discussiontools-init-section-authorCountLabel'>(discussiontools-topicheader-authorcount: 1)</span></div><div class="ext-discussiontools-init-section-actions"></div></div></div>
Give comments IDs so they can be scrolled to with hash links Bug: T265268 Change-Id: Idb985ed38bdb74e23cb7840899a61dc919f05f6f
2021-03-10 17:25:52 +00:00
<table border="1"><tbody><tr><td><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments"></span>
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments"></span>
<dl><dd><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z-1"></span>blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z-1"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z-1"></span></dd></dl><span data-mw-comment-start="" id="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments-1"></span>
blah blah <b><a href="/wiki/User:Matma_Rex" title="User:Matma Rex">Matma Rex</a> | <a href="/wiki/User_talk:Matma_Rex" title="User talk:Matma Rex">talk</a></b> 23:19, 22 January 2020 (UTC)<span class="ext-discussiontools-init-replylink-buttons" data-mw-thread-id="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments-1"><span class="ext-discussiontools-init-replybutton oo-ui-widget oo-ui-widget-enabled oo-ui-buttonElement oo-ui-buttonElement-frameless oo-ui-labelElement oo-ui-flaggedElement-progressive oo-ui-buttonWidget" data-ooui='{"_":"OO.ui.ButtonWidget","rel":["nofollow"],"framed":false,"label":"(discussiontools-replybutton)","flags":["progressive"],"classes":["ext-discussiontools-init-replybutton"]}'><a role="button" tabindex="0" rel="nofollow" class="oo-ui-buttonElement-button"><span class="oo-ui-iconElement-icon oo-ui-iconElement-noIcon oo-ui-image-progressive"></span><span class="oo-ui-labelElement-label">(discussiontools-replybutton)</span><span class="oo-ui-indicatorElement-indicator oo-ui-indicatorElement-noIndicator oo-ui-image-progressive"></span></a></span><span class="ext-discussiontools-init-replylink-bracket">[</span><a class="ext-discussiontools-init-replylink-reply" role="button" tabindex="0" href="">(discussiontools-replylink)</a><span class="ext-discussiontools-init-replylink-bracket">]</span></span><span data-mw-comment-end="c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments-1"></span>
Fix detecting decorative comment frames with whitespace As a result of 0fc71f60cd464e9cf54c4048985971953503ce51, "empty" text nodes (containing only whitespace) at the end of the comment may be inside the comment's range, and trying to ignore them caused the ranges not to match and the frame not to be detected. Now the code works whether they're inside the comment's range or not. Add a test case for wrapped discussion comments with HTML comments and with whitespace. Bug: T250126 Bug: T268407 Change-Id: I2217ff5a635fd1c9c9e803f46795b1bfb3d17535
2020-12-08 22:46:11 +00:00
</td></tr></tbody></table>
Move visualenhancements metadata and some buttons outside of `<h2>` We wrap a `<div>` tag around the `<h2>`, and move some elements there. The markup is inspired by and compatible with my proposal for T13555. The "ext-discussiontools-init-section" class is moved to the `<div>`. A small patch is needed in MobileFrontend to preserve the section collapsing functionality: I11bff21e81046898ca63f3f432797129fa70ad88. The following elements are now outside of `<h2>`: * Metadata bar * Subscribe button * Ellipsis menu (only shown on mobile) The following elements are sadly still inside of `<h2>`: * Subscribe links (only shown on desktop) * Section edit links from MediaWiki core Trying to move them mucks up the CSS too much. I hope we can resolve this later as a part of the work on T13555. Depends-On: I11bff21e81046898ca63f3f432797129fa70ad88 Bug: T314714 Change-Id: I0bbdcfa02c334858737855349d7a35746de1d8f2
2022-10-18 00:27:35 +00:00
<!--__DTLATESTCOMMENTPAGE__{"id":"c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments-1","timestamp":"2020-01-22T23:19:00.000Z","author":"Matma Rex","heading":{"headingLevel":2,"name":"h-Matma_Rex-2020-01-22T23:19:00.000Z","type":"heading","level":0,"id":"h-table_with_multiple_comments-2020-01-22T23:19:00.000Z","replies":["c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments","c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments-1"],"text":"table with multiple comments","linkableTitle":"table with multiple comments"}}__--><!--__DTHASLEDECONTENT__-->
Embed pageThread JSON in jsConfigVars instead of infusing HTML Bug: T322651 Depends-On: I86d461756398780dc24949013f35b7730a481052 Change-Id: I85ee8e6ed6eba97b94f4e4c415fbc5286c234cce
2022-08-12 17:13:48 +00:00
<pre>
{
"wgDiscussionToolsPageThreads": [
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-paragraph-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-paragraph",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-preformatted-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-preformatted",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-div_with_one_comment-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-two_divs_with_one_comment-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-div_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-htmlcomments",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-two_divs_with_one_comment-htmlcomments-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-two_divs_with_one_comment-htmlcomments",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-div_with_one_comment-list_end-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_end",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-div_with_one_comment-list_start-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_one_comment-list_start",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-table_with_one_comment-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_one_comment",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-div_with_multiple_comments-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 2,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z",
"replies": []
}
]
},
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-div_with_multiple_comments-1",
"replies": []
}
]
},
{
"headingLevel": 2,
"name": "h-Matma_Rex-2020-01-22T23:19:00.000Z",
"type": "heading",
"level": 0,
"id": "h-table_with_multiple_comments-2020-01-22T23:19:00.000Z",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments",
"replies": [
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 2,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-Matma_Rex-2020-01-22T23:19:00.000Z-1",
"replies": []
}
]
},
{
"timestamp": "2020-01-22T23:19:00.000Z",
"author": "Matma Rex",
"type": "comment",
"level": 1,
"id": "c-Matma_Rex-2020-01-22T23:19:00.000Z-table_with_multiple_comments-1",
"replies": []
}
]
}
]
}
</pre>
Reference in a new issue Copy permalink