Skip to content

Commit fbf2a53

Browse files
author
Brad Berger
committed
Merge pull request #34 from atnstefan/master
Add namespaces to services to avoid name clashing with user applications.
2 parents 12c60da + 94a998d commit fbf2a53

9 files changed

+44
-44
lines changed

‎angular-material-calendar.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
angular.module("materialCalendar", ["ngMaterial", "ngSanitize"]);
22

3-
angular.module("materialCalendar").constant("config", {
3+
angular.module("materialCalendar").constant("materialCalendar.config", {
44
version: "0.2.13",
55
debug: document.domain.indexOf("localhost") > -1
66
});
77

8-
angular.module("materialCalendar").config(["config", "$logProvider", "$compileProvider", function (config, $logProvider, $compileProvider) {
8+
angular.module("materialCalendar").config(["materialCalendar.config", "$logProvider", "$compileProvider", function (config, $logProvider, $compileProvider) {
99
if (config.debug) {
1010
$logProvider.debugEnabled(false);
1111
$compileProvider.debugInfoEnabled(false);
1212
}
1313
}]);
1414

15-
angular.module("materialCalendar").service("Calendar", [function () {
15+
angular.module("materialCalendar").service("materialCalendar.Calendar", [function () {
1616

1717
function Calendar(year, month, options) {
1818

@@ -107,7 +107,7 @@ angular.module("materialCalendar").service("Calendar", [function () {
107107

108108
}]);
109109

110-
angular.module("materialCalendar").service("CalendarData", [function () {
110+
angular.module("materialCalendar").service("MaterialCalendarData", [function () {
111111
function CalendarData() {
112112

113113
this.data = {};
@@ -123,7 +123,7 @@ angular.module("materialCalendar").service("CalendarData", [function () {
123123
return new CalendarData();
124124
}]);
125125

126-
angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse", "$http", "$q", "Calendar", "CalendarData", function ($compile, $parse, $http, $q, Calendar, CalendarData) {
126+
angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse", "$http", "$q", "materialCalendar.Calendar", "MaterialCalendarData", function ($compile, $parse, $http, $q, Calendar, CalendarData) {
127127

128128
var defaultTemplate = "<md-content layout='column' layout-fill md-swipe-left='next()' md-swipe-right='prev()'><md-toolbar><div class='md-toolbar-tools' layout='row'><md-button class='md-icon-button' ng-click='prev()' aria-label='Previous month'><md-tooltip ng-if='::tooltips()'>Previous month</md-tooltip>&laquo;</md-button><div flex></div><h2 class='calendar-md-title'><span>{{ calendar.start | date:titleFormat:timezone }}</span></h2><div flex></div><md-button class='md-icon-button' ng-click='next()' aria-label='Next month'><md-tooltip ng-if='::tooltips()'>Next month</md-tooltip>&raquo;</md-button></div></md-toolbar><!-- agenda view --><md-content ng-if='weekLayout === columnWeekLayout' class='agenda'><div ng-repeat='week in calendar.weeks track by $index'><div ng-if='sameMonth(day)' ng-class='{&quot;disabled&quot; : isDisabled(day), active: active === day }' ng-click='handleDayClick(day)' ng-repeat='day in week' layout><md-tooltip ng-if='::tooltips()'>{{ day | date:dayTooltipFormat:timezone }}</md-tooltip><div>{{ day | date:dayFormat:timezone }}</div><div flex ng-bind-html='dataService.data[dayKey(day)]'></div></div></div></md-content><!-- calendar view --><md-content ng-if='weekLayout !== columnWeekLayout' flex layout='column' class='calendar'><div layout='row' class='subheader'><div layout-padding class='subheader-day' flex ng-repeat='day in calendar.weeks[0]'><md-tooltip ng-if='::tooltips()'>{{ day | date:dayLabelTooltipFormat }}</md-tooltip>{{ day | date:dayLabelFormat }}</div></div><div ng-if='week.length' ng-repeat='week in calendar.weeks track by $index' flex layout='row'><div tabindex='{{ sameMonth(day) ? (day | date:dayFormat:timezone) : 0 }}' ng-repeat='day in week track by $index' ng-click='handleDayClick(day)' flex layout layout-padding ng-class='{&quot;disabled&quot; : isDisabled(day), &quot;active&quot;: isActive(day), &quot;md-whiteframe-12dp&quot;: hover || focus }' ng-focus='focus = true;' ng-blur='focus = false;' ng-mouseleave='hover = false' ng-mouseenter='hover = true'><md-tooltip ng-if='::tooltips()'>{{ day | date:dayTooltipFormat }}</md-tooltip><div>{{ day | date:dayFormat }}</div><div flex ng-bind-html='dataService.data[dayKey(day)]'></div></div></div></md-content></md-content>";
129129

‎angular-material-calendar.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/angular-material-calendar.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
angular.module("materialCalendar", ["ngMaterial", "ngSanitize"]);
22

3-
angular.module("materialCalendar").constant("config", {
3+
angular.module("materialCalendar").constant("materialCalendar.config", {
44
version: "0.2.13",
55
debug: document.domain.indexOf("localhost") > -1
66
});
77

8-
angular.module("materialCalendar").config(["config", "$logProvider", "$compileProvider", function (config, $logProvider, $compileProvider) {
8+
angular.module("materialCalendar").config(["materialCalendar.config", "$logProvider", "$compileProvider", function (config, $logProvider, $compileProvider) {
99
if (config.debug) {
1010
$logProvider.debugEnabled(false);
1111
$compileProvider.debugInfoEnabled(false);
1212
}
1313
}]);
1414

15-
angular.module("materialCalendar").service("Calendar", [function () {
15+
angular.module("materialCalendar").service("materialCalendar.Calendar", [function () {
1616

1717
function Calendar(year, month, options) {
1818

@@ -107,7 +107,7 @@ angular.module("materialCalendar").service("Calendar", [function () {
107107

108108
}]);
109109

110-
angular.module("materialCalendar").service("CalendarData", [function () {
110+
angular.module("materialCalendar").service("MaterialCalendarData", [function () {
111111
function CalendarData() {
112112

113113
this.data = {};
@@ -123,7 +123,7 @@ angular.module("materialCalendar").service("CalendarData", [function () {
123123
return new CalendarData();
124124
}]);
125125

126-
angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse", "$http", "$q", "Calendar", "CalendarData", function ($compile, $parse, $http, $q, Calendar, CalendarData) {
126+
angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse", "$http", "$q", "materialCalendar.Calendar", "MaterialCalendarData", function ($compile, $parse, $http, $q, Calendar, CalendarData) {
127127

128128
var defaultTemplate = "<md-content layout='column' layout-fill md-swipe-left='next()' md-swipe-right='prev()'><md-toolbar><div class='md-toolbar-tools' layout='row'><md-button class='md-icon-button' ng-click='prev()' aria-label='Previous month'><md-tooltip ng-if='::tooltips()'>Previous month</md-tooltip>&laquo;</md-button><div flex></div><h2 class='calendar-md-title'><span>{{ calendar.start | date:titleFormat:timezone }}</span></h2><div flex></div><md-button class='md-icon-button' ng-click='next()' aria-label='Next month'><md-tooltip ng-if='::tooltips()'>Next month</md-tooltip>&raquo;</md-button></div></md-toolbar><!-- agenda view --><md-content ng-if='weekLayout === columnWeekLayout' class='agenda'><div ng-repeat='week in calendar.weeks track by $index'><div ng-if='sameMonth(day)' ng-class='{&quot;disabled&quot; : isDisabled(day), active: active === day }' ng-click='handleDayClick(day)' ng-repeat='day in week' layout><md-tooltip ng-if='::tooltips()'>{{ day | date:dayTooltipFormat:timezone }}</md-tooltip><div>{{ day | date:dayFormat:timezone }}</div><div flex ng-bind-html='dataService.data[dayKey(day)]'></div></div></div></md-content><!-- calendar view --><md-content ng-if='weekLayout !== columnWeekLayout' flex layout='column' class='calendar'><div layout='row' class='subheader'><div layout-padding class='subheader-day' flex ng-repeat='day in calendar.weeks[0]'><md-tooltip ng-if='::tooltips()'>{{ day | date:dayLabelTooltipFormat }}</md-tooltip>{{ day | date:dayLabelFormat }}</div></div><div ng-if='week.length' ng-repeat='week in calendar.weeks track by $index' flex layout='row'><div tabindex='{{ sameMonth(day) ? (day | date:dayFormat:timezone) : 0 }}' ng-repeat='day in week track by $index' ng-click='handleDayClick(day)' flex layout layout-padding ng-class='{&quot;disabled&quot; : isDisabled(day), &quot;active&quot;: isActive(day), &quot;md-whiteframe-12dp&quot;: hover || focus }' ng-focus='focus = true;' ng-blur='focus = false;' ng-mouseleave='hover = false' ng-mouseenter='hover = true'><md-tooltip ng-if='::tooltips()'>{{ day | date:dayTooltipFormat }}</md-tooltip><div>{{ day | date:dayFormat }}</div><div flex ng-bind-html='dataService.data[dayKey(day)]'></div></div></div></md-content></md-content>";
129129

‎dist/angular-material-calendar.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular-material-calendar.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
angular.module("materialCalendar", ["ngMaterial", "ngSanitize"]);
22

3-
angular.module("materialCalendar").constant("config", {
3+
angular.module("materialCalendar").constant("materialCalendar.config", {
44
version: "0.2.13",
55
debug: document.domain.indexOf("localhost") > -1
66
});
77

8-
angular.module("materialCalendar").config(["config", "$logProvider", "$compileProvider", function (config, $logProvider, $compileProvider) {
8+
angular.module("materialCalendar").config(["materialCalendar.config", "$logProvider", "$compileProvider", function (config, $logProvider, $compileProvider) {
99
if (config.debug) {
1010
$logProvider.debugEnabled(false);
1111
$compileProvider.debugInfoEnabled(false);
1212
}
1313
}]);
1414

15-
angular.module("materialCalendar").service("Calendar", [function () {
15+
angular.module("materialCalendar").service("materialCalendar.Calendar", [function () {
1616

1717
function Calendar(year, month, options) {
1818

@@ -107,7 +107,7 @@ angular.module("materialCalendar").service("Calendar", [function () {
107107

108108
}]);
109109

110-
angular.module("materialCalendar").service("CalendarData", [function () {
110+
angular.module("materialCalendar").service("MaterialCalendarData", [function () {
111111
function CalendarData() {
112112

113113
this.data = {};
@@ -123,7 +123,7 @@ angular.module("materialCalendar").service("CalendarData", [function () {
123123
return new CalendarData();
124124
}]);
125125

126-
angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse", "$http", "$q", "Calendar", "CalendarData", function ($compile, $parse, $http, $q, Calendar, CalendarData) {
126+
angular.module("materialCalendar").directive("calendarMd", ["$compile", "$parse", "$http", "$q", "materialCalendar.Calendar", "MaterialCalendarData", function ($compile, $parse, $http, $q, Calendar, CalendarData) {
127127

128128
var defaultTemplate = "/* angular-material-calendar.html */";
129129

‎test/unit/calendarDataService.spec.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,47 @@
22
/* global inject, module */
33
describe("calendar service", function () {
44

5-
var CalendarData;
5+
var MaterialCalendarData;
66
var today = new Date();
77
var input = "test data";
88

99
beforeEach(module("materialCalendar"));
1010

11-
beforeEach(inject(function (_CalendarData_) {
12-
CalendarData = _CalendarData_;
11+
beforeEach(inject(function (_MaterialCalendarData_) {
12+
MaterialCalendarData = _MaterialCalendarData_;
1313
}));
1414

1515
it("should have all public methods defined", function () {
16-
expect(CalendarData).toBeDefined();
17-
expect(typeof CalendarData.data).toBe("object");
18-
expect(typeof CalendarData.getDayKey).toBe("function");
19-
expect(typeof CalendarData.setDayContent).toBe("function");
16+
expect(MaterialCalendarData).toBeDefined();
17+
expect(typeof MaterialCalendarData.data).toBe("object");
18+
expect(typeof MaterialCalendarData.getDayKey).toBe("function");
19+
expect(typeof MaterialCalendarData.setDayContent).toBe("function");
2020
});
2121

2222
it("should initalize to empty string when given undefined content for an unset date", function () {
23-
CalendarData.setDayContent(today, undefined);
24-
expect(CalendarData.data[CalendarData.getDayKey(today)]).toBe("");
23+
MaterialCalendarData.setDayContent(today, undefined);
24+
expect(MaterialCalendarData.data[MaterialCalendarData.getDayKey(today)]).toBe("");
2525
});
2626

2727
it("should initalize to empty string when given null content for a unset date", function () {
28-
CalendarData.setDayContent(today, null);
29-
expect(CalendarData.data[CalendarData.getDayKey(today)]).toBe("");
28+
MaterialCalendarData.setDayContent(today, null);
29+
expect(MaterialCalendarData.data[MaterialCalendarData.getDayKey(today)]).toBe("");
3030
});
3131

3232
it("should return the set value for a given date", function () {
33-
CalendarData.setDayContent(today, input);
34-
expect(CalendarData.data[CalendarData.getDayKey(today)]).toBe(input);
33+
MaterialCalendarData.setDayContent(today, input);
34+
expect(MaterialCalendarData.data[MaterialCalendarData.getDayKey(today)]).toBe(input);
3535
});
3636

3737
it("should not set a previously set value to undefined", function () {
38-
CalendarData.setDayContent(today, input);
39-
CalendarData.setDayContent(today, undefined);
40-
expect(CalendarData.data[CalendarData.getDayKey(today)]).toBe(input);
38+
MaterialCalendarData.setDayContent(today, input);
39+
MaterialCalendarData.setDayContent(today, undefined);
40+
expect(MaterialCalendarData.data[MaterialCalendarData.getDayKey(today)]).toBe(input);
4141
});
4242

4343
it("should not set a previously set value to null", function () {
44-
CalendarData.setDayContent(today, input);
45-
CalendarData.setDayContent(today, null);
46-
expect(CalendarData.data[CalendarData.getDayKey(today)]).toBe(input);
44+
MaterialCalendarData.setDayContent(today, input);
45+
MaterialCalendarData.setDayContent(today, null);
46+
expect(MaterialCalendarData.data[MaterialCalendarData.getDayKey(today)]).toBe(input);
4747
});
48-
});
48+
});

‎test/unit/calendarService.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ describe("calendar service", function() {
1111

1212
beforeEach(module("materialCalendar"));
1313

14-
beforeEach(inject(function(_Calendar_){
14+
beforeEach(inject(["materialCalendar.Calendar", function(_Calendar_){
1515
Calendar = new _Calendar_();
16-
}));
16+
}]));
1717

1818
it("should have all public methods defined", function() {
1919
expect(Calendar).toBeDefined();

‎website/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ <h5 class="mdl-typeography--headline">First Day Of Week</h5>
131131
</md-input-container>
132132
</section>
133133
<section>
134-
<h5>Updating calendar data using the CalendarData service</h5>
134+
<h5>Updating calendar data using the MaterialCalendarData service</h5>
135135
<p>
136136
To support scenarios where you wish to update the content of a
137-
given day without re-loading the containing scope a CalendarData
138-
service has been added. Just inject CalendarData and use the
137+
given day without re-loading the containing scope a MaterialCalendarData
138+
service has been added. Just inject MaterialCalendarData and use the
139139
<code>setDayContent(date,content)</code> function
140140
</p>
141141
<p>

0 commit comments

Comments
 (0)