Skip to content

Update directive.js #13

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update directive.js #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f4c69
Update directive.js
NobleMule Jul 24, 2015
ab58203
Update directive.js
NobleMule Jul 24, 2015
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
19 changes: 11 additions & 8 deletions directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
return {
checkDate: function (date) {
var d;
if (!date.day || !date.month || !date.year) return false;
if (!date.day || !(date.month === 0 || date.month) || !date.year) return false;

d = new Date(Date.UTC(date.year, date.month, date.day));

if (d && (d.getMonth() === date.month && d.getDate() === Number(date.day))) {
return d;
return date;
}

return this.checkDate(changeDate(date));
Expand All @@ -54,13 +54,14 @@
}()),
months: (function () {
var lst = [],
mLen = months.length;
i = 0;

while (mLen--) {
while (i < months.length) {
lst.push({
value: mLen,
name: months[mLen]
value: i,
name: months[i]
});
i++;
}
return lst;
}())
Expand Down Expand Up @@ -91,6 +92,8 @@
var date = rsmDateUtils.checkDate($scope.dateFields);
if (date) {
$scope.dateFields = date;
// Update the original model
$scope.model = new Date(Date.UTC(date.year, date.month, date.day));
}
};
}],
Expand All @@ -108,7 +111,7 @@
' </div>' +
'</div>',
link: function (scope, element, attrs, ctrl) {
var currentYear = parseInt(attrs.startingYear, 10) || new Date().getFullYear(),
var currentYear = parseInt(attrs.startingYear, 10) || parseInt(eval(attrs.startingYear), 10) || new Date().getFullYear(), // Add eval() test to allow for calculated dates
numYears = parseInt(attrs.numYears,10) || 100,
oldestYear = currentYear - numYears,
overridable = [
Expand Down Expand Up @@ -167,4 +170,4 @@
}
};
}]);
}());
}());