Merge pull request #23 from challgren/datatables1.10.4

Updating datatables to 1.10.4 and new DataTables bootstrap

js/plugins/dataTables/dataTables.bootstrap.js

@@ -1,219 +1,140 @@
+/*! DataTables Bootstrap 3 integration
+ * ©2011-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * DataTables integration for Bootstrap 3. This requires Bootstrap 3 and
+ * DataTables 1.10 or newer.
+ *
+ * This file sets the defaults and adds options to DataTables to style its
+ * controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
+ * for further information.
+ */
+(function(window, document, undefined){
+
+var factory = function( $, DataTable ) {
+"use strict";
+
+
 /* Set the defaults for DataTables initialisation */
-$.extend(true, $.fn.dataTable.defaults, {
-    "sDom": "<'row'<'col-sm-6'l><'col-sm-6'f>r>" + "t" + "<'row'<'col-sm-6'i><'col-sm-6'p>>",
-    "oLanguage": {
-        "sLengthMenu": "_MENU_ records per page"
-    }
-});
+$.extend( true, DataTable.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'
+} );
 
 
 /* Default class modification */
-$.extend($.fn.dataTableExt.oStdClasses, {
-    "sWrapper": "dataTables_wrapper form-inline",
-    "sFilterInput": "form-control input-sm",
-    "sLengthSelect": "form-control input-sm"
-});
+$.extend( DataTable.ext.classes, {
+    sWrapper:      "dataTables_wrapper form-inline dt-bootstrap",
+    sFilterInput:  "form-control input-sm",
+    sLengthSelect: "form-control input-sm"
+} );
 
-// In 1.10 we use the pagination renderers to draw the Bootstrap paging,
-// rather than  custom plug-in
-if ($.fn.dataTable.Api) {
-    $.fn.dataTable.defaults.renderer = 'bootstrap';
-    $.fn.dataTable.ext.renderer.pageButton.bootstrap = function(settings, host, idx, buttons, page, pages) {
-        var api = new $.fn.dataTable.Api(settings);
-        var classes = settings.oClasses;
-        var lang = settings.oLanguage.oPaginate;
-        var btnDisplay, btnClass;
 
-        var attach = function(container, buttons) {
-            var i, ien, node, button;
-            var clickHandler = function(e) {
-                e.preventDefault();
-                if (e.data.action !== 'ellipsis') {
-                    api.page(e.data.action).draw(false);
-                }
-            };
+/* Bootstrap paging button renderer */
+DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
+    var api     = new DataTable.Api( settings );
+    var classes = settings.oClasses;
+    var lang    = settings.oLanguage.oPaginate;
+    var btnDisplay, btnClass;
 
-            for (i = 0, ien = buttons.length; i < ien; i++) {
-                button = buttons[i];
-
-                if ($.isArray(button)) {
-                    attach(container, button);
-                } else {
-                    btnDisplay = '';
-                    btnClass = '';
-
-                    switch (button) {
-                        case 'ellipsis':
-                            btnDisplay = '&hellip;';
-                            btnClass = 'disabled';
-                            break;
-
-                        case 'first':
-                            btnDisplay = lang.sFirst;
-                            btnClass = button + (page > 0 ?
-                                '' : ' disabled');
-                            break;
-
-                        case 'previous':
-                            btnDisplay = lang.sPrevious;
-                            btnClass = button + (page > 0 ?
-                                '' : ' disabled');
-                            break;
-
-                        case 'next':
-                            btnDisplay = lang.sNext;
-                            btnClass = button + (page < pages - 1 ?
-                                '' : ' disabled');
-                            break;
-
-                        case 'last':
-                            btnDisplay = lang.sLast;
-                            btnClass = button + (page < pages - 1 ?
-                                '' : ' disabled');
-                            break;
-
-                        default:
-                            btnDisplay = button + 1;
-                            btnClass = page === button ?
-                                'active' : '';
-                            break;
-                    }
-
-                    if (btnDisplay) {
-                        node = $('<li>', {
-                            'class': classes.sPageButton + ' ' + btnClass,
-                            'aria-controls': settings.sTableId,
-                            'tabindex': settings.iTabIndex,
-                            'id': idx === 0 && typeof button === 'string' ? settings.sTableId + '_' + button : null
-                        })
-                            .append($('<a>', {
-                                    'href': '#'
-                                })
-                                .html(btnDisplay)
-                        )
-                            .appendTo(container);
-
-                        settings.oApi._fnBindAction(
-                            node, {
-                                action: button
-                            }, clickHandler
-                        );
-                    }
-                }
+    var attach = function( container, buttons ) {
+        var i, ien, node, button;
+        var clickHandler = function ( e ) {
+            e.preventDefault();
+            if ( !$(e.currentTarget).hasClass('disabled') ) {
+                api.page( e.data.action ).draw( false );
             }
         };
 
-        attach(
-            $(host).empty().html('<ul class="pagination"/>').children('ul'),
-            buttons
-        );
-    }
-} else {
-    // Integration for 1.9-
-    $.fn.dataTable.defaults.sPaginationType = 'bootstrap';
+        for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+            button = buttons[i];
 
-    /* API method to get paging information */
-    $.fn.dataTableExt.oApi.fnPagingInfo = function(oSettings) {
-        return {
-            "iStart": oSettings._iDisplayStart,
-            "iEnd": oSettings.fnDisplayEnd(),
-            "iLength": oSettings._iDisplayLength,
-            "iTotal": oSettings.fnRecordsTotal(),
-            "iFilteredTotal": oSettings.fnRecordsDisplay(),
-            "iPage": oSettings._iDisplayLength === -1 ? 0 : Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength),
-            "iTotalPages": oSettings._iDisplayLength === -1 ? 0 : Math.ceil(oSettings.fnRecordsDisplay() / oSettings._iDisplayLength)
-        };
-    };
+            if ( $.isArray( button ) ) {
+                attach( container, button );
+            }
+            else {
+                btnDisplay = '';
+                btnClass = '';
 
-    /* Bootstrap style pagination control */
-    $.extend($.fn.dataTableExt.oPagination, {
-        "bootstrap": {
-            "fnInit": function(oSettings, nPaging, fnDraw) {
-                var oLang = oSettings.oLanguage.oPaginate;
-                var fnClickHandler = function(e) {
-                    e.preventDefault();
-                    if (oSettings.oApi._fnPageChange(oSettings, e.data.action)) {
-                        fnDraw(oSettings);
-                    }
-                };
+                switch ( button ) {
+                    case 'ellipsis':
+                        btnDisplay = '&hellip;';
+                        btnClass = 'disabled';
+                        break;
 
-                $(nPaging).append(
-                    '<ul class="pagination">' +
-                    '<li class="prev disabled"><a href="#">&larr; ' + oLang.sPrevious + '</a></li>' +
-                    '<li class="next disabled"><a href="#">' + oLang.sNext + ' &rarr; </a></li>' +
-                    '</ul>'
-                );
-                var els = $('a', nPaging);
-                $(els[0]).bind('click.DT', {
-                    action: "previous"
-                }, fnClickHandler);
-                $(els[1]).bind('click.DT', {
-                    action: "next"
-                }, fnClickHandler);
-            },
+                    case 'first':
+                        btnDisplay = lang.sFirst;
+                        btnClass = button + (page > 0 ?
+                            '' : ' disabled');
+                        break;
 
-            "fnUpdate": function(oSettings, fnDraw) {
-                var iListLength = 5;
-                var oPaging = oSettings.oInstance.fnPagingInfo();
-                var an = oSettings.aanFeatures.p;
-                var i, ien, j, sClass, iStart, iEnd, iHalf = Math.floor(iListLength / 2);
+                    case 'previous':
+                        btnDisplay = lang.sPrevious;
+                        btnClass = button + (page > 0 ?
+                            '' : ' disabled');
+                        break;
 
-                if (oPaging.iTotalPages < iListLength) {
-                    iStart = 1;
-                    iEnd = oPaging.iTotalPages;
-                } else if (oPaging.iPage <= iHalf) {
-                    iStart = 1;
-                    iEnd = iListLength;
-                } else if (oPaging.iPage >= (oPaging.iTotalPages - iHalf)) {
-                    iStart = oPaging.iTotalPages - iListLength + 1;
-                    iEnd = oPaging.iTotalPages;
-                } else {
-                    iStart = oPaging.iPage - iHalf + 1;
-                    iEnd = iStart + iListLength - 1;
+                    case 'next':
+                        btnDisplay = lang.sNext;
+                        btnClass = button + (page < pages-1 ?
+                            '' : ' disabled');
+                        break;
+
+                    case 'last':
+                        btnDisplay = lang.sLast;
+                        btnClass = button + (page < pages-1 ?
+                            '' : ' disabled');
+                        break;
+
+                    default:
+                        btnDisplay = button + 1;
+                        btnClass = page === button ?
+                            'active' : '';
+                        break;
                 }
 
-                for (i = 0, ien = an.length; i < ien; i++) {
-                    // Remove the middle elements
-                    $('li:gt(0)', an[i]).filter(':not(:last)').remove();
+                if ( btnDisplay ) {
+                    node = $('<li>', {
+                            'class': classes.sPageButton+' '+btnClass,
+                            'aria-controls': settings.sTableId,
+                            'tabindex': settings.iTabIndex,
+                            'id': idx === 0 && typeof button === 'string' ?
+                                settings.sTableId +'_'+ button :
+                                null
+                        } )
+                        .append( $('<a>', {
+                                'href': '#'
+                            } )
+                            .html( btnDisplay )
+                        )
+                        .appendTo( container );
 
-                    // Add the new list items and their event handlers
-                    for (j = iStart; j <= iEnd; j++) {
-                        sClass = (j == oPaging.iPage + 1) ? 'class="active"' : '';
-                        $('<li ' + sClass + '><a href="#">' + j + '</a></li>')
-                            .insertBefore($('li:last', an[i])[0])
-                            .bind('click', function(e) {
-                                e.preventDefault();
-                                oSettings._iDisplayStart = (parseInt($('a', this).text(), 10) - 1) * oPaging.iLength;
-                                fnDraw(oSettings);
-                            });
-                    }
-
-                    // Add / remove disabled classes from the static elements
-                    if (oPaging.iPage === 0) {
-                        $('li:first', an[i]).addClass('disabled');
-                    } else {
-                        $('li:first', an[i]).removeClass('disabled');
-                    }
-
-                    if (oPaging.iPage === oPaging.iTotalPages - 1 || oPaging.iTotalPages === 0) {
-                        $('li:last', an[i]).addClass('disabled');
-                    } else {
-                        $('li:last', an[i]).removeClass('disabled');
-                    }
+                    settings.oApi._fnBindAction(
+                        node, {action: button}, clickHandler
+                    );
                 }
             }
         }
-    });
-}
+    };
+
+    attach(
+        $(host).empty().html('<ul class="pagination"/>').children('ul'),
+        buttons
+    );
+};
 
 
 /*
  * TableTools Bootstrap compatibility
  * Required TableTools 2.1+
  */
-if ($.fn.DataTable.TableTools) {
+if ( DataTable.TableTools ) {
     // Set the classes that TableTools uses to something suitable for Bootstrap
-    $.extend(true, $.fn.DataTable.TableTools.classes, {
+    $.extend( true, DataTable.TableTools.classes, {
         "container": "DTTT btn-group",
         "buttons": {
             "normal": "btn btn-default",
@@ -227,19 +148,38 @@ if ($.fn.DataTable.TableTools) {
             }
         },
         "print": {
-            "info": "DTTT_print_info modal"
+            "info": "DTTT_print_info"
         },
         "select": {
             "row": "active"
         }
-    });
+    } );
 
-    // Have the collection use a bootstrap compatible dropdown
-    $.extend(true, $.fn.DataTable.TableTools.DEFAULTS.oTags, {
+    // Have the collection use a bootstrap compatible drop down
+    $.extend( true, DataTable.TableTools.DEFAULTS.oTags, {
         "collection": {
             "container": "ul",
             "button": "li",
             "liner": "a"
         }
-    });
+    } );
 }
+
+}; // /factory
+
+
+// Define as an AMD module if possible
+if ( typeof define === 'function' && define.amd ) {
+    define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
+}
+else if ( jQuery ) {
+    // Otherwise simply initialise as normal, stopping multiple evaluation
+    factory( jQuery, jQuery.fn.dataTable );
+}
+
+
+})(window, document);