浏览代码

[fix] [minor] use prop instead of attr to disable a field

version-14
Anand Doshi 12 年前
父节点
当前提交
5c1fcded9c
共有 10 个文件被更改,包括 23 次插入23 次删除
  1. +3
    -3
      core/doctype/customize_form/customize_form.js
  2. +2
    -2
      core/page/permission_manager/permission_manager.js
  3. +2
    -2
      core/page/user_properties/user_properties.js
  4. +2
    -2
      public/js/wn/dom.js
  5. +6
    -6
      public/js/wn/form/editors.js
  6. +2
    -2
      public/js/wn/form/workflow.js
  7. +1
    -1
      public/js/wn/misc/utils.js
  8. +2
    -2
      public/js/wn/model/doclist.js
  9. +1
    -1
      public/js/wn/views/query_report.js
  10. +2
    -2
      templates/js/login.js

+ 3
- 3
core/doctype/customize_form/customize_form.js 查看文件

@@ -82,9 +82,9 @@ cur_frm.cscript.refresh = function() {


if(!cur_frm.doc.doc_type) { if(!cur_frm.doc.doc_type) {
var frm_head = cur_frm.frm_head.appframe; 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); cur_frm.cscript.hide_allow_attach(cur_frm.doc);


+ 2
- 2
core/page/permission_manager/permission_manager.js 查看文件

@@ -341,11 +341,11 @@ wn.PermissionEngine = Class.extend({
}); });
if(me.get_doctype()) { if(me.get_doctype()) {
d.set_value("parent", 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()) { if(me.get_role()) {
d.set_value("role", 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.set_value("permlevel", "0");
d.get_input("add").click(function() { d.get_input("add").click(function() {


+ 2
- 2
core/page/user_properties/user_properties.js 查看文件

@@ -185,11 +185,11 @@ wn.UserProperties = Class.extend({
}); });
if(me.get_user()) { if(me.get_user()) {
d.set_value("parent", 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()) { if(me.get_property()) {
d.set_value("defkey", 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) { d.fields_dict["defvalue"].get_query = function(txt) {


+ 2
- 2
public/js/wn/dom.js 查看文件

@@ -231,7 +231,7 @@ wn.dom.set_box_shadow = function(ele, spread) {
} }
$.fn.set_working = function() { $.fn.set_working = function() {
var ele = this.get(0); var ele = this.get(0);
$(ele).attr('disabled', 'disabled');
$(ele).prop('disabled', true);
if(ele.loading_img) { if(ele.loading_img) {
$(ele.loading_img).toggle(true); $(ele.loading_img).toggle(true);
} else { } else {
@@ -242,7 +242,7 @@ wn.dom.set_box_shadow = function(ele, spread) {
} }
$.fn.done_working = function() { $.fn.done_working = function() {
var ele = this.get(0); var ele = this.get(0);
$(ele).attr('disabled', null);
$(ele).prop('disabled', false);
if(ele.loading_img) { if(ele.loading_img) {
$(ele.loading_img).toggle(false); $(ele.loading_img).toggle(false);
}; };


+ 6
- 6
public/js/wn/form/editors.js 查看文件

@@ -152,23 +152,23 @@ wn.editors.BootstrapWYSIWYG = Class.extend({
this.current_editor = this.$editor; this.current_editor = this.$editor;
this.$parent.find(".btn-html").click(function() { 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"); wn.require("lib/js/lib/beautify-html.js");
me.$textarea.val(html_beautify(me.$editor.cleanHtml())); me.$textarea.val(html_beautify(me.$editor.cleanHtml()));
me.$parent.find(".for-rich-text").toggle(false); me.$parent.find(".for-rich-text").toggle(false);
me.$parent.find(".for-html").toggle(true); 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; me.current_editor = me.$textarea;
}); });


this.$parent.find(".btn-rich-text").click(function() { 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.$editor.html(me.$textarea.val());
me.$parent.find(".for-rich-text").toggle(true); me.$parent.find(".for-rich-text").toggle(true);
me.$parent.find(".for-html").toggle(false); 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; me.current_editor = me.$editor;
}); });




+ 2
- 2
public/js/wn/form/workflow.js 查看文件

@@ -97,7 +97,7 @@ wn.ui.form.States = Class.extend({
this.show_actions(state); this.show_actions(state);
if(this.frm.doc.__islocal) { 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 // disable the button if user cannot change state
var is_final = !$ul.find("li").length; var is_final = !$ul.find("li").length;
this.workflow_button this.workflow_button
.attr('disabled', is_final);
.prop('disabled', is_final);
this.workflow_button.find(".caret").toggle(is_final ? false : true) this.workflow_button.find(".caret").toggle(is_final ? false : true)
}, },




+ 1
- 1
public/js/wn/misc/utils.js 查看文件

@@ -104,7 +104,7 @@ wn.utils = {
}, },
disable_export_btn: function(btn) { disable_export_btn: function(btn) {
if(!wn.user.is_report_manager()) { 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'")); wn._("Can only be exported by users with role 'Report Manager'"));
} }
}, },


+ 2
- 2
public/js/wn/model/doclist.js 查看文件

@@ -104,13 +104,13 @@ wn.model.DocList = Class.extend({
// callback: callback, // callback: callback,
// btn: btn // btn: btn
// } // }
$(opts.btn).attr("disabled", true);
$(opts.btn).prop("disabled", true);
return wn.call({ return wn.call({
freeze: true, freeze: true,
method: opts.method, method: opts.method,
args: opts.args, args: opts.args,
callback: function(r) { callback: function(r) {
$(opts.btn).attr("disabled", false);
$(opts.btn).prop("disabled", false);
opts.callback && opts.callback(r); opts.callback && opts.callback(r);
} }
}) })


+ 1
- 1
public/js/wn/views/query_report.js 查看文件

@@ -67,7 +67,7 @@ wn.views.QueryReport = Class.extend({
}, "icon-edit"); }, "icon-edit");
if(!in_list(user_roles, "System Manager")) { 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")); .attr("title", wn._("Only System Manager can create / edit reports"));
} }




+ 2
- 2
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-spinner").toggle(true);
$('#login_message').toggle(false); $('#login_message').toggle(false);
@@ -57,7 +57,7 @@ login.do_login = function(){
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
$("#login-spinner").toggle(false); $("#login-spinner").toggle(false);
$('#login_btn').attr("disabled", false);
$('#login_btn').prop("disabled", false);
if(data.message=="Logged In") { if(data.message=="Logged In") {
window.location.href = "app.html"; window.location.href = "app.html";
} else if(data.message=="No App") { } else if(data.message=="No App") {


正在加载...
取消
保存