jenkins-bot has submitted this change and it was merged. Change subject: Minor clean up of css/js ......................................................................
Minor clean up of css/js * Trim trailing whitespace on lines. * Remove css that has been commented for 5 years (63e25672). * Remove comment about $wgCategoryTreeVersion which was removed 2 years ago (e77ae54). * Add missing spaces in CSS and JS. Change-Id: Icb28293b445880246f2b4273daab2fb21c2638df --- M modules/ext.categoryTree.css M modules/ext.categoryTree.js 2 files changed, 19 insertions(+), 28 deletions(-) Approvals: Nikerabbit: Looks good to me, approved TTO: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/ext.categoryTree.css b/modules/ext.categoryTree.css index 40798c7..be07dda 100644 --- a/modules/ext.categoryTree.css +++ b/modules/ext.categoryTree.css @@ -1,16 +1,12 @@ -/* - * Stylesheet for the CategoryTree extension, an AJAX based gadget - * to display the category structure of a wiki +/** + * Stylesheet for the CategoryTree extension. * * @file * @ingroup Extensions * @author Daniel Kinzler, brightbyte.de * @copyright © 2006 Daniel Kinzler * @licence GNU General Public Licence 2.0 or later - * - * NOTE: if you change this, increment $wgCategoryTreeVersion - * in CategoryTree.php to avoid users getting stale copies from cache. -*/ + */ #mw-subcategories ul { list-style: none none; @@ -65,16 +61,12 @@ font-style: italic; } -/* -div.CategoryTreeInlineNode, -div.CategoryTreeInlineNode div { - display: table-cell; -} -*/ - .CategoryTreeCategoryBarItem { - display:-moz-inline-box; display:inline-block; /* yes, specify display twice! quirk for FF2 */ - margin:-0.5ex 0 0 1ex; /* why is the -0.5ex needed? */ + /* yes, specify display twice! quirk for FF2 */ + display: -moz-inline-box; + display: inline-block; + /* why is the -0.5ex needed? */ + margin: -0.5ex 0 0 1ex; padding:0; vertical-align: top; /* IE6-7 Hack for display: inline-block */ diff --git a/modules/ext.categoryTree.js b/modules/ext.categoryTree.js index 56053b3..20996f7 100644 --- a/modules/ext.categoryTree.js +++ b/modules/ext.categoryTree.js @@ -1,6 +1,5 @@ -/* - * JavaScript functions for the CategoryTree extension, an AJAX based gadget - * to display the category structure of a wiki +/** + * JavaScript for the CategoryTree extension. * * @file * @ingroup Extensions @@ -9,23 +8,23 @@ * @licence GNU General Public Licence 2.0 or later */ -(function( $, mw ) { +( function ( $, mw ) { var categoryTree = { /** * Sets display inline to tree toggle */ - showToggles: function() { + showToggles: function () { $( 'span.CategoryTreeToggle' ).css( 'display', 'inline' ); }, - + /** * Handles clicks on the expand buttons, and calls the appropriate function * * @context {Element} CategoryTreeToggle * @param e {jQuery.Event} */ - handleNode: function( e ) { + handleNode: function ( e ) { var $link = $( this ); if ( $link.data( 'ct-state' ) === 'collapsed' ) { categoryTree.expandNode( $link ); @@ -39,7 +38,7 @@ * * @param {jQuery} $link */ - expandNode: function( $link ) { + expandNode: function ( $link ) { // Show the children node var $children = $link.parents( '.CategoryTreeItem' ) .siblings( '.CategoryTreeChildren' ); @@ -60,7 +59,7 @@ * * @param {jQuery} $link */ - collapseNode: function( $link ) { + collapseNode: function ( $link ) { // Hide the children node $link.parents( '.CategoryTreeItem' ) .siblings( '.CategoryTreeChildren' ).hide(); @@ -77,7 +76,7 @@ * @param {jQuery} $link * @param {jQuery} $children */ - loadChildren: function( $link, $children ) { + loadChildren: function ( $link, $children ) { var $linkParentCTTag, ctTitle, ctMode, ctOptions; /** @@ -167,9 +166,9 @@ }; // Register click events and show toggle buttons -$( function( $ ) { +$( function ( $ ) { $( '.CategoryTreeToggle' ).click( categoryTree.handleNode ); categoryTree.showToggles(); } ); -} )( jQuery, mediaWiki ); +}( jQuery, mediaWiki ) ); -- To view, visit https://gerrit.wikimedia.org/r/88897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb28293b445880246f2b4273daab2fb21c2638df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CategoryTree Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: TTO <at.li...@live.com.au> Gerrit-Reviewer: VitaliyFilippov <vita...@yourcmc.ru> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits