diff --git a/integration/jqueryui/dataTables.jqueryui.css b/integration/jqueryui/dataTables.jqueryui.css index 5a3416d..10cbb73 100644 --- a/integration/jqueryui/dataTables.jqueryui.css +++ b/integration/jqueryui/dataTables.jqueryui.css @@ -329,25 +329,15 @@ table.dataTable td { display: inline-block; min-width: 1.5em; padding: 0.5em; - margin-left: 2px; text-align: center; text-decoration: none !important; cursor: pointer; *cursor: hand; - color: #333333 !important; border: 1px solid transparent; } .dataTables_wrapper .dataTables_paginate .fg-button:active { outline: none; } -.dataTables_wrapper .dataTables_paginate .fg-button:first-child { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} -.dataTables_wrapper .dataTables_paginate .fg-button:last-child { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} .dataTables_wrapper .dataTables_processing { position: absolute; top: 50%; @@ -373,13 +363,6 @@ table.dataTable td { background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); /* W3C */ } -.dataTables_wrapper .dataTables_length, -.dataTables_wrapper .dataTables_filter, -.dataTables_wrapper .dataTables_info, -.dataTables_wrapper .dataTables_processing, -.dataTables_wrapper .dataTables_paginate { - color: #333333; -} .dataTables_wrapper .dataTables_scroll { clear: both; } @@ -406,12 +389,12 @@ table.dataTable td { .dataTables_wrapper .dataTables_filter, .dataTables_wrapper .dataTables_info, .dataTables_wrapper .dataTables_paginate { - float: none; - text-align: center; + float: none; + text-align: center; } .dataTables_wrapper .dataTables_filter, .dataTables_wrapper .dataTables_paginate { - margin-top: 0.5em; + margin-top: 0.5em; } } /* diff --git a/integration/jqueryui/dataTables.jqueryui.js b/integration/jqueryui/dataTables.jqueryui.js index 81fdd7c..aca9974 100644 --- a/integration/jqueryui/dataTables.jqueryui.js +++ b/integration/jqueryui/dataTables.jqueryui.js @@ -1,5 +1,5 @@ /*! DataTables jQuery UI integration - * ©2011-2014 SpryMedia Ltd - datatables.net/license + * ©2011-2014 SpryMedia Ltd - datatables.net/license */ /** @@ -10,147 +10,241 @@ * controls using jQuery UI. See http://datatables.net/manual/styling/jqueryui * for further information. */ -(function(window, document, undefined){ - -var factory = function( $, DataTable ) { -"use strict"; - - -var sort_prefix = 'css_right ui-icon ui-icon-'; -var toolbar_prefix = 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-'; - -/* Set the defaults for DataTables initialisation */ -$.extend( true, DataTable.defaults, { - dom: - '<"'+toolbar_prefix+'tl ui-corner-tr"lfr>'+ - 't'+ - '<"'+toolbar_prefix+'bl ui-corner-br"ip>', - renderer: 'jqueryui' -} ); - - -$.extend( DataTable.ext.classes, { - "sWrapper": "dataTables_wrapper dt-jqueryui", - - /* Full numbers paging buttons */ - "sPageButton": "fg-button ui-button ui-state-default", - "sPageButtonActive": "ui-state-disabled", - "sPageButtonDisabled": "ui-state-disabled", - - /* Features */ - "sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+ - "ui-buttonset-multi paging_", /* Note that the type is postfixed */ - - /* Sorting */ - "sSortAsc": "ui-state-default sorting_asc", - "sSortDesc": "ui-state-default sorting_desc", - "sSortable": "ui-state-default sorting", - "sSortableAsc": "ui-state-default sorting_asc_disabled", - "sSortableDesc": "ui-state-default sorting_desc_disabled", - "sSortableNone": "ui-state-default sorting_disabled", - "sSortIcon": "DataTables_sort_icon", - - /* Scrolling */ - "sScrollHead": "dataTables_scrollHead "+"ui-state-default", - "sScrollFoot": "dataTables_scrollFoot "+"ui-state-default", - - /* Misc */ - "sHeaderTH": "ui-state-default", - "sFooterTH": "ui-state-default" -} ); - - -DataTable.ext.renderer.header.jqueryui = function ( settings, cell, column, classes ) { - // Calculate what the unsorted class should be - var noSortAppliedClass = sort_prefix+'carat-2-n-s'; - var asc = $.inArray('asc', column.asSorting) !== -1; - var desc = $.inArray('desc', column.asSorting) !== -1; - - if ( !column.bSortable || (!asc && !desc) ) { - noSortAppliedClass = ''; - } - else if ( asc && !desc ) { - noSortAppliedClass = sort_prefix+'carat-1-n'; - } - else if ( !asc && desc ) { - noSortAppliedClass = sort_prefix+'carat-1-s'; - } - - // Setup the DOM structure - $('
') - .addClass( 'DataTables_sort_wrapper' ) - .append( cell.contents() ) - .append( $('') - .addClass( classes.sSortIcon+' '+noSortAppliedClass ) - ) - .appendTo( cell ); - - // Attach a sort listener to update on sort - $(settings.nTable).on( 'order.dt', function ( e, ctx, sorting, columns ) { - if ( settings !== ctx ) { - return; - } - - var colIdx = column.idx; - - cell - .removeClass( classes.sSortAsc +" "+classes.sSortDesc ) - .addClass( columns[ colIdx ] == 'asc' ? - classes.sSortAsc : columns[ colIdx ] == 'desc' ? - classes.sSortDesc : - column.sSortingClass - ); - - cell - .find( 'span.'+classes.sSortIcon ) - .removeClass( - sort_prefix+'triangle-1-n' +" "+ - sort_prefix+'triangle-1-s' +" "+ - sort_prefix+'carat-2-n-s' +" "+ - sort_prefix+'carat-1-n' +" "+ - sort_prefix+'carat-1-s' - ) - .addClass( columns[ colIdx ] == 'asc' ? - sort_prefix+'triangle-1-n' : columns[ colIdx ] == 'desc' ? - sort_prefix+'triangle-1-s' : - noSortAppliedClass - ); - } ); -}; - - -/* - * TableTools jQuery UI compatibility - * Required TableTools 2.1+ - */ -if ( DataTable.TableTools ) { - $.extend( true, DataTable.TableTools.classes, { - "container": "DTTT_container ui-buttonset ui-buttonset-multi", - "buttons": { - "normal": "DTTT_button ui-button ui-state-default" - }, - "collection": { - "container": "DTTT_collection ui-buttonset ui-buttonset-multi" - } - } ); -} - -}; // /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); - +(function() +{ + var factory = function($, DataTable) + { + "use strict"; + + $.extend(true, DataTable.defaults, + { + dom: "<'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-tl ui-corner-tr'lfr>" + + "t" + + "<'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-bl ui-corner-br'ip>", + renderer: "jqueryui", + }); + DataTable.defaults.oLanguage.oPaginate.sEllipsis = "..."; // TODO Base DT file needs to be updated with this. + + $.extend(DataTable.ext.classes, + { + sFilterInput: "ui-corner-all", + sFooterTH: "ui-state-default", + sHeaderTH: "ui-state-default", + sPageButton: "fg-button ui-button ui-state-default", + sPageButtonActive: "ui-state-highlight", + sPageButtonDisabled: "ui-state-disabled", + sPaging: "dataTables_paginate paging_", + sScrollFoot: "dataTables_scrollFoot ui-state-default", + sScrollHead: "dataTables_scrollHead ui-state-default", + sSortAsc: "sorting_asc ui-state-default", + sSortDesc: "sorting_desc ui-state-default", + sSortable: "sorting ui-state-default", + sSortableAsc: "sorting_asc_disabled ui-state-default", + sSortableDesc: "sorting_desc_disabled ui-state-default", + sSortableNone: "sorting_disabled ui-state-default", + sSortIcon: "DataTables_sort_icon", + sWrapper: "dataTables_wrapper dt-jqueryui ui-widget", + }); + + DataTable.ext.renderer.header.jqueryui = function(settings, $tableHead, column, classes) + { + var sortClass = ""; + if (column.bSortable) + { + if ($.inArray("asc", column.asSorting) !== -1) + { + if ($.inArray("desc", column.asSorting) !== -1) + { + sortClass = "css_right ui-icon ui-icon-carat-2-n-s"; + } + else + { + sortClass = "css_right ui-icon ui-icon-carat-1-n"; + } + } + else if ($.inArray("desc", column.asSorting) !== -1) + { + sortClass = "css_right ui-icon ui-icon-carat-1-s"; + } + } + + $("
", + { + class: "DataTables_sort_wrapper", + }) + .append($tableHead.contents()) + .append($("", + { + class: classes.sSortIcon + " " + sortClass, + })) + .appendTo($tableHead); + + $(settings.nTable).on("order.dt", function(event, context, sorting, columns) + { + if (context === settings) + { + var $sortIconSpan = $tableHead.find("span." + classes.sSortIcon); + + $tableHead.removeClass(classes.sSortAsc + " " + classes.sSortDesc); + $sortIconSpan.removeClass("css_right ui-icon ui-icon-carat-1-n ui-icon-carat-1-s ui-icon-carat-2-n-s ui-icon-triangle-1-n ui-icon-triangle-1-s"); + + if (columns[column.idx] === "asc") + { + $tableHead.addClass(classes.sSortAsc); + $sortIconSpan.addClass("css_right ui-icon ui-icon-triangle-1-n"); + } + else if (columns[column.idx] === "desc") + { + $tableHead.addClass(classes.sSortDesc); + $sortIconSpan.addClass("css_right ui-icon ui-icon-triangle-1-s"); + } + else + { + $tableHead.addClass(column.sSortingClass); + $sortIconSpan.addClass(sortClass); + } + } + }); + }; + + $.fn.dataTable.ext.renderer.pageButton.jqueryui = function(settings, host, index, buttons, page, pages) + { + // IE9 throws an "unknown error" if document.activeElement is used inside an iframe or frame. + try + { + var activeElement = $(document.activeElement).data("dt-idx"); + + var buttonClickHandler = function(event) + { + settings.oApi._fnPageChange(settings, event.data.action, true); + }; + var $host = $(host).empty(); + var buttonIndex = 0; + var addButton = function($container, button) + { + if ($.isArray(button)) + { + var $buttonDiv = $("<" + (button.DT_el || "div") + ">").appendTo($container); + button.forEach(function(subButton) + { + addButton($buttonDiv, subButton); + }); + } + else + { + var buttonText = ""; + var disabled = false; + var active = false; + switch (button) + { + case "ellipsis": + { + buttonText = settings.oLanguage.oPaginate.sEllipsis; + disabled = true; + break; + } + case "first": + { + buttonText = settings.oLanguage.oPaginate.sFirst; + disabled = page === 0; + break; + } + case "next": + { + buttonText = settings.oLanguage.oPaginate.sNext; + disabled = page === pages - 1; + break; + } + case "previous": + { + buttonText = settings.oLanguage.oPaginate.sPrevious; + disabled = page === 0; + break; + } + case "last": + { + buttonText = settings.oLanguage.oPaginate.sLast; + disabled = page === pages - 1; + break; + } + default: + { + buttonText = button + 1; + active = page === button; + disabled = false; + break; + } + } + + var $buttonAnchor = $("", + { + "aria-controls": settings.sTableId, + class: settings.oClasses.sPageButton + (active ? " " + settings.oClasses.sPageButtonActive : ""), + "data-dt-idx": buttonIndex, + id: index === 0 && typeof(button) === "string" ? settings.sTableId + "_" + button : null, + "tabindex": settings.iTabIndex, + }) + .html(buttonText) + .appendTo($container) + .button( + { + disabled: disabled, + }) + .removeClass("ui-corner-all"); + + settings.oApi._fnBindAction($buttonAnchor, { action: button, }, buttonClickHandler); + + buttonIndex++; + } + }; + buttons.forEach(function(button) + { + addButton($host, button); + }); + + $host.find("a:first").addClass("ui-corner-tl ui-corner-bl"); + $host.find("a:last").addClass("ui-corner-tr ui-corner-br"); + + if (activeElement !== null) + { + $(host).find("[data-dt-idx=" + activeElement + "]").focus(); + } + } + catch (exception) { } + }; + + /* + * TableTools jQuery UI compatibility + * Required TableTools 2.1+ + */ + if (DataTable.TableTools) + { + $.extend(true, DataTable.TableTools.classes, + { + buttons: + { + normal: "DTTT_button ui-button ui-state-default", + }, + collection: + { + container: "DTTT_collection ui-buttonset ui-buttonset-multi", + }, + container: "DTTT_container ui-buttonset ui-buttonset-multi", + }); + } + }; + + if (typeof(define) === "function" && define.amd) + { + define([ "jquery", "datatables" ], factory); + } + else if (typeof(exports) === "object") + { + // Node/CommonJS + factory(require("jquery"), require("datatables")); + } + else if (typeof(jQuery) !== "undefined") + { + factory($, $.fn.dataTable); + } +})();