diff --git a/css/legacy/body.css b/css/legacy/body.css index 46ea220f1b..343f360627 100644 --- a/css/legacy/body.css +++ b/css/legacy/body.css @@ -192,7 +192,6 @@ div.std-footer-item { box-shadow: 0px 0px 6px rgba(0,0,0,0.3); background-color: #fff; padding: 15px; - margin-bottom: 30px; } .layout-wrapper-background { diff --git a/js/core.min.js b/js/core.min.js index 7e66dd0bdf..87f5e81bbf 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -295,7 +295,7 @@ if(data.docstatus==0||data.docstatus==null){data.docstatus_icon='icon-pencil';da */ wn.provide('wn.views.pageview');wn.views.pageview={pages:{},with_page:function(name,callback){if(!locals.Page[name]){wn.call({method:'webnotes.widgets.page.getpage',args:{'name':name},callback:callback});}else{callback();}},show:function(name){wn.views.pageview.with_page(name,function(){if(!wn.pages[name]){wn.views.pageview.pages[name]=new wn.views.Page(name);} wn.container.change_to(name);});}} -wn.views.Page=Class.extend({init:function(name){this.name=name;var me=this;this.pagedoc=locals.Page[this.name];this.wrapper=wn.container.add_page(this.name);this.wrapper.label=this.pagedoc.title||this.pagedoc.name;this.wrapper.innerHTML=this.pagedoc.content;wn.dom.eval(this.pagedoc.__script||this.pagedoc.script||'');wn.dom.set_style(this.pagedoc.style);this.trigger('onload');$(this.wrapper).bind('show',function(){cur_frm=null;me.trigger('onshow');});},trigger:function(eventname){var me=this;try{if(pscript[eventname+'_'+this.name]){pscript[eventname+'_'+this.name](me.wrapper);}else if(me.wrapper[eventname]){me.wrapper[eventname](me.wrapper);}}catch(e){console.log(e);}}}) +wn.views.Page=Class.extend({init:function(name){this.name=name;var me=this;this.pagedoc=locals.Page[this.name];this.wrapper=wn.container.add_page(this.name);this.wrapper.label=this.pagedoc.title||this.pagedoc.name;this.wrapper.innerHTML=this.pagedoc.content;wn.dom.eval(this.pagedoc.__script||this.pagedoc.script||'');wn.dom.set_style(this.pagedoc.style);this.trigger('onload');$(this.wrapper).bind('show',function(){cur_frm=null;me.trigger('onshow');me.trigger('refresh');});},trigger:function(eventname){var me=this;try{if(pscript[eventname+'_'+this.name]){pscript[eventname+'_'+this.name](me.wrapper);}else if(me.wrapper[eventname]){me.wrapper[eventname](me.wrapper);}}catch(e){console.log(e);}}}) /* * lib/js/wn/views/formview.js */ diff --git a/js/legacy/widgets/form/fields.js b/js/legacy/widgets/form/fields.js index cf9d998ed4..46e58e4235 100644 --- a/js/legacy/widgets/form/fields.js +++ b/js/legacy/widgets/form/fields.js @@ -454,10 +454,6 @@ DataField.prototype.make_input = function() { response(r.results); } }); - }, - select: function(event, ui) { - me.set_input_value(ui.item.value); - return false; } }); } @@ -631,8 +627,7 @@ LinkField.prototype.make_input = function() { }); }, select: function(event, ui) { - me.set_input_value(ui.item.value); - return false; + me.set_input_value(ui.item.value); } }).data('autocomplete')._renderItem = function(ul, item) { return $('
  • ') @@ -640,6 +635,11 @@ LinkField.prototype.make_input = function() { .append(repl('%(label)s
    %(info)s
    ', item)) .appendTo(ul); }; + + $(this.txt).change(function() { + if(!$(this).val()) + me.set_input_value(''); + }) } LinkField.prototype.get_custom_query = function() { @@ -691,7 +691,9 @@ LinkField.prototype.setup_buttons = function() { } LinkField.prototype.set_input_value = function(val) { + var me = this; + // refresh mandatory style me.refresh_label_icon(); diff --git a/js/legacy/widgets/form/grid.js b/js/legacy/widgets/form/grid.js index 19e01ad4a0..bd4dc2a1d9 100644 --- a/js/legacy/widgets/form/grid.js +++ b/js/legacy/widgets/form/grid.js @@ -265,16 +265,20 @@ $(document).bind('click', function(e) { } var is_target_input = function() { + // select opened if(e.target.tagName.toLowerCase()=='option') return true; + // autosuggest openend + //if(wn._autosugg_open) return true; + return $(e.target).parents().get().indexOf(_f.cur_grid_cell)!=-1; } if(_f.cur_grid_cell && !is_target_input() && !is_target_toolbar()) { if(!(text_dialog && text_dialog.display) && !datepicker_active && !(selector && selector.display)) { - _f.cur_grid_cell.grid.cell_deselect(); - return false; + setTimeout('_f.cur_grid_cell.grid.cell_deselect()', 500); + return false; } } }); diff --git a/js/wn/views/pageview.js b/js/wn/views/pageview.js index 4f56dc5ec3..ee79e47f7b 100644 --- a/js/wn/views/pageview.js +++ b/js/wn/views/pageview.js @@ -42,6 +42,7 @@ wn.views.Page = Class.extend({ $(this.wrapper).bind('show', function() { cur_frm = null; me.trigger('onshow'); + me.trigger('refresh'); }); }, trigger: function(eventname) {