Skip to content
This repository has been archived by the owner on Jul 16, 2022. It is now read-only.

Initial commit for new mode "mixed" #229

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Initial commit for new mode "mixed" #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 82 additions & 2 deletions js/pickmeup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@
return prev;
}, []).indexOf(year) !== -1
) ||
(
options.mode === 'mixed' && in_year_range(year, actual_date)
) ||
new Date(actual_date).getFullYear() === year;
};
var is_months_selected = function (year, month) {
Expand All @@ -387,6 +390,9 @@
return prev;
}, []).indexOf(year + '-' + month) !== -1
) ||
(
options.mode === 'mixed' && in_month_range(month, year, actual_date)
) ||
(
new Date(actual_date).getFullYear() === year &&
new Date(actual_date).getMonth() === month
Expand Down Expand Up @@ -506,6 +512,9 @@
) ||
(
options.mode === 'range' && val >= options.date[0] && val <= options.date[1]
) ||
(
options.mode === 'mixed' && in_range(val, options)
);
if (from_user.disabled || (!('disabled' in from_user) && disabled)) {
dom_add_class(day_element, 'pmu-disabled');
Expand Down Expand Up @@ -542,6 +551,41 @@
dom_dispatch_event(target, 'fill');
}

function in_range (date, options) {
pairs = options.date.length - (options.date.length % 2);
for (i = 0; i < pairs; i = i+2) {
if (date >= options.date[i].valueOf() && date <= options.date[i + 1].valueOf())
return true;
}
return false;
}

function in_year_range (year, dates) {
pairs = dates.length - (dates.length % 2);
for (i = 0; i < pairs; i = i+2) {
if (year >= new Date(dates[i]).getFullYear() &&
year <= new Date(dates[i + 1]).getFullYear())
return true;
}
return false;
}

function in_month_range (month, year, dates) {
pairs = dates.length - (dates.length % 2);
for (i = 0; i < pairs; i = i+2) {
var first_year = new Date(dates[i]).getFullYear(),
lastyear = new Date(dates[i + 1]).getFullYear(),
first_month = new Date(dates[i]).getMonth(),
last_month = new Date(dates[i + 1]).getMonth();
if ((year > first_year && year < lastyear) ||
(year > first_year && year === lastyear && month <= last_month) ||
(year === first_year && year < lastyear && month >= first_month) ||
(year === first_year && year === lastyear && month >= first_month && month <= last_month))
return true;
}
return false;
}

function parse_date (date, options) {
var format = options.format,
separator = options.separator,
Expand Down Expand Up @@ -762,6 +806,22 @@
}
options.lastSel = !options.lastSel;
break;
case 'mixed':
last_index = Math.floor((options.date.length)/2);
last_index = last_index * 2;

if (!options.lastSel) {
options.date[last_index] = new_date;
} else {
if (new_date < options.date[last_index]) {
options.date[last_index + 1] = options.date[last_index];
options.date[last_index] = new_date;
} else {
options.date[last_index + 1] = new_date;
}
}
options.lastSel = !options.lastSel;
break;
default:
options.date = new_date.valueOf();
break;
Expand All @@ -784,6 +844,18 @@
}
}

/**
* @param {Element} target
* @param {Event} event
*/
function key_action (target, event) {
var options = target.__pickmeup.options;
if (event.code === options.key) {
// FIXME Currently removeDate is unused
options.removeDate = !options.removeDate;
}
}

/**
* @param {Element} target
* @param {Event} event
Expand Down Expand Up @@ -941,6 +1013,7 @@
}
);
options.lastSel = false;
options.removeDate = false;
}
if (!dom_dispatch_event(target, 'show')) {
return;
Expand Down Expand Up @@ -1011,6 +1084,7 @@
dom_off(target, document.documentElement, 'click', options.bound.hide);
dom_off(target, window, 'resize', options.bound.forced_show);
options.lastSel = false;
options.removeDate = false;
}
}
}
Expand Down Expand Up @@ -1236,7 +1310,7 @@
options.view = 'months';
}
options.calendars = Math.max(1, parseInt(options.calendars, 10) || 1);
options.mode = /single|multiple|range/.test(options.mode) ? options.mode : 'single';
options.mode = /single|multiple|range|mixed/.test(options.mode) ? options.mode : 'single';
if (options.min) {
options.min = parse_date(options.min, options);
if (!options.select_day) {
Expand Down Expand Up @@ -1274,7 +1348,8 @@
next : next.bind(target, target),
get_date : get_date.bind(target, target),
set_date : set_date.bind(target, target),
destroy : destroy.bind(target, target)
destroy : destroy.bind(target, target),
key_action : key_action.bind(target, target)
};
dom_add_class(element, 'pmu-view-' + options.view);
var content_template = options.instance_template(options),
Expand All @@ -1291,6 +1366,10 @@
function (e) {
e.preventDefault();
});
if (options.mode == 'mixed') {
dom_on(target, document, 'keydown', options.bound.key_action);
dom_on(target, document, 'keyup', options.bound.key_action);
}
if (options.flat) {
dom_add_class(element, 'pmu-flat');
target.appendChild(element);
Expand Down Expand Up @@ -1339,6 +1418,7 @@
hide_on_select : false,
min : null,
max : null,
key : "ControlLeft",
render : function () {
},
locale : 'en',
Expand Down