https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112851

Revision: 112851
Author:   krinkle
Date:     2012-03-01 23:43:41 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
[CategoryTree] clean up JS
* 0 is falsy, cover for that case
* Add comments explaining the numbers, these come from PHP constants, via 
$wgCategoryTreePageCategoryOptions end up in data- attributes
* Follow-up r112849

Modified Paths:
--------------
    trunk/extensions/CategoryTree/modules/ext.categoryTree.js

Modified: trunk/extensions/CategoryTree/modules/ext.categoryTree.js
===================================================================
--- trunk/extensions/CategoryTree/modules/ext.categoryTree.js   2012-03-01 
23:14:43 UTC (rev 112850)
+++ trunk/extensions/CategoryTree/modules/ext.categoryTree.js   2012-03-01 
23:43:41 UTC (rev 112851)
@@ -110,7 +110,8 @@
                // Element may not have a .CategoryTreeTag parent, fallback to 
defauls
                // Probably a CategoryPage (@todo: based on what?)
                ctTitle = $link.data( 'ct-title' );
-               ctMode = $linkParentCTTag.data( 'ct-mode' ) || undefined;
+               ctMode = $linkParentCTTag.data( 'ct-mode' );
+               ctMode = typeof ctMode === 'number' ? ctMode : undefined;
                ctOptions = $linkParentCTTag.data( 'ct-options' ) || 
mw.config.get( 'wgCategoryTreePageCategoryOptions' );
 
                // Mode and options have defaults or fallbacks, title does not.
@@ -133,15 +134,19 @@
 
                                if ( data === '' ) {
                                        switch ( ctMode ) {
+                                               // CT_MODE_CATEGORIES = 0
                                                case 0:
                                                        data = mw.msg( 
'categorytree-no-subcategories' );
                                                        break;
+                                               // CT_MODE_PAGES = 10
                                                case 10:
                                                        data = mw.msg( 
'categorytree-no-pages' );
                                                        break;
+                                               // CT_MODE_PARENTS = 100
                                                case 100:
                                                        data = mw.msg( 
'categorytree-no-parent-categories' );
                                                        break;
+                                               // CT_MODE_ALL = 20
                                                default:
                                                        data = mw.msg( 
'categorytree-nothing-found' );
                                        }
@@ -153,6 +158,7 @@
                                        .html( data )
                                        .find( '.CategoryTreeToggle' )
                                                .click( categoryTree.handleNode 
);
+
                                categoryTree.showToggles();
                        } )
                        .error( error );


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to