Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove id selector for toctitle

Browse source 
In 1bf5a652 the id selector was changed to a class selector for toctitle.
The cached HTML has been expired now and the id selector is not necessary
anymore.

Also remove the id selector #toc.tochidden for print style. This is not
necessary because the tochidden gets only added to .toc and not to #toc.

Change-Id: I43cfffdb0807e8ed8f6b7b8732ba857b709bee80
This commit is contained in:
Fomafix 2017-06-08 09:56:36 +02:00
parent c721668afa
commit fbf939cdda
5 changed files with 32 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Linker.php
View file

@ -1561,7 +1561,7 @@ class Linker {
$title = wfMessage( 'toc' )->inLanguage( $lang )->escaped();
return '<div id="toc" class="toc">'
. '<div id="toctitle" class="toctitle"><h2>' . $title . "</h2></div>\n"
. '<div class="toctitle"><h2>' . $title . "</h2></div>\n"
. $toc
. "</ul>\n</div>\n";
}

4
resources/src/mediawiki/mediawiki.toc.js
View file

@ -6,9 +6,7 @@
$content.find( '.toc' ).addBack( '.toc' ).each( function () {
var hideToc,
$this = $( this ),
// .toctitle is new so may not exist in HTML caches for a few weeks,
// so keep checking for #toctitle for now
$tocTitle = $this.find( '.toctitle, #toctitle' ),
$tocTitle = $this.find( '.toctitle' ),
$tocToggleLink = $this.find( '.togglelink' ),
$tocList = $this.find( 'ul' ).eq( 0 );

1
resources/src/mediawiki/mediawiki.toc.print.css
View file

@ -1,4 +1,3 @@
#toc.tochidden,
.toc.tochidden,
.toctoggle {
display: none;

58
tests/parser/parserTests.txt
View file

@ -15937,7 +15937,7 @@ Section headings with TOC
Some text
===Another headline===
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Headline_1"><span class="tocnumber">1</span> <span class="toctext">Headline 1</span></a>
<ul>
@ -15980,7 +15980,7 @@ __FORCETOC__
== Headline 2 ==
== Headline ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Headline_2"><span class="tocnumber">1</span> <span class="toctext">Headline 2</span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#Headline"><span class="tocnumber">2</span> <span class="toctext">Headline</span></a></li>
@ -16011,7 +16011,7 @@ Handling of sections up to level 6 and beyond
========= Level 9 Heading=========
========== Level 10 Heading==========
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Level_1_Heading"><span class="tocnumber">1</span> <span class="toctext">Level 1 Heading</span></a>
<ul>
@ -16064,7 +16064,7 @@ TOC regression (T11764)
== title 2 ==
=== title 2.1 ===
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#title_1"><span class="tocnumber">1</span> <span class="toctext">title 1</span></a>
<ul>
@ -16099,7 +16099,7 @@ TOC for heading containing <span id="..."></span> (T96153)
__FORCETOC__
==<span id="old-anchor"></span>New title==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#New_title"><span class="tocnumber">1</span> <span class="toctext">New title</span></a></li>
</ul>
@ -16121,7 +16121,7 @@ wgMaxTocLevel=3
== title 2 ==
=== title 2.1 ===
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#title_1"><span class="tocnumber">1</span> <span class="toctext">title 1</span></a>
<ul>
@ -16157,7 +16157,7 @@ wgMaxTocLevel=3
====Section 1.1.1.1====
==Section 2==
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Section_1"><span class="tocnumber">1</span> <span class="toctext">Section 1</span></a>
<ul>
@ -16250,7 +16250,7 @@ __TOC__
=== title 1.1 ===
== title 2 ==
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#title_1"><span class="tocnumber">1</span> <span class="toctext">title 1</span></a>
<ul>
@ -16317,7 +16317,7 @@ section 5
!! html
<p>The tooltips shall not show entities to the user (ie. be double escaped)
</p>
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#text_.3E_text"><span class="tocnumber">1</span> <span class="toctext">text &gt; text</span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#text_.3C_text"><span class="tocnumber">2</span> <span class="toctext">text &lt; text</span></a></li>
@ -16376,7 +16376,7 @@ section 6
!! html
<p>Id should not contain + for spaces
</p>
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Space_between_Text"><span class="tocnumber">1</span> <span class="toctext">Space between Text</span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#Space-Entity_between_Text"><span class="tocnumber">2</span> <span class="toctext">Space-Entity&#32;between&#32;Text</span></a></li>
@ -16422,7 +16422,7 @@ Headers with excess '=' characters
=''italic'' heading==
==''italic'' heading=
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#foo.3D"><span class="tocnumber">1</span> <span class="toctext">foo=</span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#.3Dfoo"><span class="tocnumber">2</span> <span class="toctext">=foo</span></a></li>
@ -16452,7 +16452,7 @@ HTML headers vs TOC (T25393)
== Header 2.2 ==
__NOEDITSECTION__
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1"><a href="#Header_1"><span class="tocnumber">1</span> <span class="toctext">Header 1</span></a>
<ul>
@ -18240,7 +18240,7 @@ Fuzz testing: Parser14
http://__TOC__
!! html
<h2><span class="mw-headline" id="onmouseover.3D">onmouseover=</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: onmouseover=">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
http://<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
http://<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#onmouseover.3D"><span class="tocnumber">1</span> <span class="toctext">onmouseover=</span></a></li>
</ul>
@ -18251,7 +18251,7 @@ http://<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Content
<h2><span class="mw-headline" id="onmouseover.3D">onmouseover=</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: onmouseover=">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
<p>http://</p>
<div id="toc" class="toc">
<div id="toctitle" class="toctitle">
<div class="toctitle">
<h2>Contents</h2>
</div>
<ul>
@ -20733,7 +20733,7 @@ Out-of-order TOC heading levels
=====5=====
==2==
!! html
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#2"><span class="tocnumber">1</span> <span class="toctext">2</span></a>
<ul>
@ -22753,7 +22753,7 @@ title=[[Main Page]]
__TOC__
== ''Lost'' episodes ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Lost_episodes"><span class="tocnumber">1</span> <span class="toctext"><i>Lost</i> episodes</span></a></li>
</ul>
@ -22774,7 +22774,7 @@ title=[[Main Page]]
__TOC__
== '''should be bold''' then normal text ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#should_be_bold_then_normal_text"><span class="tocnumber">1</span> <span class="toctext"><b>should be bold</b> then normal text</span></a></li>
</ul>
@ -22795,7 +22795,7 @@ title=[[Main Page]]
__TOC__
== Image [[Image:foobar.jpg]] ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Image"><span class="tocnumber">1</span> <span class="toctext">Image</span></a></li>
</ul>
@ -22816,7 +22816,7 @@ title=[[Main Page]]
__TOC__
== <blockquote>Quote</blockquote> ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Quote"><span class="tocnumber">1</span> <span class="toctext">Quote</span></a></li>
</ul>
@ -22827,7 +22827,7 @@ __TOC__
!! html/php+tidy
<p></p>
<div id="toc" class="toc">
<div id="toctitle" class="toctitle">
<div class="toctitle">
<h2>Contents</h2>
</div>
<ul>
@ -22855,7 +22855,7 @@ __TOC__
<small>Hanc marginis exiguitas non caperet.</small>
QED
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Proof:_2_.3C_3"><span class="tocnumber">1</span> <span class="toctext">Proof: 2 &lt; 3</span></a></li>
</ul>
@ -22880,7 +22880,7 @@ __TOC__
== <i>Foo</i> <blockquote>Bar</blockquote> ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Foo_Bar"><span class="tocnumber">1</span> <span class="toctext"><i>Foo</i> <b>Bar</b></span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#Foo_Bar_2"><span class="tocnumber">2</span> <span class="toctext"><i>Foo</i> Bar</span></a></li>
@ -22893,7 +22893,7 @@ __TOC__
!! html/php+tidy
<p></p>
<div id="toc" class="toc">
<div id="toctitle" class="toctitle">
<div class="toctitle">
<h2>Contents</h2>
</div>
<ul>
@ -22926,7 +22926,7 @@ __TOC__
== <sup class="a > b">Evilbye</sup> ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Hello"><span class="tocnumber">1</span> <span class="toctext"><sup>Hello</sup></span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#b.22.3EEvilbye"><span class="tocnumber">2</span> <span class="toctext"><sup> b"&gt;Evilbye</sup></span></a></li>
@ -22957,7 +22957,7 @@ __TOC__
== <span dir="ltr" style="font-style: italic">Attributes after dir on these span tags must be deleted from the TOC</span> ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#C.2B.2B"><span class="tocnumber">1</span> <span class="toctext"><span dir="ltr">C++</span></span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#.D7.96.D7.91.D7.A0.D7.92.21"><span class="tocnumber">2</span> <span class="toctext"><span dir="rtl">זבנג!</span></span></a></li>
@ -22988,7 +22988,7 @@ T74884: bdi element in ToC
__TOC__
== <bdi>test</bdi> ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#test"><span class="tocnumber">1</span> <span class="toctext"><bdi>test</bdi></span></a></li>
</ul>
@ -23007,7 +23007,7 @@ T35715: s/strike element in ToC
__TOC__
== <s>test</s> test <strike>test</strike> ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#test_test_test"><span class="tocnumber">1</span> <span class="toctext"><s>test</s> test <strike>test</strike></span></a></li>
</ul>
@ -23029,7 +23029,7 @@ Empty <p> tag in TOC, removed by Sanitizer (T92892)
__TOC__
== x ==
!! html/php
<div id="toc" class="toc"><div id="toctitle" class="toctitle"><h2>Contents</h2></div>
<div id="toc" class="toc"><div class="toctitle"><h2>Contents</h2></div>
<ul>
<li class="toclevel-1 tocsection-1"><a href="#x"><span class="tocnumber">1</span> <span class="toctext">x</span></a></li>
</ul>
@ -23040,7 +23040,7 @@ __TOC__
!! html/php+tidy
<p></p>
<div id="toc" class="toc">
<div id="toctitle" class="toctitle">
<div class="toctitle">
<h2>Contents</h2>
</div>
<ul>

2
tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
View file

@ -12,7 +12,7 @@
assert.strictEqual( $( '.toc' ).length, 0, 'There is no table of contents on the page at the beginning' );
tocHtml = '<div id="toc" class="toc">' +
'<div id="toctitle" class="toctitle">' +
'<div class="toctitle">' +
'<h2>Contents</h2>' +
'</div>' +
'<ul><li></li></ul>' +