From 7de09b4294f75a94ff42888d4d52e422d2e19f82 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 7 Nov 2014 09:52:16 +0000 Subject: [PATCH] Fix: Bootlint picked up that the processing element was a child of a `row` class element. * Fixes #120 Fix: Processing display message was misaligned a bit --- integration/bootstrap/3/dataTables.bootstrap.css | 3 ++- integration/bootstrap/3/dataTables.bootstrap.js | 4 ++-- integration/bootstrap/3/dataTables.bootstrap.min.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration/bootstrap/3/dataTables.bootstrap.css b/integration/bootstrap/3/dataTables.bootstrap.css index 24c21d4..18de8c0 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.css +++ b/integration/bootstrap/3/dataTables.bootstrap.css @@ -243,10 +243,11 @@ div.dataTables_processing { top: 50%; left: 50%; width: 100%; - height: 40px; + height: 60px; margin-left: -50%; margin-top: -25px; padding-top: 20px; + padding-bottom: 20px; text-align: center; font-size: 1.2em; background-color: white; diff --git a/integration/bootstrap/3/dataTables.bootstrap.js b/integration/bootstrap/3/dataTables.bootstrap.js index f75770c..2c6959d 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.js +++ b/integration/bootstrap/3/dataTables.bootstrap.js @@ -19,8 +19,8 @@ var factory = function( $, DataTable ) { /* Set the defaults for DataTables initialisation */ $.extend( true, DataTable.defaults, { dom: - "<'row'<'col-sm-6'l><'col-sm-6'f>r>" + - "<'row'<'col-sm-12't>>" + + "<'row'<'col-sm-6'l><'col-sm-6'f>>" + + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-6'i><'col-sm-6'p>>", renderer: 'bootstrap' } ); diff --git a/integration/bootstrap/3/dataTables.bootstrap.min.js b/integration/bootstrap/3/dataTables.bootstrap.min.js index 2e13c52..f0d09b9 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.min.js +++ b/integration/bootstrap/3/dataTables.bootstrap.min.js @@ -2,7 +2,7 @@ DataTables Bootstrap 3 integration ©2011-2014 SpryMedia Ltd - datatables.net/license */ -(function(){var f=function(c,b){c.extend(!0,b.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>r><'row'<'col-sm-12't>><'row'<'col-sm-6'i><'col-sm-6'p>>",renderer:"bootstrap"});c.extend(b.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});b.ext.renderer.pageButton.bootstrap=function(g,f,p,k,h,l){var q=new b.Api(g),r=g.oClasses,i=g.oLanguage.oPaginate,d,e,o=function(b,f){var j,m,n,a,k=function(a){a.preventDefault(); +(function(){var f=function(c,b){c.extend(!0,b.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-6'i><'col-sm-6'p>>",renderer:"bootstrap"});c.extend(b.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});b.ext.renderer.pageButton.bootstrap=function(g,f,p,k,h,l){var q=new b.Api(g),r=g.oClasses,i=g.oLanguage.oPaginate,d,e,o=function(b,f){var j,m,n,a,k=function(a){a.preventDefault(); c(a.currentTarget).hasClass("disabled")||q.page(a.data.action).draw(!1)};j=0;for(m=f.length;j",{"class":r.sPageButton+" "+ e,"aria-controls":g.sTableId,tabindex:g.iTabIndex,id:0===p&&"string"===typeof a?g.sTableId+"_"+a:null}).append(c("",{href:"#"}).html(d)).appendTo(b),g.oApi._fnBindAction(n,{action:a},k))}};o(c(f).empty().html('
    ').children("ul"),k)};b.TableTools&&(c.extend(!0,b.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"}}),c.extend(!0,b.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],f):"object"===typeof exports?f(require("jquery"),require("datatables")):jQuery&&f(jQuery,jQuery.fn.dataTable)})(window,document);