Skip to content

Commit 9f5de70

Browse files
committed
Added active class to selected filter. Optimized DOM query for filter option.
1 parent a918a05 commit 9f5de70

6 files changed

Lines changed: 37 additions & 19 deletions

File tree

css/jquery.isolate.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/jquery.isolate.min.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* http://opensource.org/licenses/MIT
88
*
99
* Author: Adam J De Lucia
10-
* Scaffolding Version: 0.3.0 (Isolate 1.0.0)
11-
* Date: May 23 2014
12-
*
10+
* Scaffolding Version: 0.3.0 (Isolate 1.0.4)
11+
* Date: May 25 2014
12+
*
1313
*/
1414

1515
.bs-2-row-start{margin-left:0}[class*="iso-col-"]{position:relative;min-height:1px;float:left;padding-left:15px;padding-right:15px}.iso-col-1{width:8.33333333%}.iso-col-2{width:16.66666667%}.iso-col-3{width:25%}.iso-col-4{width:33.33333333%}.iso-col-5{width:20%}.iso-col-6{width:50%}.iso-col-7{width:58.33333333%}.iso-col-8{width:66.66666667%}.iso-col-9{width:75%}.iso-col-10{width:83.33333333%}.iso-col-11{width:91.66666667%}.iso-col-12{width:100%}

js/jquery.isolate.js

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* http://opensource.org/licenses/MIT
88
*
99
* Author: Adam J De Lucia
10-
* Version: 1.0.0
11-
* Date: May 23 2014
12-
*
10+
* Version: 1.0.4
11+
* Date: June 1 2014
12+
*
1313
*/
1414

1515
$.fn.isolate = function (options) {
@@ -31,26 +31,32 @@ $.fn.isolate = function (options) {
3131
var isolate = function () {
3232
currentIso = $(this).attr("id");
3333
iso = "." + $(this).attr("id");
34+
active = "#" + $(this).attr("id");
3435
els = settings.isosBox.find($(settings.isoWrapper).not(iso));
3536

3637
if (currentIso != oldIso && oldIso != "") {
3738
settings.isosBox.find($(settings.isoWrapper).not("." + oldIso)).show();
3839
}
3940

41+
activeFilter(active);
4042
els.toggle(0, rowStart);
43+
4144
oldIso = $(this).attr("id");
4245
};
4346

4447
var filter = function () {
4548
currentIso = $(this).attr("id");
4649
iso = "." + $(this).attr("id");
50+
active = "#" + $(this).attr("id");
4751
el = settings.isosBox.find(iso);
4852

4953
if (currentIso != oldIso && oldIso != "") {
50-
$("." + oldIso).show();
54+
settings.isosBox.find("." + oldIso).show();
5155
}
5256

57+
activeFilter(active);
5358
el.toggle(0, rowStart);
59+
5460
oldIso = $(this).attr("id");
5561
};
5662

@@ -73,6 +79,17 @@ $.fn.isolate = function (options) {
7379
settings.filtersBox.on("click.isolate", ".filter", isolate);
7480
}
7581

82+
function activeFilter(selectedFilter) {
83+
if (!settings.filtersBox.find(".filter").hasClass("active")) {
84+
settings.filtersBox.find(selectedFilter).addClass("active");
85+
} else if (!settings.filtersBox.find(selectedFilter).hasClass("active")) {
86+
settings.filtersBox.find(".filter").removeClass("active");
87+
settings.filtersBox.find(selectedFilter).addClass("active");
88+
} else {
89+
settings.filtersBox.find(".filter").removeClass("active");
90+
}
91+
}
92+
7693
function rowStart() {
7794
if (settings.bootstrap == true && version == "2") {
7895
settings.isosBox.find(settings.isoWrapper).removeClass("bs-2-row-start");
@@ -95,6 +112,7 @@ $.fn.isolate = function (options) {
95112
var iso = "";
96113
var el = "";
97114
var els = "";
115+
var active = "";
98116
var currentIso = "";
99117
var oldIso = "";
100118
};

js/jquery.isolate.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/jquery.isolate.min.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

less/jquery.isolate.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* http://opensource.org/licenses/MIT
88
*
99
* Author: Adam J De Lucia
10-
* Scaffolding Version: 0.3.0 (Isolate 1.0.0)
11-
* Date: May 23 2014
12-
*
10+
* Scaffolding Version: 0.3.0 (Isolate 1.0.4)
11+
* Date: May 25 2014
12+
*
1313
*/
1414

1515
.bs-2-row-start {

0 commit comments

Comments
 (0)