--- sql-editor.js 2009/04/14 20:53:44 11 +++ sql-editor.js 2009/04/18 14:05:13 20 @@ -1,4 +1,13 @@ +// fake firebug's console.* +if (!window.console) { + var names = [ "log", "debug", "info", "warn", "error" ]; + window.console = {}; + for (i in names) { + window.console[names[i]] = function() {}; + } +} + $(document).ready( function() { function click_on_cell(e) { @@ -15,9 +24,11 @@ else where_value = '%' + where_value + '%'; + var type = column_type[col_nr]; + console.debug('click on ', this, e, e.originalTarget, - column, where_operator, where_value + column, type, where_operator, where_value ); $('form#sql .changed').removeClass('changed'); @@ -38,12 +49,16 @@ .addClass('changed') .attr('options').selectedIndex = col_nr ; - $('form#sql input[name=add_group_by]') + $('form#sql input[name=lookup_col]') .addClass('changed') .attr('value', column) .css('display','block') .attr('disabled',0) ; + $('select[name=where_operator]') + .addClass('changed') + .attr('selectedIndex', type < 0 ? 0 : 2) + ; } else { console.error('unknown click on ', tag, e); } @@ -57,17 +72,42 @@ $('form#sql').toggleClass('visible'); }); - $('input[name=add_group_by]').bind('click', function(e) { + $('input[name=lookup_col]').bind('click', function(e) { var l = $('div#lookup'); - l.css('display','block'); - var column = $('form#sql input[name=add_group_by]').attr('value'); - console.debug( this, e, column, l ); + var column = $('form#sql input[name=lookup_col]').attr('value'); + var col_nr = $('form#sql select[name=where_column]').attr('options').selectedIndex; + var operator = $('select[name=where_operator]').attr('options').selectedIndex; - $('input[name=add_group_by]') + l.html('...loading lookup for '+column+'...').css('display','block'); + + console.debug( this, e, column, col_nr, l ); + + $('input[name=lookup_col]') .removeClass('changed') .attr('disabled', 1); - l.load('?add_group_by='+column); + $.get('', { lookup_col: column }, function(data,textStatus) { + console.debug( data, textStatus ); + l.addClass('changed'); + l.html( data ); + + $('div#lookup a') + .bind('click', function(e) { + console.debug( 'lookup click', e ); + $('form#sql input[name=where_value]') + .attr('value', e.target.text ) + ; + $('form#sql select[name=where_column]') + .attr('options').selectedIndex = col_nr + ; + $('select[name=where_operator]') + .attr('options').selectedIndex = operator + 1 // remove not + ; + return false; + }); + }); + + $('input[name=close_group_by]') .addClass('changed') .attr('disabled', 0)