fixed naviagtion label and aria current attribute

breadlesscode · Apr 8, 2018 · dc953a4 · dc953a4
1 parent a983689
commit dc953a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Resources/Private/Fusion/Component/Pagination.fusion b/Resources/Private/Fusion/Component/Pagination.fusion
@@ -6,7 +6,7 @@ prototype(Breadlesscode.Listable:Pagination) < prototype(Neos.Fusion:Component)
     paginationConfig = ${ [] }
 
     @process.wrapPaginationUl = ${ '<ul class="pagination">' + value + '</ul>' }
-    @process.wrapPaginationNav = ${ '<nav role="navigation" aria-label="Pagination Navigation">' + value + '</nav>' }
+    @process.wrapPaginationNav = ${ '<nav role="navigation" aria-label="' + Translation.translate('Breadlesscode.Listable:Accessibility:label') + '">' + value + '</nav>' }
     @if.hasOnlyOnePage = ${ this.totalCount > this.itemsPerPage }
 
     renderer = Neos.Fusion:Collection {
@@ -19,7 +19,7 @@ prototype(Breadlesscode.Listable:Pagination) < prototype(Neos.Fusion:Component)
         }
         itemRenderer = Breadlesscode.Listable:PaginationItem {
             page = ${ item.page }
-            isCurrent = ${ props.currentPage == item.page }
+            isCurrent = ${ String.toInteger(props.currentPage) == String.toInteger(item.page) }
             uri = Neos.Neos:NodeUri {
                 node = ${ documentNode }
                 additionalParams = Neos.Fusion:RawArray {

diff --git a/Resources/Private/Fusion/Component/PaginationItem.fusion b/Resources/Private/Fusion/Component/PaginationItem.fusion
@@ -18,7 +18,7 @@ prototype(Breadlesscode.Listable:PaginationItem) < prototype(Neos.Fusion:Compone
             [email protected] = ${ props.uri ? true : false }
 
             aria-current= ${ "true" }
-            [email protected] = ${ props.isCurrent }
+            [email protected] = ${ props.isCurrent ? true : false }
         }
 
         @process.itemWrap = Neos.Fusion:Tag {