Skip to content

Commit

Permalink
fixes nehakadam#14
Browse files Browse the repository at this point in the history
  • Loading branch information
@androidi
androidi committed Dec 28, 2017
1 parent 8ea14e0 commit 4585f44
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
6 changes: 4 additions & 2 deletions dist/calenstyle-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4441,12 +4441,13 @@ CalenStyle.prototype = {
iLoadNextYear = iArrLoadNext[1],
iLoadNextMonthDays = to.__getNumberOfDaysOfMonth(iLoadNextMonth, iLoadNextYear);

if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
{
// if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
// {
dLoadStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dLoadEndDate = to.setDateInFormat({"iDate": {d: iLoadNextMonthDays, M: iLoadNextMonth, y: iLoadNextYear}}, "END");
dDurationStartDate = dLoadStartDate;
dDurationEndDate = dLoadEndDate;
/*
}
else if($.cf.compareStrings(to.tv.sLoadType, "Prev"))
{
Expand All @@ -4462,6 +4463,7 @@ CalenStyle.prototype = {
dDurationStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dDurationEndDate = new Date(dLoadEndDate);
}
*/
}
}

Expand Down
6 changes: 4 additions & 2 deletions dist/calenstyle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4445,12 +4445,13 @@ CalenStyle.prototype = {
iLoadNextYear = iArrLoadNext[1],
iLoadNextMonthDays = to.__getNumberOfDaysOfMonth(iLoadNextMonth, iLoadNextYear);

if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
{
// if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
// {
dLoadStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dLoadEndDate = to.setDateInFormat({"iDate": {d: iLoadNextMonthDays, M: iLoadNextMonth, y: iLoadNextYear}}, "END");
dDurationStartDate = dLoadStartDate;
dDurationEndDate = dLoadEndDate;
/*
}
else if($.cf.compareStrings(to.tv.sLoadType, "Prev"))
{
Expand All @@ -4466,6 +4467,7 @@ CalenStyle.prototype = {
dDurationStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dDurationEndDate = new Date(dLoadEndDate);
}
*/
}
}

Expand Down
2 changes: 1 addition & 1 deletion dist/calenstyle.min.js
View file

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions src/calenstyle-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4441,12 +4441,13 @@ CalenStyle.prototype = {
iLoadNextYear = iArrLoadNext[1],
iLoadNextMonthDays = to.__getNumberOfDaysOfMonth(iLoadNextMonth, iLoadNextYear);

if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
{
// if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
// {
dLoadStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dLoadEndDate = to.setDateInFormat({"iDate": {d: iLoadNextMonthDays, M: iLoadNextMonth, y: iLoadNextYear}}, "END");
dDurationStartDate = dLoadStartDate;
dDurationEndDate = dLoadEndDate;
/*
}
else if($.cf.compareStrings(to.tv.sLoadType, "Prev"))
{
Expand All @@ -4462,6 +4463,7 @@ CalenStyle.prototype = {
dDurationStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dDurationEndDate = new Date(dLoadEndDate);
}
*/
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/calenstyle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4445,12 +4445,13 @@ CalenStyle.prototype = {
iLoadNextYear = iArrLoadNext[1],
iLoadNextMonthDays = to.__getNumberOfDaysOfMonth(iLoadNextMonth, iLoadNextYear);

if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
{
// if($.cf.compareStrings(to.tv.sLoadType, "Load") || $.cf.compareStrings(to.setting.datasetModificationRule, "ReplaceAll"))
// {
dLoadStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dLoadEndDate = to.setDateInFormat({"iDate": {d: iLoadNextMonthDays, M: iLoadNextMonth, y: iLoadNextYear}}, "END");
dDurationStartDate = dLoadStartDate;
dDurationEndDate = dLoadEndDate;
/*
}
else if($.cf.compareStrings(to.tv.sLoadType, "Prev"))
{
Expand All @@ -4466,6 +4467,7 @@ CalenStyle.prototype = {
dDurationStartDate = to.setDateInFormat({"iDate": {d: 1, M: iLoadPrevMonth, y: iLoadPrevYear}}, "START");
dDurationEndDate = new Date(dLoadEndDate);
}
*/
}
}

Expand Down

0 comments on commit 4585f44

Please sign in to comment.