Skip to content

Commit b6c01e8

Browse files
author
John Rix
committed
Reverted changes from 468994f which were causing content to be lost.
1 parent ab34479 commit b6c01e8

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

angular-material-calendar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ angular.module("materialCalendar").service("MaterialCalendarData", [function ()
177177
};
178178

179179
this.setDayContent = function(date, content) {
180-
this.data[this.getDayKey(date)] = content || "";
180+
this.data[this.getDayKey(date)] = content || this.data[this.getDayKey(date)] || "";
181181
};
182182
}
183183
return new CalendarData();

angular-material-calendar.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-calendar",
3-
"version": "0.2.16",
3+
"version": "0.2.17",
44
"homepage": "https://github.com/bradberger/material-calendar",
55
"keywords": "angular material design calendar ngCalendar mdCalendar calendarMd calendar-md md-calendar ng-calendar",
66
"authors": [

dist/angular-material-calendar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ angular.module("materialCalendar").service("MaterialCalendarData", [function ()
177177
};
178178

179179
this.setDayContent = function(date, content) {
180-
this.data[this.getDayKey(date)] = content || "";
180+
this.data[this.getDayKey(date)] = content || this.data[this.getDayKey(date)] || "";
181181
};
182182
}
183183
return new CalendarData();

dist/angular-material-calendar.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-material-calendar",
3-
"version": "0.2.16",
3+
"version": "0.2.17",
44
"description": "A calendar directive for AngularJS and Angular Material Design",
55
"keywords": [
66
"angular",

src/angular-material-calendar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ angular.module("materialCalendar").service("MaterialCalendarData", [function ()
177177
};
178178

179179
this.setDayContent = function(date, content) {
180-
this.data[this.getDayKey(date)] = content || "";
180+
this.data[this.getDayKey(date)] = content || this.data[this.getDayKey(date)] || "";
181181
};
182182
}
183183
return new CalendarData();

0 commit comments

Comments
 (0)