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 390b02f..4fcbeff 100644 (file)
--- a/templates/all_checkboxes.html.ep
+++ b/templates/all_checkboxes.html.ep
@@ -70,12 +70,12 @@ $('a#excluded').click( function(){
 // regex for column names
 
 var apply_regex = function(e) {
-       var v = this.value;
-       console.debug( this, e, v );
+       var user_regex = this.value;
+       console.debug( this, e, user_regex );
 
-       if ( v.length == 0 ) return false;
+       if ( user_regex == '' ) return false;
 
-       var r = new RegExp( v,'i');
+       var r = new RegExp( user_regex,'i');
        var included = 0;
        var excluded = 0;
     $("input[type='checkbox']:not([disabled='disabled'])").each( function(i,element){