Skip to content

Commit 8540525

Browse files
committed
b2103f39ce160ad1daec16a6915343d15b31f016 Fix - docs: Update -api count() example which could be correct in some circumstances and wrong in others!
It depends if the table was loaded with array data or objects. Thank you _cz4586_ for pointing this out. Sync to source repo @b2103f39ce160ad1daec16a6915343d15b31f016
1 parent 1625158 commit 8540525

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

datatables.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
],
1515
"src-repo": "http://github.com/DataTables/DataTablesSrc",
1616
"last-tag": "1.13.6",
17-
"last-sync": "59043e32dd87a987ec3f537cafd6d6c77cac9ed2"
17+
"last-sync": "b2103f39ce160ad1daec16a6915343d15b31f016"
1818
}

js/dataTables.bootstrap4.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
159159
'role': 'link',
160160
'aria-current': btnClass === 'active' ? 'page' : null,
161161
'data-dt-idx': button,
162-
'tabindex': settings.iTabIndex,
162+
'tabindex': disabled ? -1 : settings.iTabIndex,
163163
'class': 'page-link'
164164
} )
165165
.html( btnDisplay )

js/dataTables.bootstrap4.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/dataTables.bootstrap4.min.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/*! DataTables Bootstrap 4 integration
22
* ©2011-2017 SpryMedia Ltd - datatables.net/license
33
*/
4-
import jQuery from"jquery";import DataTable from"datatables.net";let $=jQuery;$.extend(!0,DataTable.defaults,{dom:"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",renderer:"bootstrap"}),$.extend(DataTable.ext.classes,{sWrapper:"dataTables_wrapper dt-bootstrap4",sFilterInput:"form-control form-control-sm",sLengthSelect:"custom-select custom-select-sm form-control form-control-sm",sProcessing:"dataTables_processing card",sPageButton:"paginate_button page-item"}),DataTable.ext.renderer.pageButton.bootstrap=function(i,a,n,e,d,c){function p(a,e){function t(a){a.preventDefault(),$(a.currentTarget).hasClass("disabled")||m.page()==a.data.action||m.page(a.data.action).draw("page")}for(var s,l,r=0,o=e.length;r<o;r++)if(s=e[r],Array.isArray(s))p(a,s);else{switch(b=u="",s){case"ellipsis":u="&#x2026;",b="disabled";break;case"first":u=f.sFirst,b=s+(0<d?"":" disabled");break;case"previous":u=f.sPrevious,b=s+(0<d?"":" disabled");break;case"next":u=f.sNext,b=s+(d<c-1?"":" disabled");break;case"last":u=f.sLast,b=s+(d<c-1?"":" disabled");break;default:u=s+1,b=d===s?"active":""}u&&(l=-1!==b.indexOf("disabled"),l=$("<li>",{class:g.sPageButton+" "+b,id:0===n&&"string"==typeof s?i.sTableId+"_"+s:null}).append($("<a>",{href:l?null:"#","aria-controls":i.sTableId,"aria-disabled":l?"true":null,"aria-label":x[s],role:"link","aria-current":"active"===b?"page":null,"data-dt-idx":s,tabindex:i.iTabIndex,class:"page-link"}).html(u)).appendTo(a),i.oApi._fnBindAction(l,{action:s},t))}}var u,b,t,m=new DataTable.Api(i),g=i.oClasses,f=i.oLanguage.oPaginate,x=i.oLanguage.oAria.paginate||{};try{t=$(a).find(document.activeElement).data("dt-idx")}catch(a){}p($(a).empty().html('<ul class="pagination"/>').children("ul"),e),void 0!==t&&$(a).find("[data-dt-idx="+t+"]").trigger("focus")};export default DataTable;
4+
import jQuery from"jquery";import DataTable from"datatables.net";let $=jQuery;$.extend(!0,DataTable.defaults,{dom:"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",renderer:"bootstrap"}),$.extend(DataTable.ext.classes,{sWrapper:"dataTables_wrapper dt-bootstrap4",sFilterInput:"form-control form-control-sm",sLengthSelect:"custom-select custom-select-sm form-control form-control-sm",sProcessing:"dataTables_processing card",sPageButton:"paginate_button page-item"}),DataTable.ext.renderer.pageButton.bootstrap=function(i,a,n,e,d,c){function p(a,e){function t(a){a.preventDefault(),$(a.currentTarget).hasClass("disabled")||m.page()==a.data.action||m.page(a.data.action).draw("page")}for(var s,l,r=0,o=e.length;r<o;r++)if(s=e[r],Array.isArray(s))p(a,s);else{switch(b=u="",s){case"ellipsis":u="&#x2026;",b="disabled";break;case"first":u=f.sFirst,b=s+(0<d?"":" disabled");break;case"previous":u=f.sPrevious,b=s+(0<d?"":" disabled");break;case"next":u=f.sNext,b=s+(d<c-1?"":" disabled");break;case"last":u=f.sLast,b=s+(d<c-1?"":" disabled");break;default:u=s+1,b=d===s?"active":""}u&&(l=-1!==b.indexOf("disabled"),l=$("<li>",{class:g.sPageButton+" "+b,id:0===n&&"string"==typeof s?i.sTableId+"_"+s:null}).append($("<a>",{href:l?null:"#","aria-controls":i.sTableId,"aria-disabled":l?"true":null,"aria-label":x[s],role:"link","aria-current":"active"===b?"page":null,"data-dt-idx":s,tabindex:l?-1:i.iTabIndex,class:"page-link"}).html(u)).appendTo(a),i.oApi._fnBindAction(l,{action:s},t))}}var u,b,t,m=new DataTable.Api(i),g=i.oClasses,f=i.oLanguage.oPaginate,x=i.oLanguage.oAria.paginate||{};try{t=$(a).find(document.activeElement).data("dt-idx")}catch(a){}p($(a).empty().html('<ul class="pagination"/>').children("ul"),e),void 0!==t&&$(a).find("[data-dt-idx="+t+"]").trigger("focus")};export default DataTable;

js/dataTables.bootstrap4.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
119119
'role': 'link',
120120
'aria-current': btnClass === 'active' ? 'page' : null,
121121
'data-dt-idx': button,
122-
'tabindex': settings.iTabIndex,
122+
'tabindex': disabled ? -1 : settings.iTabIndex,
123123
'class': 'page-link'
124124
} )
125125
.html( btnDisplay )

0 commit comments

Comments
 (0)