Update for conflict

This commit is contained in:
Michael RICOIS 2014-03-05 15:20:42 +00:00
parent e13292170b
commit 3b76e2869b

View File

@ -20,8 +20,7 @@ function loading() {
$('.loading').css('display', 'block');
$('.ui-dialog-content').css('overflow','hidden');
$(".ui-dialog-buttonpane button").button("disable");
}
else { $('.loading').css('display', 'none');}
} else { $('.loading').css('display', 'none'); }
}
$(document).ready(function(){