Refactor code for improved readability and consistency across multiple files

This commit is contained in:
Le Stagiaire
2024-11-08 16:08:06 +01:00
parent 0cfc5938bd
commit 6aa7fea79c
19 changed files with 1677 additions and 1794 deletions

View File

@ -14,7 +14,7 @@ function ds_getel(id) {
function ds_getleft(el) {
var tmp = el.offsetLeft;
el = el.offsetParent
while(el) {
while (el) {
tmp += el.offsetLeft;
el = el.offsetParent;
}
@ -23,7 +23,7 @@ function ds_getleft(el) {
function ds_gettop(el) {
var tmp = el.offsetTop;
el = el.offsetParent
while(el) {
while (el) {
tmp += el.offsetTop;
el = el.offsetParent;
}
@ -31,7 +31,7 @@ function ds_gettop(el) {
}
setTimeout(
function(){
function () {
// Output Element
ds_oe = ds_getel('ds_calclass');
// Container
@ -40,7 +40,7 @@ setTimeout(
);
// Output Buffering
var ds_ob = '';
var ds_ob = '';
function ds_ob_clean() {
ds_ob = '';
}
@ -55,28 +55,28 @@ function ds_echo(t) {
var ds_element; // Text Element...
var ds_monthnames = [
'Janvier', 'Fevrier', 'Mars', 'Avril', 'Mai', 'Juin',
'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Decembre'
'Janvier', 'Fevrier', 'Mars', 'Avril', 'Mai', 'Juin',
'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Decembre'
]; // You can translate it for your language.
var ds_daynames = [
'Dim', 'Lun', 'Mar', 'Me', 'Jeu', 'Ven', 'Sam'
'Dim', 'Lun', 'Mar', 'Me', 'Jeu', 'Ven', 'Sam'
]; // You can translate it for your language.
// Calendar template
function ds_template_main_above(t) {
return '<table cellpadding="3" cellspacing="1" class="ds_tbl">'
+ '<tr>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_py();">&lt;&lt;</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_pm();">&lt;</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_hi();" colspan="3">[Fermer]</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_nm();">&gt;</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_ny();">&gt;&gt;</td>'
+ '</tr>'
+ '<tr>'
+ '<td colspan="7" class="ds_head">' + t + '</td>'
+ '</tr>'
+ '<tr>';
+ '<tr>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_py();">&lt;&lt;</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_pm();">&lt;</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_hi();" colspan="3">[Fermer]</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_nm();">&gt;</td>'
+ '<td class="ds_head" style="cursor: pointer" onclick="ds_ny();">&gt;&gt;</td>'
+ '</tr>'
+ '<tr>'
+ '<td colspan="7" class="ds_head">' + t + '</td>'
+ '</tr>'
+ '<tr>';
}
function ds_template_day_row(t) {
@ -106,11 +106,11 @@ function ds_draw_calendar(m, y) {
// First clean the output buffer.
ds_ob_clean();
// Here we go, do the header
ds_echo (ds_template_main_above(ds_monthnames[m - 1] + ' ' + y));
for (i = 0; i < 7; i ++) {
ds_echo (ds_template_day_row(ds_daynames[i]));
ds_echo(ds_template_main_above(ds_monthnames[m - 1] + ' ' + y));
for (i = 0; i < 7; i++) {
ds_echo(ds_template_day_row(ds_daynames[i]));
}
if (m == 1 || m == 3 || m == 5 || m == 7 || m == 8 || m == 10 || m == 12) {
days = 31;
}
@ -120,33 +120,33 @@ function ds_draw_calendar(m, y) {
else {
days = (y % 4 == 0) ? 29 : 28;
}
var first_day = new Date(y, (m-1), 1).getDay();
var first_day = new Date(y, (m - 1), 1).getDay();
var first_loop = 1;
// Start the first week
ds_echo (ds_template_new_week());
ds_echo(ds_template_new_week());
// If sunday is not the first day of the month, make a blank cell...
if (first_day != 0) {
ds_echo (ds_template_blank_cell(first_day));
ds_echo(ds_template_blank_cell(first_day));
}
var j = first_day;
for (i = 0; i < days; i ++) {
for (i = 0; i < days; i++) {
// Today is sunday, make a new week.
// If this sunday is the first day of the month,
// we've made a new row for you already.
if (j == 0 && !first_loop) {
// New week!!
ds_echo (ds_template_new_week());
ds_echo(ds_template_new_week());
}
ds_echo (ds_template_day(i + 1, m, y)); // Make a row of that day!
ds_echo(ds_template_day(i + 1, m, y)); // Make a row of that day!
first_loop = 0; // This is not first loop anymore...
// What is the next day?
j ++;
j++;
j %= 7;
}
ds_echo (ds_template_main_below()); // Do the footer
ds_echo(ds_template_main_below()); // Do the footer
ds_ob_flush(); // And let's display..
ds_ce.scrollIntoView(); // Scroll it into view.
}
@ -158,13 +158,11 @@ function ds_sh(t) {
ds_element = t;
var date = t.value.split("-");
// Make a new date, and set the current month and year.
if(t != "")
{
if (t != "") {
ds_c_month = date[1];
ds_c_year = date[0];
}
else
{
else {
var ds_sh_date = new Date();
ds_c_month = ds_sh_date.getMonth() + 1;
ds_c_year = ds_sh_date.getFullYear();
@ -183,16 +181,16 @@ function ds_sh(t) {
}
// Hide the calendar.
function ds_hi() {ds_ce.style.display = 'none';}
function ds_hi() { ds_ce.style.display = 'none'; }
// Moves to the next month...
function ds_nm() {
// Increase the current month.
ds_c_month ++;
ds_c_month++;
// We have passed December, let's go to the next year.
// Increase the current year, and set the current month to January.
if (ds_c_month > 12) {
ds_c_month = 1;
ds_c_month = 1;
ds_c_year++;
}
// Redraw the calendar.
@ -205,7 +203,7 @@ function ds_pm() {
// We have passed January, let's go back to the previous year.
// Decrease the current year, and set the current month to December.
if (ds_c_month < 1) {
ds_c_month = 12;
ds_c_month = 12;
ds_c_year = ds_c_year - 1; // Can't use dash-dash here, it will make the page invalid.
}
// Redraw the calendar.
@ -237,18 +235,18 @@ function ds_format_date(d, m, y) {
// When the user clicks the day.
function ds_onclick(d, m, y) {
ds_hi(); // Hide the calendar.
if (typeof(ds_element.value) != 'undefined') {
if (typeof (ds_element.value) != 'undefined') {
// Set the value of it, if we can.
ds_element.value = ds_format_date(d, m, y);
}
else if (typeof(ds_element.innerHTML) != 'undefined') {
else if (typeof (ds_element.innerHTML) != 'undefined') {
// Maybe we want to set the HTML in it.
ds_element.innerHTML = ds_format_date(d, m, y);
}
else {
// I don't know how should we display it, just alert it to user.
alert (ds_format_date(d, m, y));
alert(ds_format_date(d, m, y));
}
}
// ]]> -->