1
0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00

Fix: Bootstrap and Foundation integration XHTML error for ellipsis entity

- From @dstoeckel DataTables/Plugins/pull/225
This commit is contained in:
Allan Jardine 2015-10-13 15:29:49 +01:00
parent 6fc22e712d
commit e8fc79f858
5 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
28b728bd8c6913101520dc48d74f77a670b63b57
af2610be0a9525494d934559e345961d5941efce

View File

@ -80,7 +80,7 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu
switch ( button ) {
case 'ellipsis':
btnDisplay = '…';
btnDisplay = '…';
btnClass = 'disabled';
break;

View File

@ -3,7 +3,7 @@
©2011-2015 SpryMedia Ltd - datatables.net/license
*/
(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],b):"object"===typeof exports?module.exports=function(a){a||(a=require("jquery"));a.fn.dataTable||require("datatables.net")(a);b(a)}:b(jQuery)})(function(b){var a=b.fn.dataTable;b.extend(!0,a.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(a.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",
sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});a.ext.renderer.pageButton.bootstrap=function(f,g,r,l,i,m){var n=new a.Api(f),s=f.oClasses,j=f.oLanguage.oPaginate,d,e,o=0,q=function(a,g){var k,h,p,c,l=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")};k=0;for(h=g.length;k<h;k++)if(c=g[k],b.isArray(c))q(a,c);else{e=d="";switch(c){case "ellipsis":d="&hellip;";e="disabled";
sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});a.ext.renderer.pageButton.bootstrap=function(f,g,r,l,i,m){var n=new a.Api(f),s=f.oClasses,j=f.oLanguage.oPaginate,d,e,o=0,q=function(a,g){var k,h,p,c,l=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&n.page()!=a.data.action&&n.page(a.data.action).draw("page")};k=0;for(h=g.length;k<h;k++)if(c=g[k],b.isArray(c))q(a,c);else{e=d="";switch(c){case "ellipsis":d="&#x2026;";e="disabled";
break;case "first":d=j.sFirst;e=c+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;e=c+(0<i?"":" disabled");break;case "next":d=j.sNext;e=c+(i<m-1?"":" disabled");break;case "last":d=j.sLast;e=c+(i<m-1?"":" disabled");break;default:d=c+1,e=i===c?"active":""}d&&(p=b("<li>",{"class":s.sPageButton+" "+e,id:0===r&&"string"===typeof c?f.sTableId+"_"+c:null}).append(b("<a>",{href:"#","aria-controls":f.sTableId,"data-dt-idx":o,tabindex:f.iTabIndex}).html(d)).appendTo(a),f.oApi._fnBindAction(p,{action:c},
l),o++)}},h;try{h=b(g).find(document.activeElement).data("dt-idx")}catch(t){}q(b(g).empty().html('<ul class="pagination"/>').children("ul"),l);h&&b(g).find("[data-dt-idx="+h+"]").focus()};a.TableTools&&(b.extend(!0,a.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,a.TableTools.DEFAULTS.oTags,
{collection:{container:"ul",button:"li",liner:"a"}}));return a});

View File

@ -77,7 +77,7 @@ DataTable.ext.renderer.pageButton.foundation = function ( settings, host, idx, b
switch ( button ) {
case 'ellipsis':
btnDisplay = '&hellip;';
btnDisplay = '&#x2026;';
btnClass = 'unavailable';
break;

View File

@ -3,5 +3,5 @@
©2011-2015 SpryMedia Ltd - datatables.net/license
*/
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],c):"object"===typeof exports?module.exports=function(a){a||(a=require("jquery"));a.fn.dataTable||require("datatables.net")(a);c(a)}:c(jQuery)})(function(c){var a=c.fn.dataTable;c.extend(a.ext.classes,{sWrapper:"dataTables_wrapper dt-foundation",sProcessing:"dataTables_processing panel"});c.extend(!0,a.defaults,{dom:"<'row'<'small-6 columns'l><'small-6 columns'f>r>t<'row'<'small-6 columns'i><'small-6 columns'p>>",
renderer:"foundation"});a.ext.renderer.pageButton.foundation=function(f,j,q,r,g,k){var l=new a.Api(f),s=f.oClasses,h=f.oLanguage.oPaginate,d,e,p=function(a,m){var i,n,o,b,j=function(a){a.preventDefault();!c(a.currentTarget).hasClass("unavailable")&&l.page()!=a.data.action&&l.page(a.data.action).draw("page")};i=0;for(n=m.length;i<n;i++)if(b=m[i],c.isArray(b))p(a,b);else{e=d="";switch(b){case "ellipsis":d="&hellip;";e="unavailable";break;case "first":d=h.sFirst;e=b+(0<g?"":" unavailable");break;case "previous":d=
renderer:"foundation"});a.ext.renderer.pageButton.foundation=function(f,j,q,r,g,k){var l=new a.Api(f),s=f.oClasses,h=f.oLanguage.oPaginate,d,e,p=function(a,m){var i,n,o,b,j=function(a){a.preventDefault();!c(a.currentTarget).hasClass("unavailable")&&l.page()!=a.data.action&&l.page(a.data.action).draw("page")};i=0;for(n=m.length;i<n;i++)if(b=m[i],c.isArray(b))p(a,b);else{e=d="";switch(b){case "ellipsis":d="&#x2026;";e="unavailable";break;case "first":d=h.sFirst;e=b+(0<g?"":" unavailable");break;case "previous":d=
h.sPrevious;e=b+(0<g?"":" unavailable");break;case "next":d=h.sNext;e=b+(g<k-1?"":" unavailable");break;case "last":d=h.sLast;e=b+(g<k-1?"":" unavailable");break;default:d=b+1,e=g===b?"current":""}d&&(o=c("<li>",{"class":s.sPageButton+" "+e,"aria-controls":f.sTableId,tabindex:f.iTabIndex,id:0===q&&"string"===typeof b?f.sTableId+"_"+b:null}).append(c("<a>",{href:"#"}).html(d)).appendTo(a),f.oApi._fnBindAction(o,{action:b},j))}};p(c(j).empty().html('<ul class="pagination"/>').children("ul"),r)};return a});