From 5c1fcded9c6b356b3f74336a40ff2bfba33a8f6e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 30 Aug 2013 18:23:03 +0530 Subject: [PATCH] [fix] [minor] use prop instead of attr to disable a field --- core/doctype/customize_form/customize_form.js | 6 +++--- core/page/permission_manager/permission_manager.js | 4 ++-- core/page/user_properties/user_properties.js | 4 ++-- public/js/wn/dom.js | 4 ++-- public/js/wn/form/editors.js | 12 ++++++------ public/js/wn/form/workflow.js | 4 ++-- public/js/wn/misc/utils.js | 2 +- public/js/wn/model/doclist.js | 4 ++-- public/js/wn/views/query_report.js | 2 +- templates/js/login.js | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/doctype/customize_form/customize_form.js b/core/doctype/customize_form/customize_form.js index 7ef6d44c13..ccbf24c813 100644 --- a/core/doctype/customize_form/customize_form.js +++ b/core/doctype/customize_form/customize_form.js @@ -82,9 +82,9 @@ cur_frm.cscript.refresh = function() { if(!cur_frm.doc.doc_type) { var frm_head = cur_frm.frm_head.appframe; - $(frm_head.buttons['Update']).attr('disabled', true); - $(frm_head.buttons['Refresh Form']).attr('disabled', true); - $(frm_head.buttons['Reset to defaults']).attr('disabled', true); + $(frm_head.buttons['Update']).prop('disabled', true); + $(frm_head.buttons['Refresh Form']).prop('disabled', true); + $(frm_head.buttons['Reset to defaults']).prop('disabled', true); } cur_frm.cscript.hide_allow_attach(cur_frm.doc); diff --git a/core/page/permission_manager/permission_manager.js b/core/page/permission_manager/permission_manager.js index 07479176e4..821f2e8133 100644 --- a/core/page/permission_manager/permission_manager.js +++ b/core/page/permission_manager/permission_manager.js @@ -341,11 +341,11 @@ wn.PermissionEngine = Class.extend({ }); if(me.get_doctype()) { d.set_value("parent", me.get_doctype()); - d.get_input("parent").attr("disabled", true); + d.get_input("parent").prop("disabled", true); } if(me.get_role()) { d.set_value("role", me.get_role()); - d.get_input("role").attr("disabled", true); + d.get_input("role").prop("disabled", true); } d.set_value("permlevel", "0"); d.get_input("add").click(function() { diff --git a/core/page/user_properties/user_properties.js b/core/page/user_properties/user_properties.js index b6df5ae273..f9c3c13853 100644 --- a/core/page/user_properties/user_properties.js +++ b/core/page/user_properties/user_properties.js @@ -185,11 +185,11 @@ wn.UserProperties = Class.extend({ }); if(me.get_user()) { d.set_value("parent", me.get_user()); - d.get_input("parent").attr("disabled", true); + d.get_input("parent").prop("disabled", true); } if(me.get_property()) { d.set_value("defkey", me.get_property()); - d.get_input("defkey").attr("disabled", true); + d.get_input("defkey").prop("disabled", true); } d.fields_dict["defvalue"].get_query = function(txt) { diff --git a/public/js/wn/dom.js b/public/js/wn/dom.js index 8c887df947..6f0c6f1b44 100644 --- a/public/js/wn/dom.js +++ b/public/js/wn/dom.js @@ -231,7 +231,7 @@ wn.dom.set_box_shadow = function(ele, spread) { } $.fn.set_working = function() { var ele = this.get(0); - $(ele).attr('disabled', 'disabled'); + $(ele).prop('disabled', true); if(ele.loading_img) { $(ele.loading_img).toggle(true); } else { @@ -242,7 +242,7 @@ wn.dom.set_box_shadow = function(ele, spread) { } $.fn.done_working = function() { var ele = this.get(0); - $(ele).attr('disabled', null); + $(ele).prop('disabled', false); if(ele.loading_img) { $(ele.loading_img).toggle(false); }; diff --git a/public/js/wn/form/editors.js b/public/js/wn/form/editors.js index e8cb6ef8a1..303639684f 100644 --- a/public/js/wn/form/editors.js +++ b/public/js/wn/form/editors.js @@ -152,23 +152,23 @@ wn.editors.BootstrapWYSIWYG = Class.extend({ this.current_editor = this.$editor; this.$parent.find(".btn-html").click(function() { - if($(this).attr("disabled")=="disabled") return; + if($(this).prop("disabled")==true) return; wn.require("lib/js/lib/beautify-html.js"); me.$textarea.val(html_beautify(me.$editor.cleanHtml())); me.$parent.find(".for-rich-text").toggle(false); me.$parent.find(".for-html").toggle(true); - me.$parent.find(".btn-html").addClass("btn-info").attr("disabled", "disabled"); - me.$parent.find(".btn-rich-text").removeClass("btn-info").attr("disabled", false); + me.$parent.find(".btn-html").addClass("btn-info").prop("disabled", true); + me.$parent.find(".btn-rich-text").removeClass("btn-info").prop("disabled", false); me.current_editor = me.$textarea; }); this.$parent.find(".btn-rich-text").click(function() { - if($(this).attr("disabled")=="disabled") return; + if($(this).prop("disabled")==true) return; me.$editor.html(me.$textarea.val()); me.$parent.find(".for-rich-text").toggle(true); me.$parent.find(".for-html").toggle(false); - me.$parent.find(".btn-html").removeClass("btn-info").attr("disabled", false); - me.$parent.find(".btn-rich-text").addClass("btn-info").attr("disabled", "disabled"); + me.$parent.find(".btn-html").removeClass("btn-info").prop("disabled", false); + me.$parent.find(".btn-rich-text").addClass("btn-info").prop("disabled", true); me.current_editor = me.$editor; }); diff --git a/public/js/wn/form/workflow.js b/public/js/wn/form/workflow.js index 6f118692aa..785e613c3c 100644 --- a/public/js/wn/form/workflow.js +++ b/public/js/wn/form/workflow.js @@ -97,7 +97,7 @@ wn.ui.form.States = Class.extend({ this.show_actions(state); if(this.frm.doc.__islocal) { - this.workflow_button.attr('disabled', true); + this.workflow_button.prop('disabled', true); } } }, @@ -119,7 +119,7 @@ wn.ui.form.States = Class.extend({ // disable the button if user cannot change state var is_final = !$ul.find("li").length; this.workflow_button - .attr('disabled', is_final); + .prop('disabled', is_final); this.workflow_button.find(".caret").toggle(is_final ? false : true) }, diff --git a/public/js/wn/misc/utils.js b/public/js/wn/misc/utils.js index 6e2c6bc31d..de5d58080e 100644 --- a/public/js/wn/misc/utils.js +++ b/public/js/wn/misc/utils.js @@ -104,7 +104,7 @@ wn.utils = { }, disable_export_btn: function(btn) { if(!wn.user.is_report_manager()) { - btn.attr("disabled", "disabled").attr("title", + btn.prop("disabled", true).attr("title", wn._("Can only be exported by users with role 'Report Manager'")); } }, diff --git a/public/js/wn/model/doclist.js b/public/js/wn/model/doclist.js index fb19fa330a..2de7096a0a 100644 --- a/public/js/wn/model/doclist.js +++ b/public/js/wn/model/doclist.js @@ -104,13 +104,13 @@ wn.model.DocList = Class.extend({ // callback: callback, // btn: btn // } - $(opts.btn).attr("disabled", true); + $(opts.btn).prop("disabled", true); return wn.call({ freeze: true, method: opts.method, args: opts.args, callback: function(r) { - $(opts.btn).attr("disabled", false); + $(opts.btn).prop("disabled", false); opts.callback && opts.callback(r); } }) diff --git a/public/js/wn/views/query_report.js b/public/js/wn/views/query_report.js index e1664969fb..dae15207c4 100644 --- a/public/js/wn/views/query_report.js +++ b/public/js/wn/views/query_report.js @@ -67,7 +67,7 @@ wn.views.QueryReport = Class.extend({ }, "icon-edit"); if(!in_list(user_roles, "System Manager")) { - edit_btn.attr("disabled", "disabled") + edit_btn.prop("disabled", true) .attr("title", wn._("Only System Manager can create / edit reports")); } diff --git a/templates/js/login.js b/templates/js/login.js index 155f8225fd..23fd4fa1a5 100644 --- a/templates/js/login.js +++ b/templates/js/login.js @@ -46,7 +46,7 @@ login.do_login = function(){ } } - $('#login_btn').attr("disabled", "disabled"); + $('#login_btn').prop("disabled", true); $("#login-spinner").toggle(true); $('#login_message').toggle(false); @@ -57,7 +57,7 @@ login.do_login = function(){ dataType: "json", success: function(data) { $("#login-spinner").toggle(false); - $('#login_btn').attr("disabled", false); + $('#login_btn').prop("disabled", false); if(data.message=="Logged In") { window.location.href = "app.html"; } else if(data.message=="No App") {