Merge "Replace sorting classes with better naming convention"

diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index f6445f5..71b1ad7 100644 (file)
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -132,12 +132,12 @@ abstract class TablePager extends IndexPager {
                                        // We don't actually know in which direction other fields will be sorted by default…
                                        if ( $this->mDefaultDirection == IndexPager::DIR_DESCENDING ) {
                                                $linkType = 'asc';
-                                               $class = "$sortClass TablePager_sort-descending";
+                                               $class = "$sortClass mw-datatable-is-sorted mw-datatable-is-descending";
                                                $query['asc'] = '1';
                                                $query['desc'] = '';
                                        } else {
                                                $linkType = 'desc';
-                                               $class = "$sortClass TablePager_sort-ascending";
+                                               $class = "$sortClass mw-datatable-is-sorted mw-datatable-is-ascending";
                                                $query['asc'] = '';
                                                $query['desc'] = '1';
                                        }

diff --git a/resources/src/mediawiki.pager.tablePager/TablePager.less b/resources/src/mediawiki.pager.tablePager/TablePager.less
index a8ab818..c7eae2c 100644 (file)
--- a/resources/src/mediawiki.pager.tablePager/TablePager.less
+++ b/resources/src/mediawiki.pager.tablePager/TablePager.less
@@ -15,16 +15,20 @@
        }
 }
 
-.TablePager .TablePager_sort-ascending a {
-       padding-left: 15px;
-       background: none left center no-repeat;
-       .background-image-svg('images/arrow-sort-ascending.svg', 'images/arrow-sort-ascending.png');
-}
+.mw-datatable {
+       &-is-sorted a {
+               background-position: left center;
+               background-repeat: no-repeat;
+               padding-left: 15px;
+       }
 
-.TablePager .TablePager_sort-descending a {
-       padding-left: 15px;
-       background: none left center no-repeat;
-       .background-image-svg('images/arrow-sort-descending.svg', 'images/arrow-sort-descending.png');
+       &-is-ascending a {
+               .background-image-svg( 'images/arrow-sort-ascending.svg', 'images/arrow-sort-ascending.png' );
+       }
+
+       &-is-descending a {
+               .background-image-svg( 'images/arrow-sort-descending.svg', 'images/arrow-sort-descending.png' );
+       }
 }
 
 .TablePager_nav {