Skip to content
This repository has been archived by the owner on Jun 19, 2018. It is now read-only.

Commit

Permalink
chore(release): 0.18.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Lewis committed Jan 9, 2016
1 parent f6559a4 commit 7f586c0
Show file tree
Hide file tree
Showing 11 changed files with 86 additions and 39 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="0.18.1"></a>
## [0.18.1](https://github.com/mattlewis92/angular-bootstrap-calendar/compare/0.18.0...v0.18.1) (2016-01-09)


### Bug Fixes

* **week-view:** show recurring events in the weekview. Closes #252 ([4615973](https://github.com/mattlewis92/angular-bootstrap-calendar/commit/4615973)), closes [#252](https://github.com/mattlewis92/angular-bootstrap-calendar/issues/252)
* **weekTitle:** Use isoWeek instead of week to fix tests. Closes #257 ([c594f39](https://github.com/mattlewis92/angular-bootstrap-calendar/commit/c594f39)), closes [#257](https://github.com/mattlewis92/angular-bootstrap-calendar/issues/257)



<a name="0.18.0"></a>
# [0.18.0](https://github.com/mattlewis92/angular-bootstrap-calendar/compare/0.17.6...v0.18.0) (2016-01-02)

Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-bootstrap-calendar",
"version": "0.18.0",
"version": "0.18.1",
"homepage": "https://github.com/mattlewis92/angular-bootstrap-calendar",
"authors": [
"Matt Lewis"
Expand Down
2 changes: 1 addition & 1 deletion dist/css/angular-bootstrap-calendar.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* angular-bootstrap-calendar - A pure AngularJS bootstrap themed responsive calendar that can display events and has views for year, month, week and day
* @version v0.18.0
* @version v0.18.1
* @link https://github.com/mattlewis92/angular-bootstrap-calendar
* @license MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/css/angular-bootstrap-calendar.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 32 additions & 14 deletions dist/js/angular-bootstrap-calendar-tpls.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* angular-bootstrap-calendar - A pure AngularJS bootstrap themed responsive calendar that can display events and has views for year, month, week and day
* @version v0.18.0
* @version v0.18.1
* @link https://github.com/mattlewis92/angular-bootstrap-calendar
* @license MIT
*/
Expand Down Expand Up @@ -1663,16 +1663,15 @@ return /******/ (function(modules) { // webpackBootstrap
return moment(oldEnd).add(diffInSeconds);
}

function eventIsInPeriod(event, periodStart, periodEnd) {
function getRecurringEventPeriod(eventPeriod, recursOn, containerPeriodStart) {

var eventStart = moment(event.startsAt);
var eventEnd = moment(event.endsAt || event.startsAt);
periodStart = moment(periodStart);
periodEnd = moment(periodEnd);
var eventStart = moment(eventPeriod.start);
var eventEnd = moment(eventPeriod.end);
var periodStart = moment(containerPeriodStart);

if (angular.isDefined(event.recursOn)) {
if (angular.isDefined(recursOn)) {

switch (event.recursOn) {
switch (recursOn) {
case 'year':
eventStart.set({
year: periodStart.year()
Expand All @@ -1687,13 +1686,26 @@ return /******/ (function(modules) { // webpackBootstrap
break;

default:
throw new Error('Invalid value (' + event.recursOn + ') given for recurs on. Can only be year or month.');
throw new Error('Invalid value (' + recursOn + ') given for recurs on. Can only be year or month.');
}

eventEnd = adjustEndDateFromStartDiff(event.startsAt, eventStart, eventEnd);
eventEnd = adjustEndDateFromStartDiff(eventPeriod.start, eventStart, eventEnd);

}

return {start: eventStart, end: eventEnd};

}

function eventIsInPeriod(event, periodStart, periodEnd) {

periodStart = moment(periodStart);
periodEnd = moment(periodEnd);

var eventPeriod = getRecurringEventPeriod({start: event.startsAt, end: event.endsAt || event.startsAt}, event.recursOn, periodStart);
var eventStart = eventPeriod.start;
var eventEnd = eventPeriod.end;

return (eventStart.isAfter(periodStart) && eventStart.isBefore(periodEnd)) ||
(eventEnd.isAfter(periodStart) && eventEnd.isBefore(periodEnd)) ||
(eventStart.isBefore(periodStart) && eventEnd.isAfter(periodEnd)) ||
Expand Down Expand Up @@ -1824,12 +1836,18 @@ return /******/ (function(modules) { // webpackBootstrap

var eventsSorted = filterEventsInPeriod(events, startOfWeek, endOfWeek).map(function(event) {

var eventStart = moment(event.startsAt).startOf('day');
var eventEnd = moment(event.endsAt || event.startsAt).startOf('day');
var weekViewStart = moment(startOfWeek).startOf('day');
var weekViewEnd = moment(endOfWeek).startOf('day');
var offset, span;

var eventPeriod = getRecurringEventPeriod({
start: moment(event.startsAt).startOf('day'),
end: moment(event.endsAt || event.startsAt).startOf('day')
}, event.recursOn, weekViewStart);

var eventStart = eventPeriod.start;
var eventEnd = eventPeriod.end;

var offset, span;
if (eventStart.isBefore(weekViewStart) || eventStart.isSame(weekViewStart)) {
offset = 0;
} else {
Expand Down Expand Up @@ -1995,7 +2013,7 @@ return /******/ (function(modules) { // webpackBootstrap

function week(viewDate) {
var weekTitleLabel = calendarConfig.titleFormats.week;
return weekTitleLabel.replace('{week}', moment(viewDate).week()).replace('{year}', moment(viewDate).format('YYYY'));
return weekTitleLabel.replace('{week}', moment(viewDate).isoWeek()).replace('{year}', moment(viewDate).format('YYYY'));
}

function month(viewDate) {
Expand Down
6 changes: 3 additions & 3 deletions dist/js/angular-bootstrap-calendar-tpls.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/angular-bootstrap-calendar-tpls.min.js.map
View file

Large diffs are not rendered by default.

46 changes: 32 additions & 14 deletions dist/js/angular-bootstrap-calendar.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* angular-bootstrap-calendar - A pure AngularJS bootstrap themed responsive calendar that can display events and has views for year, month, week and day
* @version v0.18.0
* @version v0.18.1
* @link https://github.com/mattlewis92/angular-bootstrap-calendar
* @license MIT
*/
Expand Down Expand Up @@ -1580,16 +1580,15 @@ return /******/ (function(modules) { // webpackBootstrap
return moment(oldEnd).add(diffInSeconds);
}

function eventIsInPeriod(event, periodStart, periodEnd) {
function getRecurringEventPeriod(eventPeriod, recursOn, containerPeriodStart) {

var eventStart = moment(event.startsAt);
var eventEnd = moment(event.endsAt || event.startsAt);
periodStart = moment(periodStart);
periodEnd = moment(periodEnd);
var eventStart = moment(eventPeriod.start);
var eventEnd = moment(eventPeriod.end);
var periodStart = moment(containerPeriodStart);

if (angular.isDefined(event.recursOn)) {
if (angular.isDefined(recursOn)) {

switch (event.recursOn) {
switch (recursOn) {
case 'year':
eventStart.set({
year: periodStart.year()
Expand All @@ -1604,13 +1603,26 @@ return /******/ (function(modules) { // webpackBootstrap
break;

default:
throw new Error('Invalid value (' + event.recursOn + ') given for recurs on. Can only be year or month.');
throw new Error('Invalid value (' + recursOn + ') given for recurs on. Can only be year or month.');
}

eventEnd = adjustEndDateFromStartDiff(event.startsAt, eventStart, eventEnd);
eventEnd = adjustEndDateFromStartDiff(eventPeriod.start, eventStart, eventEnd);

}

return {start: eventStart, end: eventEnd};

}

function eventIsInPeriod(event, periodStart, periodEnd) {

periodStart = moment(periodStart);
periodEnd = moment(periodEnd);

var eventPeriod = getRecurringEventPeriod({start: event.startsAt, end: event.endsAt || event.startsAt}, event.recursOn, periodStart);
var eventStart = eventPeriod.start;
var eventEnd = eventPeriod.end;

return (eventStart.isAfter(periodStart) && eventStart.isBefore(periodEnd)) ||
(eventEnd.isAfter(periodStart) && eventEnd.isBefore(periodEnd)) ||
(eventStart.isBefore(periodStart) && eventEnd.isAfter(periodEnd)) ||
Expand Down Expand Up @@ -1741,12 +1753,18 @@ return /******/ (function(modules) { // webpackBootstrap

var eventsSorted = filterEventsInPeriod(events, startOfWeek, endOfWeek).map(function(event) {

var eventStart = moment(event.startsAt).startOf('day');
var eventEnd = moment(event.endsAt || event.startsAt).startOf('day');
var weekViewStart = moment(startOfWeek).startOf('day');
var weekViewEnd = moment(endOfWeek).startOf('day');
var offset, span;

var eventPeriod = getRecurringEventPeriod({
start: moment(event.startsAt).startOf('day'),
end: moment(event.endsAt || event.startsAt).startOf('day')
}, event.recursOn, weekViewStart);

var eventStart = eventPeriod.start;
var eventEnd = eventPeriod.end;

var offset, span;
if (eventStart.isBefore(weekViewStart) || eventStart.isSame(weekViewStart)) {
offset = 0;
} else {
Expand Down Expand Up @@ -1912,7 +1930,7 @@ return /******/ (function(modules) { // webpackBootstrap

function week(viewDate) {
var weekTitleLabel = calendarConfig.titleFormats.week;
return weekTitleLabel.replace('{week}', moment(viewDate).week()).replace('{year}', moment(viewDate).format('YYYY'));
return weekTitleLabel.replace('{week}', moment(viewDate).isoWeek()).replace('{year}', moment(viewDate).format('YYYY'));
}

function month(viewDate) {
Expand Down
4 changes: 2 additions & 2 deletions dist/js/angular-bootstrap-calendar.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/angular-bootstrap-calendar.min.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-bootstrap-calendar",
"version": "0.18.0",
"version": "0.18.1",
"license": "MIT",
"repository": "git@github.com:mattlewis92/angular-bootstrap-calendar.git",
"peerDependencies": {
Expand Down

0 comments on commit 7f586c0

Please sign in to comment.