From: Dobrica Pavlinusic Date: Wed, 30 Jun 2010 22:12:46 +0000 (+0200) Subject: Merge branch 'master' of mjesec.ffzg.hr:/git/MojoFacets X-Git-Url: http://git.rot13.org/?p=MojoFacets.git;a=commitdiff_plain;h=30b4eaa987d47adea3162c853dfa3045a1877da0;hp=814278b4ec0c2e24bbf4a4879b7a2018d364b124 Merge branch 'master' of mjesec.ffzg.hr:/git/MojoFacets Conflicts: templates/all_checkboxes.html.ep --- diff --git a/templates/all_checkboxes.html.ep b/templates/all_checkboxes.html.ep index e5c9e95..4fcbeff 100644 --- a/templates/all_checkboxes.html.ep +++ b/templates/all_checkboxes.html.ep @@ -79,7 +79,7 @@ var apply_regex = function(e) { var included = 0; var excluded = 0; $("input[type='checkbox']:not([disabled='disabled'])").each( function(i,element){ - if ( r.test( this.value ) ) { + if ( r.test( v ) ) { $(this).parent().removeClass('excluded').addClass('included'); included++; } else {