mirror of
https://github.com/koalyptus/TableFilter.git
synced 2024-06-16 04:35:27 +02:00
Fixed sort with gridlayout
This commit is contained in:
parent
8df7cf1c38
commit
dadf94666d
2
dist/filtergrid.css
vendored
2
dist/filtergrid.css
vendored
|
@ -1,6 +1,6 @@
|
||||||
/*------------------------------------------------------------------------
|
/*------------------------------------------------------------------------
|
||||||
- TableFilter stylesheet by Max Guglielmi
|
- TableFilter stylesheet by Max Guglielmi
|
||||||
- (build date: Mon Apr 06 2015 19:51:07)
|
- (build date: Sat Apr 11 2015 19:04:42)
|
||||||
- Edit below for your projects' needs
|
- Edit below for your projects' needs
|
||||||
------------------------------------------------------------------------*/
|
------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import {Types} from '../../types';
|
import {Types} from '../../types';
|
||||||
import {Dom} from '../../dom';
|
import {Dom} from '../../dom';
|
||||||
import {Arr as array} from '../../array';
|
import {Arr} from '../../array';
|
||||||
import {Event} from '../../event';
|
import {Event} from '../../event';
|
||||||
import {DateHelper} from '../../date';
|
import {DateHelper} from '../../date';
|
||||||
import {Helpers} from '../../helpers';
|
import {Helpers} from '../../helpers';
|
||||||
|
@ -200,7 +200,8 @@ export class AdapterSortableTable{
|
||||||
SortableTable.prototype.initHeader = function(oSortTypes){
|
SortableTable.prototype.initHeader = function(oSortTypes){
|
||||||
var stt = this;
|
var stt = this;
|
||||||
if (!stt.tHead){
|
if (!stt.tHead){
|
||||||
throw new Error('Sorting feature requires a THEAD element');
|
// throw new Error('Sorting feature requires a THEAD element');
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
stt.headersRow = tf.headersRow;
|
stt.headersRow = tf.headersRow;
|
||||||
var cells = stt.tHead.rows[stt.headersRow].cells;
|
var cells = stt.tHead.rows[stt.headersRow].cells;
|
||||||
|
@ -295,6 +296,9 @@ export class AdapterSortableTable{
|
||||||
* @return {String} DOM element inner text
|
* @return {String} DOM element inner text
|
||||||
*/
|
*/
|
||||||
SortableTable.getInnerText = function(oNode){
|
SortableTable.getInnerText = function(oNode){
|
||||||
|
if(!oNode){
|
||||||
|
return;
|
||||||
|
}
|
||||||
if(oNode.getAttribute(adpt.sortCustomKey)){
|
if(oNode.getAttribute(adpt.sortCustomKey)){
|
||||||
return oNode.getAttribute(adpt.sortCustomKey);
|
return oNode.getAttribute(adpt.sortCustomKey);
|
||||||
} else {
|
} else {
|
||||||
|
@ -361,10 +365,7 @@ export class AdapterSortableTable{
|
||||||
var trigger = Dom.id(triggers[j]);
|
var trigger = Dom.id(triggers[j]);
|
||||||
if(trigger){
|
if(trigger){
|
||||||
trigger.style.cursor = 'pointer';
|
trigger.style.cursor = 'pointer';
|
||||||
// trigger.onclick = function(){
|
|
||||||
// if(o.sort)
|
|
||||||
// o.st.asyncSort( triggers.tf_IndexByValue(this.id, true) );
|
|
||||||
// }
|
|
||||||
Event.add(trigger, 'click', (evt) => {
|
Event.add(trigger, 'click', (evt) => {
|
||||||
var elm = evt.target;
|
var elm = evt.target;
|
||||||
if(!this.tf.sort){
|
if(!this.tf.sort){
|
||||||
|
|
3590
src/_core_.js
3590
src/_core_.js
File diff suppressed because it is too large
Load diff
|
@ -10,7 +10,7 @@ define(["exports", "../../types", "../../dom", "../../array", "../../event", "..
|
||||||
});
|
});
|
||||||
var Types = _types.Types;
|
var Types = _types.Types;
|
||||||
var Dom = _dom.Dom;
|
var Dom = _dom.Dom;
|
||||||
var array = _array.Arr;
|
var Arr = _array.Arr;
|
||||||
var Event = _event.Event;
|
var Event = _event.Event;
|
||||||
var DateHelper = _date.DateHelper;
|
var DateHelper = _date.DateHelper;
|
||||||
var Helpers = _helpers.Helpers;
|
var Helpers = _helpers.Helpers;
|
||||||
|
@ -215,7 +215,8 @@ define(["exports", "../../types", "../../dom", "../../array", "../../event", "..
|
||||||
SortableTable.prototype.initHeader = function (oSortTypes) {
|
SortableTable.prototype.initHeader = function (oSortTypes) {
|
||||||
var stt = this;
|
var stt = this;
|
||||||
if (!stt.tHead) {
|
if (!stt.tHead) {
|
||||||
throw new Error("Sorting feature requires a THEAD element");
|
// throw new Error('Sorting feature requires a THEAD element');
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
stt.headersRow = tf.headersRow;
|
stt.headersRow = tf.headersRow;
|
||||||
var cells = stt.tHead.rows[stt.headersRow].cells;
|
var cells = stt.tHead.rows[stt.headersRow].cells;
|
||||||
|
@ -305,6 +306,9 @@ define(["exports", "../../types", "../../dom", "../../array", "../../event", "..
|
||||||
* @return {String} DOM element inner text
|
* @return {String} DOM element inner text
|
||||||
*/
|
*/
|
||||||
SortableTable.getInnerText = function (oNode) {
|
SortableTable.getInnerText = function (oNode) {
|
||||||
|
if (!oNode) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (oNode.getAttribute(adpt.sortCustomKey)) {
|
if (oNode.getAttribute(adpt.sortCustomKey)) {
|
||||||
return oNode.getAttribute(adpt.sortCustomKey);
|
return oNode.getAttribute(adpt.sortCustomKey);
|
||||||
} else {
|
} else {
|
||||||
|
@ -375,10 +379,7 @@ define(["exports", "../../types", "../../dom", "../../array", "../../event", "..
|
||||||
var trigger = Dom.id(triggers[j]);
|
var trigger = Dom.id(triggers[j]);
|
||||||
if (trigger) {
|
if (trigger) {
|
||||||
trigger.style.cursor = "pointer";
|
trigger.style.cursor = "pointer";
|
||||||
// trigger.onclick = function(){
|
|
||||||
// if(o.sort)
|
|
||||||
// o.st.asyncSort( triggers.tf_IndexByValue(this.id, true) );
|
|
||||||
// }
|
|
||||||
Event.add(trigger, "click", function (evt) {
|
Event.add(trigger, "click", function (evt) {
|
||||||
var elm = evt.target;
|
var elm = evt.target;
|
||||||
if (!_this.tf.sort) {
|
if (!_this.tf.sort) {
|
||||||
|
|
|
@ -100,11 +100,11 @@
|
||||||
rows_counter: true,
|
rows_counter: true,
|
||||||
enable_default_theme: true,
|
enable_default_theme: true,
|
||||||
// slc_filling_method: 'innerhtml',
|
// slc_filling_method: 'innerhtml',
|
||||||
sort: false,
|
sort: true,
|
||||||
sort_config: {
|
sort_config: {
|
||||||
sort_types: ['string','string','number','number','number']
|
sort_types: ['string','string','number','number','number']
|
||||||
},
|
},
|
||||||
paging: true,
|
paging: false,
|
||||||
paging_length: 4,
|
paging_length: 4,
|
||||||
// page_selector_type: 'input',
|
// page_selector_type: 'input',
|
||||||
//results_per_page: ['Results per page', [2,4,6]],
|
//results_per_page: ['Results per page', [2,4,6]],
|
||||||
|
|
Loading…
Reference in a new issue