Merge branch 'master' of mjesec.ffzg.hr:/git/MojoFacets

[MojoFacets.git] / templates / all_checkboxes.html.ep

diff --git a/templates/all_checkboxes.html.ep b/templates/all_checkboxes.html.ep
index 465e99f..4fcbeff 100644 (file)
--- a/templates/all_checkboxes.html.ep
+++ b/templates/all_checkboxes.html.ep
@@ -1,25 +1,20 @@
+<span id=column_selection>
 <a id="all"  href="#">all</a>
 <a id="toggle" href="#">toggle</a>
 <a id="none" href="#">none</a>
 
-<label for=filter_regex>regex:
-<input type=text name=filter_regex>
-<span class=hint>tab or click outside to apply</span>
+<label for=filter_regex>
+<input  type=text name=filter_regex title="enter regex to filter values" placeholder="regex">
 <a id="included" href="#" style="display:none">included</a>
 <a id="excluded" href="#" style="display:none">excluded</a>
 </label>
+</span>
 
 
 <script type="text/javascript">
 
 $(document).ready( function(){
 
-$('label span.hint').position({
-       my: 'left bottom',
-       at: 'left top',
-       of: $('label input'),
-});
-
 $('a#all').click( function(){
     $("input[type='checkbox']:not([disabled='disabled'])").attr('checked', true);
         $('#checked-count').text( $('#facet-count').text() );
@@ -71,13 +66,20 @@ $('a#excluded').click( function(){
        update_checked_count(1);
 });
 
-$('input[name=filter_regex]').focusout( function(e) {
-       console.debug( this, e );
-       var r = new RegExp( this.value ,'i');
+
+// regex for column names
+
+var apply_regex = function(e) {
+       var user_regex = this.value;
+       console.debug( this, e, user_regex );
+
+       if ( user_regex == '' ) return false;
+
+       var r = new RegExp( user_regex,'i');
        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 {
@@ -88,8 +90,23 @@ $('input[name=filter_regex]').focusout( function(e) {
 
        $('a#included').text(included).show();
        $('a#excluded').text(excluded).show();
+       return false;
+};
+
+$('input[name=filter_regex]')
+.focusout( apply_regex )
+.keypress( function(e) {
+       // disable enter
+       var code = e.keyCode ? e.keyCode : e.which;
+       //console.debug('key code',code);
+       if ( code == 13 ) {
+               return apply_regex(e);
+       } else {
+               return true;
+       }
 });
 
+
 update_checked_count(1);
 
 }); // document.ready