Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99169
Change subject: More changes to remove YUI/MW 1.16 support
......................................................................
More changes to remove YUI/MW 1.16 support
Change-Id: I359c71a2497df99ccb00e7f37f3d051271dd5ccc
---
M HeaderTabs_body.php
M skins/ext.headertabs.bare.css
M skins/ext.headertabs.core.js
M skins/ext.headertabs.large.css
4 files changed, 24 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HeaderTabs
refs/changes/69/99169/1
diff --git a/HeaderTabs_body.php b/HeaderTabs_body.php
index 51bb4db..846a9d3 100644
--- a/HeaderTabs_body.php
+++ b/HeaderTabs_body.php
@@ -1,6 +1,6 @@
<?php
/**
- * Version of the HeaderTabs class that uses jQuery and the ResourceLoader.
+ * File for the HeaderTabs class.
*
* @file
* @ingroup Extensions
@@ -94,7 +94,7 @@
wfDebugLog('headertabs', __METHOD__.': we have text
above our tabs');
}
- if ( count($parts) < $partslimit ) {
+ if ( count( $parts ) < $partslimit ) {
return true;
}
@@ -103,15 +103,15 @@
// disable default TOC
if ( $htDisableDefaultToc === TRUE ) {
// if it was somewhere else, we need to remove it
- if ( count($tocmatches) > 0 && $tocmatches[0][1] !== 0
) {
+ if ( count( $tocmatches ) > 0 && $tocmatches[0][1] !==
0 ) {
wfDebugLog('headertabs', __METHOD__.': removed
non-standard-pos TOC');
// remove from above
- if ( $tocmatches[0][1] < strlen($above) ) {
+ if ( $tocmatches[0][1] < strlen( $above ) ) {
$above = substr_replace( $above, '',
$tocmatches[0][1], strlen($tocmatches[0][0]) );
} else {
$tocmatches[0][1] -= strlen($above);
// it's in a tab
- for ($i = 0; ($i < count ( $parts ) / 2
); $i++ ) {
+ for ( $i = 0; ( $i < count ( $parts ) /
2 ); $i++ ) {
if ( $tocmatches[0][1] <
strlen($parts[($i * 2) + 1]) ) {
$parts[($i * 2) + 1] =
substr_replace( $parts[($i * 2) + 1], '', $tocmatches[0][1],
strlen($tocmatches[0][0]) );
break;
@@ -120,7 +120,7 @@
}
}
}
- } elseif( count($tocmatches) > 0 && $tocmatches[0][1] === 0 ) {
+ } elseif( count( $tocmatches ) > 0 && $tocmatches[0][1] === 0 )
{
// add back a default-pos toc
$above = $toc.$above;
}
@@ -275,7 +275,7 @@
* @return bool
*/
public static function addHTMLHeader( &$out ) {
- global $htScriptPath,$htStyle;
+ global $htScriptPath, $htStyle;
//! @todo we might be able to only load our js and styles if we
are rendering tabs, speeding up pages that don't use it? but what about cached
pages? (2011-12-12, ofb)
@@ -283,7 +283,7 @@
// Add the CSS file for the specified style.
if ( !empty( $htStyle ) && $htStyle !== 'jquery' ) {
- $styleFile = $htScriptPath .
'/skins-jquery/ext.headertabs.' . $htStyle . '.css';
+ $styleFile = $htScriptPath . '/skins/ext.headertabs.' .
$htStyle . '.css';
$out->addExtensionStyle( $styleFile );
}
diff --git a/skins/ext.headertabs.bare.css b/skins/ext.headertabs.bare.css
index 319aa48..83226e9 100644
--- a/skins/ext.headertabs.bare.css
+++ b/skins/ext.headertabs.bare.css
@@ -8,7 +8,6 @@
* @author Olivier Beaton
*/
-/* JQuery UI tabs clearing styles by Olivier Finlay Beaton and 70.189.238.136
*/
#headertabs.bare.ui-widget {
font-family: inherit;
font-size: 1em; /* IE doesn't like inherit here */
diff --git a/skins/ext.headertabs.core.js b/skins/ext.headertabs.core.js
index fcc551a..3ee8b07 100644
--- a/skins/ext.headertabs.core.js
+++ b/skins/ext.headertabs.core.js
@@ -1,5 +1,5 @@
/**
- * Javascript code for Header Tabs extension for MW 1.17+
+ * JavaScript code for Header Tabs extension.
*
* @file
* @ingroup Extensions
@@ -26,7 +26,7 @@
// delete the rule hiding unselected tabs
var sheets = document.styleSheets;
-// Could be somebody else inserted something, so we can not just delete rule 0
of sheet 0
+// Could be somebody else inserted something, so we cannot just delete rule 0
of sheet 0
outer:
for (s = 0; s < sheets.length; s++ ) {
var cursheet = sheets[s];
@@ -45,7 +45,7 @@
/* follow a # anchor to a tab OR a heading */
var curHash = window.location.hash;
if ( curHash.indexOf( "#tab=" ) == 0 ) {
- // remove the fragment identifier, we're using it for the name of the
tab in the jquery ui tabs
+ // remove the fragment identifier, we're using it for the name of the
tab.
var tabName = curHash.replace( "#tab=", "" );
$tabs.tabs('select', tabName);
} else if (curHash != '') {
@@ -60,7 +60,7 @@
function tabEditTabLink(hash) {
var section = '';
if ( hash.indexOf( "#tab=" ) == 0 ) {
- // keep the fragment identifier, using it to do a jquery find
on the id
+ // keep the fragment identifier, using it to do a jQuery find
on the id
hash = hash.replace( "#tab=", "#" );
}
@@ -70,7 +70,8 @@
section = section.substring(s, s+section.substring(s).indexOf('
'));
if (section != 0) {
section = '§ion='+section;
- // no way to edit anything before the first section except to
edit the entire article
+ // No way to edit anything before the first section
+ // except to edit the entire article.
}
}
diff --git a/skins/ext.headertabs.large.css b/skins/ext.headertabs.large.css
index b43b89c..3ba8b07 100644
--- a/skins/ext.headertabs.large.css
+++ b/skins/ext.headertabs.large.css
@@ -1,6 +1,6 @@
/**
* Default jQuery styling, but with normal-sized font and blue (instead of
- * black)links.
+ * black) links.
*
* @file
* @ingroup Extensions
@@ -9,19 +9,19 @@
* @author Olivier Beaton
*/
-#headertabs.jquery-large.ui-widget {
+#headertabs.large.ui-widget {
font-family: inherit;
font-size: 1em; /* IE doesn't like inherit here */
}
/* section by 70.189.238.136 */
-#headertabs.jquery-large .ui-widget input, .ui-widget select, .ui-widget
textarea, .ui-widget button { font-family: inherit; font-size: 1em; } /* IE
doesn't like inherit here */
-#headertabs.jquery-large .ui-widget-content a { color:#0645AD; }
-#headertabs.jquery-large .ui-widget-content a:visited { color:#0b0080; }
-#headertabs.jquery-large .ui-widget-content a.new { color:#CC2200; }
-#headertabs.jquery-large .ui-widget-content a.new:visited { color:#A55858; }
-#headertabs.jquery-large .ui-widget-content a.extiw { color:#3366BB; }
-#headertabs.jquery-large .ui-widget-content a.redirect { color:#308050; }
-#headertabs.jquery-large .ui-widget-content a.redirect:visited {
color:#3070A0; }
+#headertabs.large .ui-widget input, .ui-widget select, .ui-widget textarea,
.ui-widget button { font-family: inherit; font-size: 1em; } /* IE doesn't like
inherit here */
+#headertabs.large .ui-widget-content a { color:#0645AD; }
+#headertabs.large .ui-widget-content a:visited { color:#0b0080; }
+#headertabs.large .ui-widget-content a.new { color:#CC2200; }
+#headertabs.large .ui-widget-content a.new:visited { color:#A55858; }
+#headertabs.large .ui-widget-content a.extiw { color:#3366BB; }
+#headertabs.large .ui-widget-content a.redirect { color:#308050; }
+#headertabs.large .ui-widget-content a.redirect:visited { color:#3070A0; }
/* end JQuery UI tabs style clearer */
--
To view, visit https://gerrit.wikimedia.org/r/99169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I359c71a2497df99ccb00e7f37f3d051271dd5ccc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HeaderTabs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
