diff --git a/js/core.min.js b/js/core.min.js index c2349c9bdf..e8b6500088 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -194,8 +194,8 @@ if(this.onrun)this.onrun();if(this.callback)this.callback(r);},render_list:funct /* * lib/js/wn/ui/filters.js */ -wn.ui.FilterList=Class.extend({init:function(opts){wn.require('lib/js/legacy/widgets/form/fields.js');$.extend(this,opts);this.filters=[];this.$w=this.$parent;this.set_events();},set_events:function(){var me=this;this.$w.find('.add-filter-btn').bind('click',function(){me.add_filter();});},show_filters:function(){this.$w.find('.show_filters').slideToggle();if(!this.filters.length) -this.add_filter();},add_filter:function(fieldname,condition,value){this.filters.push(new wn.ui.Filter({flist:this,fieldname:fieldname,condition:condition,value:value}));if(fieldname){this.$w.find('.show_filters').slideDown();}},get_filters:function(){var values=[];$.each(this.filters,function(i,f){if(f.field) +wn.ui.FilterList=Class.extend({init:function(opts){wn.require('lib/js/legacy/widgets/form/fields.js');$.extend(this,opts);this.filters=[];this.$w=this.$parent;this.set_events();},set_events:function(){var me=this;this.$w.find('.add-filter-btn').bind('click',function(){me.add_filter();});},show_filters:function(){this.$w.find('.show_filters').toggle();if(!this.filters.length) +this.add_filter();},add_filter:function(fieldname,condition,value){this.filters.push(new wn.ui.Filter({flist:this,fieldname:fieldname,condition:condition,value:value}));if(fieldname){this.$w.find('.show_filters').toggle(true);}},get_filters:function(){var values=[];$.each(this.filters,function(i,f){if(f.field) values.push(f.get_value());}) return values;},update_filters:function(){var fl=[];$.each(this.filters,function(i,f){if(f.field)fl.push(f);}) this.filters=fl;},get_filter:function(fieldname){for(var i in this.filters){if(this.filters[i].field.df.fieldname==fieldname) diff --git a/js/wn/ui/filters.js b/js/wn/ui/filters.js index 58802ec284..df35e5d0f4 100644 --- a/js/wn/ui/filters.js +++ b/js/wn/ui/filters.js @@ -38,7 +38,7 @@ wn.ui.FilterList = Class.extend({ }, show_filters: function() { - this.$w.find('.show_filters').slideToggle(); + this.$w.find('.show_filters').toggle(); if(!this.filters.length) this.add_filter(); }, @@ -53,7 +53,7 @@ wn.ui.FilterList = Class.extend({ // list must be expanded if(fieldname) { - this.$w.find('.show_filters').slideDown(); + this.$w.find('.show_filters').toggle(true); } }, diff --git a/js/wn/ui/search.js b/js/wn/ui/search.js index c5a6c1cc17..594fb2819e 100644 --- a/js/wn/ui/search.js +++ b/js/wn/ui/search.js @@ -8,6 +8,7 @@ wn.ui.Search = Class.extend({ wn.model.with_doctype(this.doctype, function(r) { me.make(); me.dialog.show(); + me.list.$w.find('.list-filters input[type="text"]').focus(); }); }, make: function() {