wikimedia/mediawiki-extensions-CategoryTree
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree synced 2024-11-15 03:43:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

* (bug 23682) Don't allow people to expand subtree when it's known to be empty, this is inefficient.

Browse source 
* Fixed a bug causing the "+" link to be shown even when the number of subcategories is zero, due to the DBMS returning a string instead of an integer, causing triple-equals comparison to fail.
This commit is contained in:
Tim Starling 2010-05-28 02:15:44 +00:00
parent 896cd1397f
commit 3c3fdfde1a
3 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CategoryTree.css
View file

@ -21,6 +21,9 @@
cursor: pointer;
cursor: hand; /* hack for MSIE 5.0 and 5.5 */
}
.CategoryTreeEmptyBullet {
cursor: default;
}
.CategoryTreeBullet a,
.CategoryTreeBullet a:link,

2
CategoryTree.php
View file

@ -65,7 +65,7 @@ $wgCategoryTreeSidebarRoot = null;
$wgCategoryTreeHijackPageCategories = false; # EXPERIMENTAL! NOT YET FOR PRODUCTION USE! Main problem is general HTML/CSS layout cruftiness.
$wgCategoryTreeExtPath = '/extensions/CategoryTree';
$wgCategoryTreeVersion = '5'; # NOTE: bump this when you change the CSS or JS files!
$wgCategoryTreeVersion = '6'; # NOTE: bump this when you change the CSS or JS files!
$wgCategoryTreeUseCategoryTable = version_compare( $wgVersion, "1.13", '>=' );
$wgCategoryTreeOmitNamespace = CT_HIDEPREFIX_CATEGORIES;

64
CategoryTreeFunctions.php
View file

@ -674,7 +674,6 @@ class CategoryTree {
$s .= Xml::openElement( 'div', array( 'class' => 'CategoryTreeItem' ) );
$attr = array( 'class' => 'CategoryTreeBullet' );
$s .= Xml::openElement( 'span', $attr );
if ( $ns == NS_CATEGORY ) {
if ( $cat ) {
@ -685,43 +684,44 @@ class CategoryTree {
} else {
$count = $cat->getPageCount();
}
# Fix conversion to string for ===
$count = intval( $count );
}
$linkattr = array( );
if ( $load ) {
$linkattr[ 'id' ] = $load;
}
$linkattr[ 'class' ] = "CategoryTreeToggle";
$linkattr['style'] = 'display: none;'; // Unhidden by JS
if ( $children == 0 || $loadchildren ) {
$tag = 'span';
if ( $count === 0 ) {
$txt = wfMsgNoTrans( 'categorytree-empty-bullet' );
} else {
$txt = wfMsgNoTrans( 'categorytree-expand-bullet' );
}
$linkattr[ 'onclick' ] = "if (this.href) this.href='javascript:void(0)'; categoryTreeExpandNode('" . Xml::escapeJsString( $key ) . "'," . $this->getOptionsAsJsStructure() . ",this);";
# Don't load this message for ajax requests, so that we don't have to initialise $wgLang
$linkattr[ 'title' ] = $this->mIsAjaxRequest ? '##LOAD##' : wfMsgNoTrans( 'categorytree-expand' );
if ( $count === 0 ) {
$bullet = wfMsgNoTrans( 'categorytree-empty-bullet' ) . ' ';
$attr['class'] = 'CategoryTreeEmptyBullet';
} else {
$tag = 'span';
$txt = wfMsgNoTrans( 'categorytree-collapse-bullet' );
$linkattr[ 'onclick' ] = "if (this.href) this.href='javascript:void(0)'; categoryTreeCollapseNode('" . Xml::escapeJsString( $key ) . "'," . $this->getOptionsAsJsStructure() . ",this);";
$linkattr[ 'title' ] = wfMsgNoTrans( 'categorytree-collapse' );
$linkattr[ 'class' ] .= ' CategoryTreeLoaded';
}
$linkattr = array( );
if ( $load ) {
$linkattr[ 'id' ] = $load;
}
if ( $tag == 'a' ) {
$linkattr[ 'href' ] = $wikiLink;
$linkattr[ 'class' ] = "CategoryTreeToggle";
$linkattr['style'] = 'display: none;'; // Unhidden by JS
if ( $children == 0 || $loadchildren ) {
$tag = 'span';
$txt = wfMsgNoTrans( 'categorytree-expand-bullet' );
$linkattr[ 'onclick' ] = "if (this.href) this.href='javascript:void(0)'; categoryTreeExpandNode('" . Xml::escapeJsString( $key ) . "'," . $this->getOptionsAsJsStructure() . ",this);";
# Don't load this message for ajax requests, so that we don't have to initialise $wgLang
$linkattr[ 'title' ] = $this->mIsAjaxRequest ? '##LOAD##' : wfMsgNoTrans( 'categorytree-expand' );
} else {
$tag = 'span';
$txt = wfMsgNoTrans( 'categorytree-collapse-bullet' );
$linkattr[ 'onclick' ] = "if (this.href) this.href='javascript:void(0)'; categoryTreeCollapseNode('" . Xml::escapeJsString( $key ) . "'," . $this->getOptionsAsJsStructure() . ",this);";
$linkattr[ 'title' ] = wfMsgNoTrans( 'categorytree-collapse' );
$linkattr[ 'class' ] .= ' CategoryTreeLoaded';
}
if ( $tag == 'a' ) {
$linkattr[ 'href' ] = $wikiLink;
}
$bullet = Xml::openElement( $tag, $linkattr ) . $txt . Xml::closeElement( $tag ) . ' ';
}
$s .= Xml::openElement( $tag, $linkattr ) . $txt . Xml::closeElement( $tag ) . ' ';
} else {
$s .= wfMsgNoTrans( 'categorytree-page-bullet' );
$bullet = wfMsgNoTrans( 'categorytree-page-bullet' );
}
$s .= Xml::closeElement( 'span' );
$s .= Xml::tags( 'span', $attr, $bullet );
$s .= Xml::openElement( 'a', array( 'class' => $labelClass, 'href' => $wikiLink ) ) . $label . Xml::closeElement( 'a' );