fixed filter issue
This commit is contained in:
parent
d07238287e
commit
a8e3c85629
2 changed files with 6 additions and 40 deletions
|
@ -195,44 +195,9 @@ var DataTableWidget = Class.extend({
|
||||||
me.widget.fnFilter("");
|
me.widget.fnFilter("");
|
||||||
});
|
});
|
||||||
|
|
||||||
/* $("." + me.dom.filterOptionClass).live('click', function() {
|
|
||||||
|
|
||||||
if (!$(this).hasClass(me.dom.activeFilterClass)) {
|
|
||||||
|
|
||||||
if ($(this).attr('id') === me.dom.subdisciplinesFilterID) {
|
|
||||||
|
|
||||||
$("#" + me.dom.disciplineFilterID).removeClass(me.dom.activeFilterClass);
|
|
||||||
|
|
||||||
////
|
|
||||||
$("#science-areas-th").html("Sub-Disciplines");
|
|
||||||
me.widget.fnSettings()._iDisplayLength = 10;
|
|
||||||
me.currentSelectedFilter = SCIMAP_TYPE.SUBDISCIPLINE;
|
|
||||||
$("a#csv").attr("href", entityMapOfScienceSubDisciplineCSVURL);
|
|
||||||
////
|
|
||||||
|
|
||||||
} else if ($(this).attr('id') === me.dom.disciplineFilterID) {
|
|
||||||
|
|
||||||
$("#" + me.dom.subdisciplinesFilterID).removeClass(me.dom.activeFilterClass);
|
|
||||||
|
|
||||||
////
|
|
||||||
$("#science-areas-th").html("Disciplines");
|
|
||||||
me.currentSelectedFilter = SCIMAP_TYPE.DISCIPLINE;
|
|
||||||
me.widget.fnSettings()._iDisplayLength = 13;
|
|
||||||
$("a#csv").attr("href", entityMapOfScienceDisciplineCSVURL);
|
|
||||||
////
|
|
||||||
}
|
|
||||||
|
|
||||||
$(this).addClass('active-filter');
|
|
||||||
|
|
||||||
////
|
|
||||||
ACTIVE_DISCIPLINE_SUBDISCIPLINE_FILTER = me.currentSelectedFilter;
|
|
||||||
me.widget.fnDraw();
|
|
||||||
////
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
},
|
},
|
||||||
|
|
||||||
changeFilter: function(filterType) {
|
changeFilter: function(filterType) {
|
||||||
|
var me = this;
|
||||||
|
|
||||||
if (filterType === SCIMAP_TYPE.SUBDISCIPLINE) {
|
if (filterType === SCIMAP_TYPE.SUBDISCIPLINE) {
|
||||||
|
|
||||||
|
|
|
@ -6,27 +6,28 @@ var EntityVisModeController = Class.extend({
|
||||||
this.visMode = ENTITY_VIS_MODE;
|
this.visMode = ENTITY_VIS_MODE;
|
||||||
this.isUnloaded = true;
|
this.isUnloaded = true;
|
||||||
this.initWidgets(map, sliderControl);
|
this.initWidgets(map, sliderControl);
|
||||||
|
this.initFilter();
|
||||||
},
|
},
|
||||||
initFilter: function() {
|
initFilter: function() {
|
||||||
|
var widgets = this.widgets;
|
||||||
var dom = {
|
var dom = {
|
||||||
disciplineFilterID: "discipline-filter",
|
disciplineFilterID: "discipline-filter",
|
||||||
subdisciplinesFilterID: "subdisciplines-filter",
|
subdisciplinesFilterID: "subdisciplines-filter",
|
||||||
filterOptionClass: "filter-option",
|
filterOptionClass: "filter-option",
|
||||||
activeFilterClass: "active-filter"
|
activeFilterClass: "active-filter"
|
||||||
},
|
};
|
||||||
|
|
||||||
$("." + dom.filterOptionClass).live('click', function() {
|
$("." + dom.filterOptionClass).live('click', function() {
|
||||||
if (!$(this).hasClass(dom.activeFilterClass)) {
|
if (!$(this).hasClass(dom.activeFilterClass)) {
|
||||||
if ($(this).attr('id') === dom.subdisciplinesFilterID) {
|
if ($(this).attr('id') === dom.subdisciplinesFilterID) {
|
||||||
$("#" + dom.disciplineFilterID).removeClass(dom.activeFilterClass);
|
$("#" + dom.disciplineFilterID).removeClass(dom.activeFilterClass);
|
||||||
$.each(this.widgets, function(i, widget) {
|
$.each(widgets, function(i, widget) {
|
||||||
widget.changeFilter(SCIMAP_TYPE.SUBDISCIPLINE);
|
widget.changeFilter(SCIMAP_TYPE.SUBDISCIPLINE);
|
||||||
});
|
});
|
||||||
|
|
||||||
} else if ($(this).attr('id') === dom.disciplineFilterID) {
|
} else if ($(this).attr('id') === dom.disciplineFilterID) {
|
||||||
$("#" + dom.subdisciplinesFilterID).removeClass(dom.activeFilterClass);
|
$("#" + dom.subdisciplinesFilterID).removeClass(dom.activeFilterClass);
|
||||||
$.each(this.widgets, function(i, widget) {
|
$.each(widgets, function(i, widget) {
|
||||||
widget.changeFilter(SCIMAP_TYPE.DISCIPLINE);
|
widget.changeFilter(SCIMAP_TYPE.DISCIPLINE);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue