Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

[Qual] Use jQuery property instead of attribute to test and set disabled

Browse Source
This commit is contained in:
Raphaël Doursenaud
2015-05-12 14:47:33 +02:00
parent 0d8641a073
commit e149d49fb8
11 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/admin/mails.php
View File

@@ -271,12 +271,12 @@ if ($action == 'edit')
{ {
jQuery(".drag").hide(); jQuery(".drag").hide();
jQuery("#MAIN_MAIL_EMAIL_TLS").val(0); jQuery("#MAIN_MAIL_EMAIL_TLS").val(0);
jQuery("#MAIN_MAIL_EMAIL_TLS").attr(\'disabled\', \'disabled\'); jQuery("#MAIN_MAIL_EMAIL_TLS").prop("disabled", true);
'; ';
if ($linuxlike) if ($linuxlike)
{ {
print ' jQuery("#MAIN_MAIL_SMTP_SERVER").attr(\'disabled\', \'disabled\');'; print ' jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);';
print ' jQuery("#MAIN_MAIL_SMTP_PORT").attr(\'disabled\', \'disabled\');'; print ' jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);';
} }
print ' print '
} }
@@ -284,9 +284,9 @@ if ($action == 'edit')
{ {
jQuery(".drag").show(); jQuery(".drag").show();
jQuery("#MAIN_MAIL_EMAIL_TLS").val('.$conf->global->MAIN_MAIL_EMAIL_TLS.'); jQuery("#MAIN_MAIL_EMAIL_TLS").val('.$conf->global->MAIN_MAIL_EMAIL_TLS.');
jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr(\'disabled\'); jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled");
jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr(\'disabled\'); jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr("disabled");
jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr(\'disabled\'); jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr("disabled");
} }
} }
initfields(); initfields();

4
htdocs/admin/menus/edit.php
View File

@@ -255,12 +255,12 @@ if ($action == 'create')
{ {
if (jQuery("#topleft").val() == \'top\') if (jQuery("#topleft").val() == \'top\')
{ {
jQuery("#menuId").attr(\'disabled\',\'disabled\'); jQuery("#menuId").prop("disabled", true);
jQuery("#menuId").val(\'\'); jQuery("#menuId").val(\'\');
} }
else else
{ {
jQuery("#menuId").removeAttr(\'disabled\'); jQuery("#menuId").removeAttr("disabled");
} }
} }
init_topleft(); init_topleft();

28
htdocs/barcode/printsheet.php
View File

@@ -313,28 +313,28 @@ jQuery(document).ready(function() {
{ {
if (jQuery("#fillmanually:checked").val() == "fillmanually") if (jQuery("#fillmanually:checked").val() == "fillmanually")
{ {
jQuery("#submitproduct").attr(\'disabled\',\'disabled\'); jQuery("#submitproduct").prop("disabled", true);
jQuery("#submitthirdparty").attr(\'disabled\',\'disabled\'); jQuery("#submitthirdparty").prop("disabled", true);
jQuery("#search_productid").attr(\'disabled\',\'disabled\'); jQuery("#search_productid").prop("disabled", true);
jQuery("#socid").attr(\'disabled\',\'disabled\'); jQuery("#socid").prop("disabled", true);
jQuery(".showforproductselector").hide(); jQuery(".showforproductselector").hide();
jQuery(".showforthirdpartyselector").hide(); jQuery(".showforthirdpartyselector").hide();
} }
if (jQuery("#fillfromproduct:checked").val() == "fillfromproduct") if (jQuery("#fillfromproduct:checked").val() == "fillfromproduct")
{ {
jQuery("#submitproduct").removeAttr(\'disabled\'); jQuery("#submitproduct").removeAttr("disabled");
jQuery("#submitthirdparty").attr(\'disabled\',\'disabled\'); jQuery("#submitthirdparty").prop("disabled", true);
jQuery("#search_productid").removeAttr(\'disabled\'); jQuery("#search_productid").removeAttr("disabled");
jQuery("#socid").attr(\'disabled\',\'disabled\'); jQuery("#socid").prop("disabled", true);
jQuery(".showforproductselector").show(); jQuery(".showforproductselector").show();
jQuery(".showforthirdpartyselector").hide(); jQuery(".showforthirdpartyselector").hide();
} }
if (jQuery("#fillfromthirdparty:checked").val() == "fillfromthirdparty") if (jQuery("#fillfromthirdparty:checked").val() == "fillfromthirdparty")
{ {
jQuery("#submitproduct").attr(\'disabled\',\'disabled\'); jQuery("#submitproduct").prop("disabled", true);
jQuery("#submitthirdparty").removeAttr(\'disabled\'); jQuery("#submitthirdparty").removeAttr("disabled");
jQuery("#search_productid").attr(\'disabled\',\'disabled\'); jQuery("#search_productid").prop("disabled", true);
jQuery("#socid").removeAttr(\'disabled\'); jQuery("#socid").removeAttr("disabled");
jQuery(".showforproductselector").hide(); jQuery(".showforproductselector").hide();
jQuery(".showforthirdpartyselector").show(); jQuery(".showforthirdpartyselector").show();
} }
@@ -348,11 +348,11 @@ jQuery(document).ready(function() {
{ {
if (jQuery("#select_fk_barcode_type").val() > 0 && jQuery("#forbarcode").val()) if (jQuery("#select_fk_barcode_type").val() > 0 && jQuery("#forbarcode").val())
{ {
jQuery("#submitformbarcodegen").removeAttr(\'disabled\'); jQuery("#submitformbarcodegen").removeAttr("disabled");
} }
else else
{ {
jQuery("#submitformbarcodegen").attr(\'disabled\',\'disabled\'); jQuery("#submitformbarcodegen").prop("disabled", true);
} }
} }
init_gendoc_button(); init_gendoc_button();

18
htdocs/comm/action/card.php
View File

@@ -570,11 +570,11 @@ if ($action == 'create')
$(".fulldayendmin").removeAttr("disabled"); $(".fulldayendmin").removeAttr("disabled");
$("#p2").removeAttr("disabled"); $("#p2").removeAttr("disabled");
} else { } else {
$(".fulldaystarthour").attr("disabled","disabled").val("00"); $(".fulldaystarthour").prop("disabled", true).val("00");
$(".fulldaystartmin").attr("disabled","disabled").val("00"); $(".fulldaystartmin").prop("disabled", true).val("00");
$(".fulldayendhour").attr("disabled","disabled").val("23"); $(".fulldayendhour").prop("disabled", true).val("23");
$(".fulldayendmin").attr("disabled","disabled").val("59"); $(".fulldayendmin").prop("disabled", true).val("59");
$("#p2").removeAttr("disabled"); $("#p2").removeAttr("disabled");
} }
} }
setdatefields(); setdatefields();
@@ -841,10 +841,10 @@ if ($id > 0)
$(".fulldayendhour").removeAttr("disabled"); $(".fulldayendhour").removeAttr("disabled");
$(".fulldayendmin").removeAttr("disabled"); $(".fulldayendmin").removeAttr("disabled");
} else { } else {
$(".fulldaystarthour").attr("disabled","disabled").val("00"); $(".fulldaystarthour").prop("disabled", true).val("00");
$(".fulldaystartmin").attr("disabled","disabled").val("00"); $(".fulldaystartmin").prop("disabled", true).val("00");
$(".fulldayendhour").attr("disabled","disabled").val("23"); $(".fulldayendhour").prop("disabled", true).val("23");
$(".fulldayendmin").attr("disabled","disabled").val("59"); $(".fulldayendmin").prop("disabled", true).val("59");
} }
} }
setdatefields(); setdatefields();

6
htdocs/core/class/html.formactions.class.php
View File

@@ -95,17 +95,17 @@ class FormActions
percentage.val(value); percentage.val(value);
if (defaultvalue == -1) { if (defaultvalue == -1) {
percentage.attr('disabled', 'disabled'); percentage.prop('disabled', true);
$('.hideifna').hide(); $('.hideifna').hide();
} }
else if (defaultvalue == 0) { else if (defaultvalue == 0) {
percentage.val(0); percentage.val(0);
percentage.attr('disabled', 'disabled'); percentage.prop('disabled', true);
$('.hideifna').show(); $('.hideifna').show();
} }
else if (defaultvalue == 100) { else if (defaultvalue == 100) {
percentage.val(100); percentage.val(100);
percentage.attr('disabled', 'disabled'); percentage.prop('disabled', true);
$('.hideifna').show(); $('.hideifna').show();
} }
else { else {

6
htdocs/core/lib/ajax.lib.php
View File

@@ -132,7 +132,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
// Disable an element // Disable an element
if (options.option_disabled) { if (options.option_disabled) {
if (ui.item.disabled) { if (ui.item.disabled) {
$("#" + options.option_disabled).attr("disabled", "disabled"); $("#" + options.option_disabled).prop("disabled", true);
if (options.error) { if (options.error) {
$.jnotify(options.error, "error", true); // Output with jnotify the error message $.jnotify(options.error, "error", true); // Output with jnotify the error message
} }
@@ -145,7 +145,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
} }
if (options.disabled) { if (options.disabled) {
$.each(options.disabled, function(key, value) { $.each(options.disabled, function(key, value) {
$("#" + value).attr("disabled", "disabled"); $("#" + value).prop("disabled", true);
}); });
} }
if (options.show) { if (options.show) {
@@ -524,7 +524,7 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input=a
// Disable another element // Disable another element
if (input.disabled && input.disabled.length > 0) { if (input.disabled && input.disabled.length > 0) {
$.each(input.disabled, function(key,value) { $.each(input.disabled, function(key,value) {
$("#" + value).attr("disabled", true); $("#" + value).prop("disabled", true);
if ($("#" + value).hasClass("butAction") == true) { if ($("#" + value).hasClass("butAction") == true) {
$("#" + value).removeClass("butAction"); $("#" + value).removeClass("butAction");
$("#" + value).addClass("butActionRefused"); $("#" + value).addClass("butActionRefused");

30
htdocs/core/tpl/admin_extrafields_add.tpl.php
View File

@@ -42,27 +42,27 @@
if (GETPOST('type') == "separate") if (GETPOST('type') == "separate")
{ {
print "jQuery('#size, #unique, #required, #default_value').val('').attr('disabled','disabled');"; print "jQuery('#size, #unique, #required, #default_value').val('').prop('disabled', true);";
print 'jQuery("#value_choice").hide();'; print 'jQuery("#value_choice").hide();';
} }
?> ?>
if (type == 'date') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); } if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'datetime') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
else if (type == 'int') { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} else if (type == 'int') { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.attr('disabled','disabled').removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); } else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); } else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();} else if (type == 'boolean') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();} else if (type == 'price') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else if (type == 'select') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
else if (type == 'link') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();} else if (type == 'link') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
else if (type == 'sellist') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else if (type == 'sellist') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
else if (type == 'radio') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else if (type == 'radio') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
else if (type == 'checkbox') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
else if (type == 'chkbxlst') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();} else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
else if (type == 'separate') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); required.val('').attr('disabled','disabled'); default_value.val('').attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else if (type == 'separate') { size.val('').prop('disabled', true); unique.prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();}
else size.val('').attr('disabled','disabled'); else size.val('').prop('disabled', true);
} }
init_typeoffields('<?php echo GETPOST('type'); ?>'); init_typeoffields('<?php echo GETPOST('type'); ?>');
jQuery("#type").change(function() { jQuery("#type").change(function() {

12
htdocs/core/tpl/admin_extrafields_edit.tpl.php
View File

@@ -25,15 +25,15 @@
var size = jQuery("#size"); var size = jQuery("#size");
var unique = jQuery("#unique"); var unique = jQuery("#unique");
var required = jQuery("#required"); var required = jQuery("#required");
if (type == 'date') { size.attr('disabled','disabled'); } if (type == 'date') { size.prop('disabled', true); }
else if (type == 'datetime') { size.attr('disabled','disabled'); } else if (type == 'datetime') { size.prop('disabled', true); }
else if (type == 'double') { size.removeAttr('disabled'); } else if (type == 'double') { size.removeAttr('disabled'); }
else if (type == 'int') { size.removeAttr('disabled'); } else if (type == 'int') { size.removeAttr('disabled'); }
else if (type == 'text') { size.removeAttr('disabled'); unique.attr('disabled','disabled').removeAttr('checked'); } else if (type == 'text') { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); }
else if (type == 'varchar') { size.removeAttr('disabled'); } else if (type == 'varchar') { size.removeAttr('disabled'); }
else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');} else if (type == 'boolean') { size.val('').prop('disabled', true); unique.prop('disabled', true);}
else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');} else if (type == 'price') { size.val('').prop('disabled', true); unique.prop('disabled', true);}
else size.val('').attr('disabled','disabled'); else size.val('').prop('disabled', true);
} }
init_typeoffields(jQuery("#type").val()); init_typeoffields(jQuery("#type").val());
}); });

2
htdocs/install/fileconf.php
View File

@@ -496,7 +496,7 @@ jQuery(document).ready(function() {
else else
{ {
jQuery(".hideroot").hide(); jQuery(".hideroot").hide();
jQuery(".needroot").attr('disabled','disabled'); jQuery(".needroot").prop('disabled', true);
} }
} }

6
htdocs/product/stock/tpl/stockcorrection.tpl.php
View File

@@ -29,8 +29,8 @@ $langs->load("productbatch");
jQuery(document).ready(function() { jQuery(document).ready(function() {
function init_price() function init_price()
{ {
if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr(\'disabled\'); if (jQuery("#mouvement").val() == \'0\') jQuery("#unitprice").removeAttr("disabled");
else jQuery("#unitprice").attr(\'disabled\',\'disabled\'); else jQuery("#unitprice").prop("disabled", true);
} }
init_price(); init_price();
jQuery("#mouvement").change(function() { jQuery("#mouvement").change(function() {
@@ -116,4 +116,4 @@ $langs->load("productbatch");
print '</form>'; print '</form>';
?> ?>
<!-- END PHP STOCKCORRECTION.TPL.PHP --> <!-- END PHP STOCKCORRECTION.TPL.PHP -->

24
htdocs/user/card.php
View File

@@ -821,22 +821,22 @@ if (($action == 'create') || ($action == 'adduserldap'))
$("select[name=admin]").change(function() { $("select[name=admin]").change(function() {
if ( $(this).val() == 0 ) { if ( $(this).val() == 0 ) {
$("input[name=superadmin]") $("input[name=superadmin]")
.attr("disabled", true) .prop("disabled", true)
.prop("checked", false); .prop("checked", false);
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", false); .prop("disabled", false);
} else { } else {
$("input[name=superadmin]") $("input[name=superadmin]")
.attr("disabled", false); .prop("disabled", false);
} }
}); });
$("input[name=superadmin]").change(function() { $("input[name=superadmin]").change(function() {
if ( $(this).prop("checked", true) ) { if ( $(this).prop("checked", true) ) {
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", true); .prop("disabled", true);
} else { } else {
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", false); .prop("disabled", false);
} }
}); });
}); });
@@ -1822,32 +1822,32 @@ else
var admin = $("select[name=admin]").val(); var admin = $("select[name=admin]").val();
if (admin == 0) { if (admin == 0) {
$("input[name=superadmin]") $("input[name=superadmin]")
.attr("disabled", true) .prop("disabled", true)
.prop("checked", false); .prop("checked", false);
} }
if ($("input[name=superadmin]").prop("checked", true)) { if ($("input[name=superadmin]").prop("checked", true)) {
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", true); .prop("disabled", true);
} }
$("select[name=admin]").change(function() { $("select[name=admin]").change(function() {
if ( $(this).val() == 0 ) { if ( $(this).val() == 0 ) {
$("input[name=superadmin]") $("input[name=superadmin]")
.attr("disabled", true) .prop("disabled", true)
.prop("checked", false); .prop("checked", false);
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", false); .prop("disabled", false);
} else { } else {
$("input[name=superadmin]") $("input[name=superadmin]")
.attr("disabled", false); .prop("disabled", false);
} }
}); });
$("input[name=superadmin]").change(function() { $("input[name=superadmin]").change(function() {
if ( $(this).prop("checked", true)) { if ( $(this).prop("checked", true)) {
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", true); .prop("disabled", true);
} else { } else {
$("select[name=entity]") $("select[name=entity]")
.attr("disabled", false); .prop("disabled", false);
} }
}); });
}); });