vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of github.com:webnotes/wnframework

Browse source
This commit is contained in:
Anand Doshi 2012-12-03 15:45:26 +05:30
commit 0f0da3241b
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
public/js/legacy/widgets/form/fields.js
View file

@ -814,10 +814,16 @@ FloatField.prototype.validate = function(v) {
FloatField.prototype.format_input = function() {
if(this.input.value==null) this.input.value='';
}
FloatField.prototype.onmake_input = function() {
if(!this.input) return;
this.input.onfocus = function() {
this.select();
}
}
// ======================================================================================
function CurrencyField() { } CurrencyField.prototype = new DataField();
function CurrencyField() { } CurrencyField.prototype = new FloatField();
CurrencyField.prototype.format_input = function() {
var v = fmt_money(this.input.value);
if(this.not_in_form) {
@ -835,12 +841,6 @@ CurrencyField.prototype.set_disp = function(val) {
var v = fmt_money(val);
this.set_disp_html(v);
}
CurrencyField.prototype.onmake_input = function() {
if(!this.input) return;
this.input.onfocus = function() {
if(flt(this.value)==0)this.select();
}
}
// ======================================================================================
@ -1189,7 +1189,7 @@ function makeinput_popup(me, iconsrc, iconsrc1, iconsrc2) {
else // date
me.btn.setAttribute('title','Select Date');
if(iconsrc1) {
if(iconsrc1 && me.df.options!='[Select]') {
var c2 = tab.rows[0].insertCell(2);
$y(c2,{width: '20px'});
me.btn1 = $a(c2, 'i', iconsrc1, icon_style)

7
public/js/wn/views/communication.js
View file

@ -164,10 +164,11 @@ wn.views.CommunicationComposer = Class.extend({
var fields = this.dialog.fields_dict;
if(this.attach_document_print) {
$(fields.send_me_a_copy.input).click();
$(fields.attach_document_print.input).click();
$(fields.send_me_a_copy.input).click();
$(fields.attach_document_print.input).click();
$(fields.select_print_format.wrapper).toggle(true);
}
$(fields.send_email.input).attr("checked", "checked")
$(fields.add_reply.input).click(function() {
var form_values = me.dialog.get_values();