← All changes | js/grid.js +52 -59 2.6.0 → 2.4.0 View file →

		@@ -56,15 +56,11 @@
56	56	WPUltimatePostGrid.hoverGridItem(jQuery(this), hovering);
57	57	});
58	58
59	59	// Check for empty grid
60		- if(0 === container.find('.wpupg-item').length) {
	60	+ container.on('arrangeComplete', function() {
61	61	WPUltimatePostGrid.checkEmpty(container);
62		- } else {
63		- container.on('arrangeComplete', function() {
64		- WPUltimatePostGrid.checkEmpty(container);
65		- });
66		- }
	62	+ });
67	63	};
68	64
69	65	WPUltimatePostGrid.hoverGridItem = function(grid_item, hovering) {
70	66	if(hovering) {
		@@ -229,9 +225,9 @@
229	225	};
230	226
231	227	WPUltimatePostGrid.checkEmpty = function(container) {
232	228	var grid_id = container.data('grid'),
233		- filter = WPUltimatePostGrid.grids[grid_id].filter || '.wpupg-item',
	229	+ filter = WPUltimatePostGrid.grids[grid_id].filter,
234	230	visible_items = container.find(filter);
235	231
236	232	if(filter !== '' && visible_items.length == 0) {
237	233	jQuery('#wpupg-grid-' + grid_id + '-empty').slideDown(300);
		@@ -425,65 +421,62 @@
425	421	WPUltimatePostGrid.grids[grid_id].multiselect = container.data('multiselect');
426	422	WPUltimatePostGrid.grids[grid_id].multiselect_type = container.data('multiselect-type');
427	423	WPUltimatePostGrid.grids[grid_id].inverse = container.data('inverse');
428	424
429		- container.find('.wpupg-filter-isotope-term').on('click keydown', function(e) {
430		- // On click, space or enter.
431		- if(e.which === 1 || e.which === 13 || e.which === 32) {
432		- var filter_item = jQuery(this);
433		- var taxonomy = filter_item.data('taxonomy');
434		- var filter_all = filter_item.data('filter') == undefined;
435		- var filter_term = filter_item.data('filter');
436		-
437		- var filters = [];
438		-
439		- if(WPUltimatePostGrid.grids[grid_id].multiselect && !filter_all) {
440		- // Make sure "All" is not selected
441		- filter_item.siblings('.wpupg-filter-tag-').removeClass('active').trigger('checkActiveFilter');
442		-
443		- filters = WPUltimatePostGrid.grids[grid_id].filters || [];
444		-
445		- if(filters[taxonomy] == undefined) filters[taxonomy] = [];
446		-
447		- var term_index = filters[taxonomy].indexOf(filter_term);
448		- if(term_index == -1) {
449		- // Term was not select before, add
450		- filter_item.addClass('active').trigger('checkActiveFilter');
451		- filters[taxonomy].push(filter_term);
452		- } else {
453		- // Term was already selected, remove
454		- filter_item.removeClass('active').trigger('checkActiveFilter');
455		- filters[taxonomy].splice(term_index, 1);
456		-
457		- // Set "All" active if no terms left
458		- var nbr_terms = 0;
459		-
460		- for(var filter_taxonomy in filters) {
461		- if(filters.hasOwnProperty(filter_taxonomy)) {
462		- var filter_taxonomy_terms = filters[filter_taxonomy];
463		-
464		- if(filter_taxonomy_terms) {
465		- nbr_terms += filter_taxonomy_terms.length;
466		- }
	425	+ container.find('.wpupg-filter-isotope-term').click(function() {
	426	+ var filter_item = jQuery(this);
	427	+ var taxonomy = filter_item.data('taxonomy');
	428	+ var filter_all = filter_item.data('filter') == undefined;
	429	+ var filter_term = filter_item.data('filter');
	430	+
	431	+ var filters = [];
	432	+
	433	+ if(WPUltimatePostGrid.grids[grid_id].multiselect && !filter_all) {
	434	+ // Make sure "All" is not selected
	435	+ filter_item.siblings('.wpupg-filter-tag-').removeClass('active').trigger('checkActiveFilter');
	436	+
	437	+ filters = WPUltimatePostGrid.grids[grid_id].filters || [];
	438	+
	439	+ if(filters[taxonomy] == undefined) filters[taxonomy] = [];
	440	+
	441	+ var term_index = filters[taxonomy].indexOf(filter_term);
	442	+ if(term_index == -1) {
	443	+ // Term was not select before, add
	444	+ filter_item.addClass('active').trigger('checkActiveFilter');
	445	+ filters[taxonomy].push(filter_term);
	446	+ } else {
	447	+ // Term was already selected, remove
	448	+ filter_item.removeClass('active').trigger('checkActiveFilter');
	449	+ filters[taxonomy].splice(term_index, 1);
	450	+
	451	+ // Set "All" active if no terms left
	452	+ var nbr_terms = 0;
	453	+
	454	+ for(var filter_taxonomy in filters) {
	455	+ if(filters.hasOwnProperty(filter_taxonomy)) {
	456	+ var filter_taxonomy_terms = filters[filter_taxonomy];
	457	+
	458	+ if(filter_taxonomy_terms) {
	459	+ nbr_terms += filter_taxonomy_terms.length;
467	460	}
468	461	}
469		-
470		- if(nbr_terms == 0) {
471		- filter_item.siblings('.wpupg-filter-tag-').addClass('active').trigger('checkActiveFilter');
472		- }
473	462	}
474		- } else {
475		- filter_item.siblings('.wpupg-filter-isotope-term').removeClass('active').trigger('checkActiveFilter');
476		- filter_item.addClass('active').trigger('checkActiveFilter');
477		-
478		- if(!filter_all) {
479		- filters[taxonomy] = [filter_term];
480		- }
	463	+
	464	+ if(nbr_terms == 0) {
	465	+ filter_item.siblings('.wpupg-filter-tag-').addClass('active').trigger('checkActiveFilter');
	466	+ }
481	467	}
482		-
483		- WPUltimatePostGrid.grids[grid_id].filters = filters;
484		- WPUltimatePostGrid.filterGrid(grid_id);
	468	+ } else {
	469	+ filter_item.siblings('.wpupg-filter-isotope-term').removeClass('active').trigger('checkActiveFilter');
	470	+ filter_item.addClass('active').trigger('checkActiveFilter');
	471	+
	472	+ if(!filter_all) {
	473	+ filters[taxonomy] = [filter_term];
	474	+ }
485	475	}
	476	+
	477	+ WPUltimatePostGrid.grids[grid_id].filters = filters;
	478	+ WPUltimatePostGrid.filterGrid(grid_id);
486	479	});
487	480
488	481	var filter_type = container.data('filter-type');
489	482	var filter_items = container.find('.wpupg-filter-item');