From e243d76244868fd632aa4964eccd7bb8df66fd4d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 19 May 2017 18:31:45 +0530 Subject: [PATCH] Rename validated to frappe.validated --- .../doctype/property_setter/property_setter.js | 2 +- frappe/public/js/legacy/form.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frappe/custom/doctype/property_setter/property_setter.js b/frappe/custom/doctype/property_setter/property_setter.js index 42f3f7965c..3f2398c46a 100644 --- a/frappe/custom/doctype/property_setter/property_setter.js +++ b/frappe/custom/doctype/property_setter/property_setter.js @@ -5,7 +5,7 @@ $.extend(cur_frm.cscript, { validate: function(doc) { if(doc.property_type=='Check' && !in_list(['0','1'], doc.value)) { frappe.msgprint(__('Value for a check field can be either 0 or 1')); - validated = false; + frappe.validated = false; } } }) diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js index a322523350..433a8198c0 100644 --- a/frappe/public/js/legacy/form.js +++ b/frappe/public/js/legacy/form.js @@ -690,7 +690,7 @@ _f.Frm.prototype.reload_doc = function() { } } -var validated; +frappe.validated = 0; _f.Frm.prototype.save = function(save_action, callback, btn, on_error) { btn && $(btn).prop("disabled", true); $(document.activeElement).blur(); @@ -727,12 +727,12 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) { if(save_action != "Update") { // validate - validated = true; + frappe.validated = true; $.when(this.script_manager.trigger("validate"), this.script_manager.trigger("before_save")) .done(function() { // done is called after all ajaxes in validate & before_save are completed :) - if(!validated) { + if(!frappe.validated) { btn && $(btn).prop("disabled", false); if(on_error) { on_error(); @@ -753,9 +753,9 @@ _f.Frm.prototype.savesubmit = function(btn, callback, on_error) { var me = this; this.validate_form_action("Submit"); frappe.confirm(__("Permanently Submit {0}?", [this.docname]), function() { - validated = true; + frappe.validated = true; me.script_manager.trigger("before_submit").done(function() { - if(!validated) { + if(!frappe.validated) { if(on_error) on_error(); return; @@ -776,9 +776,9 @@ _f.Frm.prototype.savecancel = function(btn, callback, on_error) { var me = this; this.validate_form_action('Cancel'); frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), function() { - validated = true; + frappe.validated = true; me.script_manager.trigger("before_cancel").done(function() { - if(!validated) { + if(!frappe.validated) { if(on_error) on_error(); return;