Skip to content

Removing the alteration of Array.prototype with a custom function #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Removing the alteration of Array.prototype with a custom function #57

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
25 changes: 13 additions & 12 deletions glDatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@

// Our plugin object
var glDatePicker = (function() {
// Tell if something is in the array. Uses jQuery's inArray
function indexOf(array, value) {
return $.inArray(value, array);
}

// Main entry point. Initialize the plugin
function glDatePicker(element, userOptions) {
// Grab handle to this
Expand Down Expand Up @@ -285,7 +290,7 @@
if(userList) {
var newList = [];
$.each(userList, function(i, v) {
if(v >= min && v <= max && newList._indexOf(v) < 0) {
if(v >= min && v <= max && indexOf(newList, v) < 0) {
newList.push(v);
}
});
Expand Down Expand Up @@ -405,9 +410,9 @@
var dateYear = dateVal.year;

// Find the month first
if(selectableMonths._indexOf(dateMonth) != -1) {
if(indexOf(selectableMonths, dateMonth) != -1) {
// If year is in our collection, break...
if(selectableYears._indexOf(dateYear) != -1) {
if(indexOf(selectableYears, dateYear) != -1) {
break;
}
else {
Expand Down Expand Up @@ -593,9 +598,9 @@

// If not active or if not within selectableMonths, set to noday otherwise evaluate accordingly
if(!isSelectable ||
selectableYears._indexOf(cellDateVal.year) < 0 ||
selectableMonths._indexOf(cellDateVal.month) < 0 ||
selectableDOW._indexOf(cellDateVal.day) < 0) {
indexOf(selectableYears, cellDateVal.year) < 0 ||
indexOf(selectableMonths, cellDateVal.month) < 0 ||
indexOf(selectableDOW, cellDateVal.day) < 0) {
cellClass = 'noday';
}
else {
Expand Down Expand Up @@ -730,7 +735,7 @@

// Populate month select
$.each(monthNames, function(i, v) {
if(options.allowMonthSelect && selectableMonths._indexOf(i) != -1) {
if(options.allowMonthSelect && indexOf(selectableMonths, i) != -1) {
var o = $('<option/>').html(v).attr('value', i);
if(i == firstDateMonth) { o.attr('selected', 'selected');}
monthSelect.append(o);
Expand Down Expand Up @@ -810,9 +815,5 @@
day: this.getDay()
};
};

Array.prototype._indexOf = function(value) {
return $.inArray(value, this);
}
})();
})();
})();