Merge pull request #291 from koalyptus/issue-264-sortable-adapter
Issue 264 sortable adapter
This commit is contained in:
koalyptus
GitHub
commit
90bc10b52a
|
|
@ -1,10 +1,10 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>tablefilter v0.2.63 - Starter</title>
|
||||
<title>tablefilter v0.2.64 - Starter</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>tablefilter v0.2.63</h1>
|
||||
<h1>tablefilter v0.2.64</h1>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.63 by Max Guglielmi
|
||||
* build date: 2016-09-04T08:11:25.143Z
|
||||
* tablefilter v0.2.64 by Max Guglielmi
|
||||
* build date: 2016-09-06T01:36:54.520Z
|
||||
* MIT License
|
||||
*/
|
||||
span.colVisSpan{text-align:left;}span.colVisSpan a.colVis{display:inline-block;padding:7px 5px 0;font-size:inherit;font-weight:inherit;vertical-align:top}div.colVisCont{position:relative;background:#fff;-webkit-box-shadow:3px 3px 2px #888;-moz-box-shadow:3px 3px 2px #888;box-shadow:3px 3px 2px #888;position:absolute;display:none;border:1px solid #ccc;height:auto;width:250px;background-color:#fff;margin:35px 0 0 -100px;z-index:10000;padding:10px 10px 10px 10px;text-align:left;font-size:12px;}div.colVisCont:after,div.colVisCont:before{bottom:100%;left:50%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}div.colVisCont:after{border-color:rgba(255,255,255,0);border-bottom-color:#fff;border-width:10px;margin-left:-10px}div.colVisCont:before{border-color:rgba(255,255,255,0);border-bottom-color:#ccc;border-width:12px;margin-left:-12px}div.colVisCont p{margin:6px auto 6px auto}div.colVisCont a.colVis{display:initial;font-weight:inherit}ul.cols_checklist{padding:0;margin:0;list-style:none;}ul.cols_checklist label{display:block}ul.cols_checklist input{vertical-align:middle;margin:2px 5px 2px 1px}li.cols_checklist_item{padding:4px;margin:0;}li.cols_checklist_item:hover{background-color:#335ea8;color:#fff}.cols_checklist_slc_item{background-color:#335ea8;color:#fff}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.63 by Max Guglielmi
|
||||
* build date: 2016-09-04T08:11:25.143Z
|
||||
* tablefilter v0.2.64 by Max Guglielmi
|
||||
* build date: 2016-09-06T01:36:54.520Z
|
||||
* MIT License
|
||||
*/
|
||||
span.expClpFlt a.btnExpClpFlt{width:35px;height:35px;display:inline-block;}span.expClpFlt a.btnExpClpFlt:hover{background-color:#f4f4f4}span.expClpFlt img{padding:8px 11px 11px 11px}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.63 by Max Guglielmi
|
||||
* build date: 2016-09-04T08:11:25.143Z
|
||||
* tablefilter v0.2.64 by Max Guglielmi
|
||||
* build date: 2016-09-06T01:36:54.520Z
|
||||
* MIT License
|
||||
*/
|
||||
.activeHeader{background-color:#66afe9 !important;color:#fff !important}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.63 by Max Guglielmi
|
||||
* build date: 2016-09-04T08:11:25.143Z
|
||||
* tablefilter v0.2.64 by Max Guglielmi
|
||||
* build date: 2016-09-06T01:36:54.520Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px solid #ccc;border-top:none;border-right:none;border-bottom:none;}table.TF th{background:#ebecee url("images/bg_th.jpg") left top repeat-x;border-bottom:1px solid #d0d0d0;border-right:1px solid #d0d0d0;border-left:1px solid #fff;border-top:1px solid #fff;color:#333}table.TF td{border-bottom:1px dotted #999;padding:5px}.fltrow{background-color:#ebecee !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #666 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #999 !important}input.flt{width:99% !important}.inf{height:$min-height;background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important}input.reset{background:transparent url("images/btn_eraser.gif") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;}.nextPage:hover{background:transparent url("images/btn_over_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important;}.previousPage:hover{background:transparent url("images/btn_over_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;}.firstPage:hover{background:transparent url("images/btn_over_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;}.lastPage:hover{background:transparent url("images/btn_over_last_page.gif") center center no-repeat !important}div.grd_Cont{background-color:#ebecee !important;border:1px solid #ccc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#d5d5d5}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important;}div.grd_headTblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#ebecee url("images/bg_th.jpg") left top repeat-x !important;border-bottom:1px solid #d0d0d0 !important;border-right:1px solid #d0d0d0 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #999 !important}.grd_inf{background:#d7d7d7 url("images/bg_infDiv.jpg") 0 0 repeat-x !important;border-top:1px solid #d0d0d0 !important}.loader{border:1px solid #999}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#fff}.odd{background-color:#d5d5d5}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#999 !important}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.63 by Max Guglielmi
|
||||
* build date: 2016-09-04T08:11:25.143Z
|
||||
* tablefilter v0.2.64 by Max Guglielmi
|
||||
* build date: 2016-09-06T01:36:54.520Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{border-left:1px dotted #81963b;border-top:none;border-right:0;border-bottom:none;}table.TF th{background:#39424b url("images/bg_headers.jpg") left top repeat-x;border-bottom:0;border-right:1px dotted #d0d0d0;border-left:0;border-top:0;color:#fff}table.TF td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b;padding:5px}.fltrow{background-color:#81963b !important;}.fltrow th,.fltrow td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #687830 !important}input.flt{width:99% !important}.inf{background:#d8d8d8;height:$min-height}input.reset{width:53px;background:transparent url("images/btn_filter.png") center center no-repeat !important}.helpBtn:hover{background-color:transparent}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important}.previousPage{background:transparent url("images/btn_previous_page.gif") center center no-repeat !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important}div.grd_Cont{background:#81963b url("images/bg_headers.jpg") left top repeat-x !important;border:1px solid #ccc !important;padding:0 1px 1px 1px !important;}div.grd_Cont .even{background-color:#bccd83}div.grd_Cont .odd{background-color:#fff}div.grd_headTblCont{background-color:#ebecee !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important;}div.grd_tblCont table td{border-bottom:1px dotted #81963b;border-right:1px dotted #81963b}div.grd_tblCont table th,div.grd_headTblCont table th{background:transparent url("images/bg_headers.jpg") 0 0 repeat-x !important;border-bottom:0 !important;border-right:1px dotted #d0d0d0 !important;border-left:0 !important;border-top:0 !important;padding:0 4px 0 4px !important;color:#fff !important;height:35px !important}div.grd_headTblCont table td{border-bottom:1px dotted #39424b !important;border-right:1px dotted #fff !important;border-left:0 !important;border-top:0 !important;background-color:#81963b !important;padding:1px 3px 1px 3px !important}.grd_inf{background-color:#d8d8d8;border-top:1px solid #d0d0d0 !important}.loader{border:0 !important;background:#81963b !important}.defaultLoader{width:32px;height:32px;background:transparent url("images/img_loading.gif") 0 0 no-repeat !important}.even{background-color:#bccd83}.odd{background-color:#fff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.activeHeader{background:#81963b !important}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* tablefilter v0.2.63 by Max Guglielmi
|
||||
* build date: 2016-09-04T08:11:25.143Z
|
||||
* tablefilter v0.2.64 by Max Guglielmi
|
||||
* build date: 2016-09-06T01:36:54.520Z
|
||||
* MIT License
|
||||
*/
|
||||
table.TF{padding:0;color:#000;border-right:1px solid #a4bed4;border-top:1px solid #a4bed4;border-left:1px solid #a4bed4;border-bottom:0;}table.TF th{margin:0;color:inherit;background:#d1e5fe url("images/bg_skyblue.gif") 0 0 repeat-x;border-color:#fdfdfd #a4bed4 #a4bed4 #fdfdfd;border-width:1px;border-style:solid}table.TF td{margin:0;padding:5px;color:inherit;border-bottom:1px solid #a4bed4;border-left:0;border-top:0;border-right:0}.fltrow{background-color:#d1e5fe !important;}.fltrow th,.fltrow td{padding:1px 3px 1px 3px !important}.flt,select.flt,select.flt_multi,.flt_s,.single_flt,.div_checklist{border:1px solid #a4bed4 !important}input.flt{width:99% !important}.inf{background-color:#e3efff !important;border:1px solid #a4bed4;height:$min-height;color:#004a6f}div.tot,div.status{border-right:0 !important}.helpBtn:hover{background-color:transparent}input.reset{background:transparent url("images/icn_clear_filters.png") center center no-repeat !important}.nextPage{background:transparent url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.nextPage:hover{background:#ffe4ab url("images/btn_next_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.previousPage{background:transparent url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.previousPage:hover{background:#ffe4ab url("images/btn_prev_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.firstPage{background:transparent url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.firstPage:hover{background:#ffe4ab url("images/btn_first_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.lastPage{background:transparent url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid transparent !important;}.lastPage:hover{background:#ffe4ab url("images/btn_last_page.gif") center center no-repeat !important;border:1px solid #ffb552 !important}.activeHeader{background:#ffe4ab !important;border:1px solid #ffb552 !important;color:inherit !important}div.grd_Cont{background-color:#d9eaed !important;border:1px solid #9cc !important;padding:0 !important;}div.grd_Cont .even{background-color:#fff}div.grd_Cont .odd{background-color:#e3efff}div.grd_headTblCont{background-color:#d9eaed !important;border-bottom:none !important}div.grd_tblCont table{border-right:none !important}div.grd_tblCont table th,div.grd_headTblCont table th,div.grd_headTblCont table td{background:#d9eaed url("images/bg_skyblue.gif") left top repeat-x;border-bottom:1px solid #a4bed4;border-right:1px solid #a4bed4 !important;border-left:1px solid #fff !important;border-top:1px solid #fff !important}div.grd_tblCont table td{border-bottom:1px solid #a4bed4 !important;border-right:0 !important;border-left:0 !important;border-top:0 !important}.grd_inf{background-color:#cce2fe;color:#004a6f;border-top:1px solid #9cc !important;}.grd_inf a{text-decoration:none;font-weight:bold}.loader{background-color:#2d8eef;border:1px solid #cce2fe;border-radius:5px}.even{background-color:#fff}.odd{background-color:#e3efff}span.expClpFlt a.btnExpClpFlt:hover{background-color:transparent !important}.ezActiveRow{background-color:#ffdc61 !important;color:inherit}.ezSelectedRow{background-color:#ffe4ab !important;color:inherit}.ezActiveCell{background-color:#fff !important;color:#000 !important;font-weight:bold}.ezETSelectedCell{background-color:#fff !important;font-weight:bold;color:#000 !important}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "tablefilter",
|
||||
"version": "0.2.63",
|
||||
"version": "0.2.64",
|
||||
"description": "A Javascript library making HTML tables filterable and a bit more",
|
||||
"license": "MIT",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -6,49 +6,134 @@ import {formatDate} from '../../date';
|
|||
import {removeNbFormat} from '../../helpers';
|
||||
import {NONE, CELL_TAG, HEADER_TAG} from '../../const';
|
||||
|
||||
/**
|
||||
* SortableTable Adapter module
|
||||
*/
|
||||
export default class AdapterSortableTable extends Feature {
|
||||
|
||||
/**
|
||||
* SortableTable Adapter module
|
||||
* @param {Object} tf TableFilter instance
|
||||
* Creates an instance of AdapterSortableTable
|
||||
* @param {TableFilter} tf TableFilter instance
|
||||
* @param {Object} opts Configuration object
|
||||
*/
|
||||
constructor(tf, opts) {
|
||||
super(tf, opts.name);
|
||||
|
||||
/**
|
||||
* Module name
|
||||
* @type {String}
|
||||
*/
|
||||
this.name = opts.name;
|
||||
|
||||
/**
|
||||
* Module description
|
||||
* @type {String}
|
||||
*/
|
||||
this.desc = opts.description || 'Sortable table';
|
||||
|
||||
//indicates if table previously sorted
|
||||
/**
|
||||
* Indicate whether table previously sorted
|
||||
* @type {Boolean}
|
||||
* @private
|
||||
*/
|
||||
this.sorted = false;
|
||||
|
||||
/**
|
||||
* List of sort type per column basis
|
||||
* @type {Array}
|
||||
*/
|
||||
this.sortTypes = isArray(opts.types) ? opts.types : [];
|
||||
|
||||
/**
|
||||
* Column to be sorted at initialization, ie:
|
||||
* sort_col_at_start: [1, true]
|
||||
* @type {Array}
|
||||
*/
|
||||
this.sortColAtStart = isArray(opts.sort_col_at_start) ?
|
||||
opts.sort_col_at_start : null;
|
||||
|
||||
/**
|
||||
* Enable asynchronous sort, if triggers are external
|
||||
* @type {Boolean}
|
||||
*/
|
||||
this.asyncSort = Boolean(opts.async_sort);
|
||||
|
||||
/**
|
||||
* List of element IDs triggering sort on a per column basis
|
||||
* @type {Array}
|
||||
*/
|
||||
this.triggerIds = isArray(opts.trigger_ids) ? opts.trigger_ids : [];
|
||||
|
||||
// edit .sort-arrow.descending / .sort-arrow.ascending in
|
||||
// tablefilter.css to reflect any path change
|
||||
/**
|
||||
* Path to images
|
||||
* @type {String}
|
||||
*/
|
||||
this.imgPath = opts.images_path || tf.themesPath;
|
||||
|
||||
/**
|
||||
* Blank image file name
|
||||
* @type {String}
|
||||
*/
|
||||
this.imgBlank = opts.image_blank || 'blank.png';
|
||||
|
||||
/**
|
||||
* Css class for sort indicator image
|
||||
* @type {String}
|
||||
*/
|
||||
this.imgClassName = opts.image_class_name || 'sort-arrow';
|
||||
|
||||
/**
|
||||
* Css class for ascending sort indicator image
|
||||
* @type {String}
|
||||
*/
|
||||
this.imgAscClassName = opts.image_asc_class_name || 'ascending';
|
||||
|
||||
/**
|
||||
* Css class for descending sort indicator image
|
||||
* @type {String}
|
||||
*/
|
||||
this.imgDescClassName = opts.image_desc_class_name || 'descending';
|
||||
//cell attribute storing custom key
|
||||
|
||||
/**
|
||||
* Cell attribute key storing custom value used for sorting
|
||||
* @type {String}
|
||||
*/
|
||||
this.customKey = opts.custom_key || 'data-tf-sortKey';
|
||||
|
||||
// callback invoked after sort is loaded and instanciated
|
||||
/**
|
||||
* Callback fired when sort extension is instanciated
|
||||
* @type {Function}
|
||||
*/
|
||||
this.onSortLoaded = isFn(opts.on_sort_loaded) ?
|
||||
opts.on_sort_loaded : null;
|
||||
// callback invoked before table is sorted
|
||||
|
||||
/**
|
||||
* Callback fired before a table column is sorted
|
||||
* @type {Function}
|
||||
*/
|
||||
this.onBeforeSort = isFn(opts.on_before_sort) ?
|
||||
opts.on_before_sort : null;
|
||||
// callback invoked after table is sorted
|
||||
|
||||
/**
|
||||
* Callback fired after a table column is sorted
|
||||
* @type {Function}
|
||||
*/
|
||||
this.onAfterSort = isFn(opts.on_after_sort) ? opts.on_after_sort : null;
|
||||
|
||||
/**
|
||||
* SortableTable instance
|
||||
* @private
|
||||
*/
|
||||
this.stt = null;
|
||||
|
||||
this.enable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes AdapterSortableTable instance
|
||||
*/
|
||||
init() {
|
||||
if (this.initialized) {
|
||||
return;
|
||||
|
|
@ -110,7 +195,9 @@ export default class AdapterSortableTable extends Feature {
|
|||
this.emitter.on(['sort'],
|
||||
(tf, colIdx, desc) => this.sortByColumnIndex(colIdx, desc));
|
||||
|
||||
/** @inherited */
|
||||
this.initialized = true;
|
||||
|
||||
this.emitter.emit('sort-initialized', tf, this);
|
||||
}
|
||||
|
||||
|
|
@ -123,6 +210,9 @@ export default class AdapterSortableTable extends Feature {
|
|||
this.stt.sort(colIdx, desc);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set SortableTable overrides for TableFilter integration
|
||||
*/
|
||||
overrideSortableTable() {
|
||||
let adpt = this,
|
||||
tf = this.tf;
|
||||
|
|
@ -285,11 +375,18 @@ export default class AdapterSortableTable extends Feature {
|
|||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a sort type
|
||||
*/
|
||||
addSortType() {
|
||||
var args = arguments;
|
||||
SortableTable.prototype.addSortType(args[0], args[1], args[2], args[3]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the sort types on a column basis
|
||||
* @private
|
||||
*/
|
||||
setSortTypes() {
|
||||
let tf = this.tf,
|
||||
sortTypes = this.sortTypes,
|
||||
|
|
@ -357,7 +454,7 @@ export default class AdapterSortableTable extends Feature {
|
|||
}
|
||||
|
||||
/**
|
||||
* Destroy sort
|
||||
* Remove extension
|
||||
*/
|
||||
destroy() {
|
||||
if (!this.initialized) {
|
||||
|
|
|
|||
|
|
@ -149,6 +149,30 @@ export class GridLayout extends Feature {
|
|||
*/
|
||||
this.tblHasColTag = tag(tf.tbl, 'col').length > 0 ? true : false;
|
||||
|
||||
/**
|
||||
* Main container element
|
||||
* @private
|
||||
*/
|
||||
this.tblMainCont = null;
|
||||
|
||||
/**
|
||||
* Table container element
|
||||
* @private
|
||||
*/
|
||||
this.tblCont = null;
|
||||
|
||||
/**
|
||||
* Headers' table container element
|
||||
* @private
|
||||
*/
|
||||
this.headTblCont = null;
|
||||
|
||||
/**
|
||||
* Headers' table element
|
||||
* @private
|
||||
*/
|
||||
this.headTbl = null;
|
||||
|
||||
// filters flag at TF level
|
||||
tf.fltGrid = this.enableFilters;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue