jenkins-bot has submitted this change and it was merged.
Change subject: Drop redundant attributes in hardcoded html
......................................................................
Drop redundant attributes in hardcoded html
Follows-up 97caae596d5493 which makes HTML5 the default
and removes support for XHTML 1.0 and HTML < 5.
* <script type>
* <style type>
* <html xmlns>
* Quick-closing slash in non-XML HTML5 documents
Change-Id: I71855fa8d4095a5a448ebdc3dc36506ddab6f70c
---
M docs/uidesign/child-selector-emu.html
M docs/uidesign/design.html
M docs/uidesign/mediawiki.action.history.diff.html
M docs/uidesign/monospace.html
M docs/uidesign/table-layout.html
M includes/installer/WebInstallerPage.php
M languages/LanguageConverter.php
M tests/selenium/SeleniumTestHTMLLogger.php
8 files changed, 19 insertions(+), 21 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
Daniel Friesen: Looks good to me, but someone else must approve
diff --git a/docs/uidesign/child-selector-emu.html
b/docs/uidesign/child-selector-emu.html
index 8294b6d..dedb3a6 100644
--- a/docs/uidesign/child-selector-emu.html
+++ b/docs/uidesign/child-selector-emu.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>CSS Child selector emulation for IE 6</title>
- <style type="text/css">
+ <style>
/** Common rules **/
body { background-color: #CCC; }
table { border:1px black solid; }
@@ -98,4 +98,3 @@
</tr>
</table>
<p><strong>NOTE:</strong>The nested caption keep the green background. The
nested table keep the black border. This is because those declarations are
global so we did not reset them.</p>
-
diff --git a/docs/uidesign/design.html b/docs/uidesign/design.html
index 7062a82..a285a5b 100644
--- a/docs/uidesign/design.html
+++ b/docs/uidesign/design.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
-<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml";>
+<html lang="en" dir="ltr">
<head>
- <link rel="stylesheet" href="../../skins/common/shared.css" />
+ <link rel="stylesheet" href="../../skins/common/shared.css">
</head>
<body style="font-size: small;">
@@ -31,4 +31,5 @@
<tr><td>line with hover</td><td>line with hover</td></tr>
</table>
-</body></html>
+</body>
+</html>
diff --git a/docs/uidesign/mediawiki.action.history.diff.html
b/docs/uidesign/mediawiki.action.history.diff.html
index 7b8eb2a..5edcfb8 100644
--- a/docs/uidesign/mediawiki.action.history.diff.html
+++ b/docs/uidesign/mediawiki.action.history.diff.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
-<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml";>
+<html lang="en" dir="ltr">
<head>
- <link rel="stylesheet"
href="../../resources/mediawiki.action/mediawiki.action.history.diff.css" />
+ <link rel="stylesheet"
href="../../resources/mediawiki.action/mediawiki.action.history.diff.css">
</head>
<body style="background-color: #C0C0C0;">
<p>
@@ -54,4 +54,5 @@
</td></tr>
</table>
-</body></html>
+</body>
+</html>
diff --git a/docs/uidesign/monospace.html b/docs/uidesign/monospace.html
index 84ec13a..f2b988e2 100644
--- a/docs/uidesign/monospace.html
+++ b/docs/uidesign/monospace.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
-<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml";>
+<html lang="en" dir="ltr">
<head>
- <style type="text/css">
+ <style>
pre {
border: 1px dashed #AAA;
background-color: #E0E0E0;
@@ -75,4 +75,3 @@
font-family: monospace, DOESNOTEXISTREALLY;'>
font-family: monospace, DOESNOTEXISTREALLY;
</pre>
-
diff --git a/docs/uidesign/table-layout.html b/docs/uidesign/table-layout.html
index 6f53825..2c26819 100644
--- a/docs/uidesign/table-layout.html
+++ b/docs/uidesign/table-layout.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <style type="text/css">
+ <style>
/** This is just for coloring: */
table { border: 1px solid #CC0; }
td { border: 1px solid #CCC; }
@@ -57,4 +57,3 @@
</tr>
</table>
</div>
-
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 3423a06..8a9fc2d 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1083,7 +1083,7 @@
'  ' .
htmlspecialchars( $this->getVar( 'wgRightsText' ) ) .
"</p>\n" .
- "<p style=\"text-align: center\">" .
+ "<p style=\"text-align: center;\">" .
Html::element( 'a',
array(
'href' => $this->getCCPartnerUrl(),
@@ -1092,7 +1092,7 @@
wfMessage( 'config-cc-again' )->text()
) .
"</p>\n" .
- "<script type=\"text/javascript\">\n" .
+ "<script>\n" .
# Reduce the wrapper div height
htmlspecialchars( $reduceJs ) .
"\n" .
@@ -1255,8 +1255,7 @@
if ( isset( $_SERVER['HTTP_USER_AGENT'] ) &&
strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !==
false ) {
// JS appears the only method that works consistently
with IE7+
- $this->addHtml( "\n<script type=\"" .
$GLOBALS['wgJsMimeType'] .
- '">jQuery( document ).ready( function() {
document.location=' .
+ $this->addHtml( "\n<script>jQuery( document ).ready(
function () { document.location = " .
Xml::encodeJsVar( $lsUrl ) . "; }
);</script>\n" );
} else {
$this->parent->request->response()->header( "Refresh:
0;url=$lsUrl" );
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 0186ccf..e13cb59 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -364,11 +364,11 @@
// this one is needed when the text is inside an HTML markup
$htmlfix = '|<[^>]+$|^[^<>]*>';
- // disable convert to variants between <code></code> tags
+ // disable convert to variants between <code> tags
$codefix = '<code>.+?<\/code>|';
- // disable convertsion of <script type="text/javascript"> ...
</script>
+ // disable conversion of <script> tags
$scriptfix = '<script.*?>.*?<\/script>|';
- // disable conversion of <pre xxxx> ... </pre>
+ // disable conversion of <pre> tags
$prefix = '<pre.*?>.*?<\/pre>|';
$reg = '/' . $codefix . $scriptfix . $prefix .
diff --git a/tests/selenium/SeleniumTestHTMLLogger.php
b/tests/selenium/SeleniumTestHTMLLogger.php
index 21332cf..2d4e964 100644
--- a/tests/selenium/SeleniumTestHTMLLogger.php
+++ b/tests/selenium/SeleniumTestHTMLLogger.php
@@ -3,7 +3,7 @@
class SeleniumTestHTMLLogger {
public function setHeaders() {
global $wgOut;
- $wgOut->addHeadItem( 'selenium', '<style type="text/css">
+ $wgOut->addHeadItem( 'selenium', '<style>
.selenium pre {
overflow-x: auto; /* Use horizontal scroller if needed;
for Firefox 2, not needed in Firefox 3 */
white-space: pre-wrap; /* css-3 */
--
To view, visit https://gerrit.wikimedia.org/r/64630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71855fa8d4095a5a448ebdc3dc36506ddab6f70c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: IAlex <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Liangent <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
