pull/116/merge
null-d3v 11 years ago
commit c74369be26

@ -243,25 +243,15 @@ table.dataTable td {
display: inline-block; display: inline-block;
min-width: 1.5em; min-width: 1.5em;
padding: 0.5em; padding: 0.5em;
margin-left: 2px;
text-align: center; text-align: center;
text-decoration: none !important; text-decoration: none !important;
cursor: pointer; cursor: pointer;
*cursor: hand; *cursor: hand;
color: #333333 !important;
border: 1px solid transparent; border: 1px solid transparent;
} }
.dataTables_wrapper .dataTables_paginate .fg-button:active { .dataTables_wrapper .dataTables_paginate .fg-button:active {
outline: none; 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 { .dataTables_wrapper .dataTables_processing {
position: absolute; position: absolute;
top: 50%; top: 50%;
@ -287,13 +277,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%); 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 */ /* 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 { .dataTables_wrapper .dataTables_scroll {
clear: both; clear: both;
} }
@ -320,12 +303,12 @@ table.dataTable td {
.dataTables_wrapper .dataTables_filter, .dataTables_wrapper .dataTables_filter,
.dataTables_wrapper .dataTables_info, .dataTables_wrapper .dataTables_info,
.dataTables_wrapper .dataTables_paginate { .dataTables_wrapper .dataTables_paginate {
float: none; float: none;
text-align: center; text-align: center;
} }
.dataTables_wrapper .dataTables_filter, .dataTables_wrapper .dataTables_filter,
.dataTables_wrapper .dataTables_paginate { .dataTables_wrapper .dataTables_paginate {
margin-top: 0.5em; margin-top: 0.5em;
} }
} }
/* /*

@ -1,5 +1,5 @@
/*! DataTables jQuery UI integration /*! DataTables jQuery UI integration
* ©2011-2014 SpryMedia Ltd - datatables.net/license * ©2011-2014 SpryMedia Ltd - datatables.net/license
*/ */
/** /**
@ -7,150 +7,254 @@
* DataTables 1.10 or newer. * DataTables 1.10 or newer.
* *
* This file sets the defaults and adds options to DataTables to style its * This file sets the defaults and adds options to DataTables to style its
* controls using Bootstrap. See http://datatables.net/manual/styling/jqueryui * controls using jQuery UI. See http://datatables.net/manual/styling/jqueryui
* for further information. * for further information.
*/ */
(function(window, document, undefined){ (function()
{
var factory = function( $, DataTable ) { var factory = function($, DataTable)
"use strict"; {
"use strict";
var sort_prefix = 'css_right ui-icon ui-icon-'; var originalDataTable = $.fn.DataTable;
var toolbar_prefix = 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-'; $.fn.DataTable = function(options)
{
/* Set the defaults for DataTables initialisation */ var dataTable = originalDataTable.apply(this, [ options ]);
$.extend( true, DataTable.defaults, {
dom: $(dataTable.table().container()).addClass("ui-widget");
'<"'+toolbar_prefix+'tl ui-corner-tr"lfr>'+
't'+ return dataTable;
'<"'+toolbar_prefix+'bl ui-corner-br"ip>', };
renderer: 'jqueryui'
} ); $.extend(true, DataTable.defaults,
{
dom: "<'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-tl ui-corner-tr'lfr>" +
$.extend( DataTable.ext.classes, { "t" +
"sWrapper": "dataTables_wrapper dt-jqueryui", "<'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-bl ui-corner-br'ip>",
renderer: "jqueryui",
/* Full numbers paging buttons */ });
"sPageButton": "fg-button ui-button ui-state-default", DataTable.defaults.oLanguage.oPaginate.sEllipsis = "..."; // TODO Base DT file needs to be updated with this.
"sPageButtonActive": "ui-state-disabled",
"sPageButtonDisabled": "ui-state-disabled", $.extend(DataTable.ext.classes,
{
/* Features */ sFilterInput: "ui-corner-all",
"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+ sFooterTH: "ui-state-default",
"ui-buttonset-multi paging_", /* Note that the type is postfixed */ sHeaderTH: "ui-state-default",
sPageButton: "fg-button ui-button ui-state-default",
/* Sorting */ sPageButtonActive: "ui-state-highlight",
"sSortAsc": "ui-state-default sorting_asc", sPageButtonDisabled: "ui-state-disabled",
"sSortDesc": "ui-state-default sorting_desc", sPaging: "dataTables_paginate paging_",
"sSortable": "ui-state-default sorting", sScrollFoot: "dataTables_scrollFoot ui-state-default",
"sSortableAsc": "ui-state-default sorting_asc_disabled", sScrollHead: "dataTables_scrollHead ui-state-default",
"sSortableDesc": "ui-state-default sorting_desc_disabled", sSortAsc: "sorting_asc ui-state-default",
"sSortableNone": "ui-state-default sorting_disabled", sSortDesc: "sorting_desc ui-state-default",
"sSortIcon": "DataTables_sort_icon", sSortable: "sorting ui-state-default",
sSortableAsc: "sorting_asc_disabled ui-state-default",
/* Scrolling */ sSortableDesc: "sorting_desc_disabled ui-state-default",
"sScrollHead": "dataTables_scrollHead "+"ui-state-default", sSortableNone: "sorting_disabled ui-state-default",
"sScrollFoot": "dataTables_scrollFoot "+"ui-state-default", sSortIcon: "DataTables_sort_icon",
sWrapper: "dataTables_wrapper dt-jqueryui",
/* Misc */ });
"sHeaderTH": "ui-state-default",
"sFooterTH": "ui-state-default" DataTable.ext.renderer.header.jqueryui = function(settings, $tableHead, column, classes)
} ); {
var sortClass = "";
if (column.bSortable)
DataTable.ext.renderer.header.jqueryui = function ( settings, cell, column, classes ) { {
// Calculate what the unsorted class should be if ($.inArray("asc", column.asSorting) !== -1)
var noSortAppliedClass = sort_prefix+'carat-2-n-s'; {
var asc = $.inArray('asc', column.asSorting) !== -1; if ($.inArray("desc", column.asSorting) !== -1)
var desc = $.inArray('desc', column.asSorting) !== -1; {
sortClass = "css_right ui-icon ui-icon-carat-2-n-s";
if ( !column.bSortable || (!asc && !desc) ) { }
noSortAppliedClass = ''; else
} {
else if ( asc && !desc ) { sortClass = "css_right ui-icon ui-icon-carat-1-n";
noSortAppliedClass = sort_prefix+'carat-1-n'; }
} }
else if ( !asc && desc ) { else if ($.inArray("desc", column.asSorting) !== -1)
noSortAppliedClass = sort_prefix+'carat-1-s'; {
} sortClass = "css_right ui-icon ui-icon-carat-1-s";
}
// Setup the DOM structure }
$('<div/>')
.addClass( 'DataTables_sort_wrapper' ) $("<div>",
.append( cell.contents() ) {
.append( $('<span/>') class: "DataTables_sort_wrapper",
.addClass( classes.sSortIcon+' '+noSortAppliedClass ) })
) .append($tableHead.contents())
.appendTo( cell ); .append($("<span>",
{
// Attach a sort listener to update on sort class: classes.sSortIcon + " " + sortClass,
$(settings.nTable).on( 'order.dt', function ( e, ctx, sorting, columns ) { }))
if ( settings !== ctx ) { .appendTo($tableHead);
return;
} $(settings.nTable).on("order.dt", function(event, context, sorting, columns)
{
var colIdx = column.idx; if (context === settings)
{
cell var $sortIconSpan = $tableHead.find("span." + classes.sSortIcon);
.removeClass( classes.sSortAsc +" "+classes.sSortDesc )
.addClass( columns[ colIdx ] == 'asc' ? $tableHead.removeClass(classes.sSortAsc + " " + classes.sSortDesc);
classes.sSortAsc : columns[ colIdx ] == 'desc' ? $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");
classes.sSortDesc :
column.sSortingClass if (columns[column.idx] === "asc")
); {
$tableHead.addClass(classes.sSortAsc);
cell $sortIconSpan.addClass("css_right ui-icon ui-icon-triangle-1-n");
.find( 'span.'+classes.sSortIcon ) }
.removeClass( else if (columns[column.idx] === "desc")
sort_prefix+'triangle-1-n' +" "+ {
sort_prefix+'triangle-1-s' +" "+ $tableHead.addClass(classes.sSortDesc);
sort_prefix+'carat-2-n-s' +" "+ $sortIconSpan.addClass("css_right ui-icon ui-icon-triangle-1-s");
sort_prefix+'carat-1-n' +" "+ }
sort_prefix+'carat-1-s' else
) {
.addClass( columns[ colIdx ] == 'asc' ? $tableHead.addClass(column.sSortingClass);
sort_prefix+'triangle-1-n' : columns[ colIdx ] == 'desc' ? $sortIconSpan.addClass(sortClass);
sort_prefix+'triangle-1-s' : }
noSortAppliedClass }
); });
} ); };
};
$.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.
* TableTools jQuery UI compatibility try
* Required TableTools 2.1+ {
*/ var activeElement = $(document.activeElement).data("dt-idx");
if ( DataTable.TableTools ) {
$.extend( true, DataTable.TableTools.classes, { var buttonClickHandler = function(event)
"container": "DTTT_container ui-buttonset ui-buttonset-multi", {
"buttons": { settings.oApi._fnPageChange(settings, event.data.action, true);
"normal": "DTTT_button ui-button ui-state-default" };
}, var $host = $(host).empty();
"collection": { var buttonIndex = 0;
"container": "DTTT_collection ui-buttonset ui-buttonset-multi" var addButton = function($container, button)
} {
} ); if ($.isArray(button))
} {
var $buttonDiv = $("<" + (button.DT_el || "div") + ">").appendTo($container);
}; // /factory button.forEach(function(subButton)
{
addButton($buttonDiv, subButton);
// Define as an AMD module if possible });
if ( typeof define === 'function' && define.amd ) { }
define( ['jquery', 'datatables'], factory ); else
} {
else if ( typeof exports === 'object' ) { var buttonText = "";
// Node/CommonJS var disabled = false;
factory( require('jquery'), require('datatables') ); var active = false;
} switch (button)
else if ( jQuery ) { {
// Otherwise simply initialise as normal, stopping multiple evaluation case "ellipsis":
factory( jQuery, jQuery.fn.dataTable ); {
} buttonText = settings.oLanguage.oPaginate.sEllipsis;
disabled = true;
break;
})(window, document); }
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 = $("<a>",
{
"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);
}
})();

Loading…
Cancel
Save