Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Commit d28e3d6

Browse files
Павел БлохинПавел Блохин
authored andcommitted
Calendar: changed directive name, and names of all controllers associeted
1 parent 9dfc425 commit d28e3d6

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "cmps-angular-ui-calendar",
2+
"name": "cmps-ui-calendar",
33
"version": "0.0.1",
44
"main": "./src/calendar.js",
55
"ignore": [

src/calendar.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
angular.module('ui.calendar', [])
1212

13-
.constant('uiCalendarConfig', {
13+
.constant('cmpsUiCalendarConfig', {
1414
calendars : {}
1515
})
16-
.controller('uiCalendarCtrl', ['$scope', '$locale',
16+
.controller('cmpsUiCalendarCtrl', ['$scope', '$locale',
1717
function ($scope, $locale) {
1818

1919
var sources = $scope.eventSources;
@@ -187,10 +187,10 @@ angular.module('ui.calendar', [])
187187
return self;
188188
};
189189

190-
this.getFullCalendarConfig = function (calendarSettings, uiCalendarConfig) {
190+
this.getFullCalendarConfig = function (calendarSettings, cmpsUiCalendarConfig) {
191191
var config = {};
192192

193-
angular.extend(config, uiCalendarConfig);
193+
angular.extend(config, cmpsUiCalendarConfig);
194194
angular.extend(config, calendarSettings);
195195

196196
angular.forEach(config, function (value, key) {
@@ -229,16 +229,16 @@ angular.module('ui.calendar', [])
229229
};
230230
}
231231
])
232-
.directive('uiCalendar', ['uiCalendarConfig',
233-
function (uiCalendarConfig) {
232+
.directive('cmpscmpsUiCalendar', ['cmpsUiCalendarConfig',
233+
function (cmpsUiCalendarConfig) {
234234

235235
return {
236236
restrict : 'A',
237237
scope : {
238238
eventSources : '=ngModel',
239239
calendarWatchEvent : '&'
240240
},
241-
controller : 'uiCalendarCtrl',
241+
controller : 'cmpsUiCalendarCtrl',
242242
link : function (scope, elm, attrs, controller) {
243243
var sources = scope.eventSources;
244244
var sourcesChanged = false;
@@ -248,8 +248,8 @@ angular.module('ui.calendar', [])
248248
var options = null;
249249

250250
function getOptions () {
251-
var calendarSettings = attrs.uiCalendar ? scope.$parent.$eval(attrs.uiCalendar) : {};
252-
var fullCalendarConfig = controller.getFullCalendarConfig(calendarSettings, uiCalendarConfig);
251+
var calendarSettings = attrs.cmpsUiCalendar ? scope.$parent.$eval(attrs.cmpsUiCalendar) : {};
252+
var fullCalendarConfig = controller.getFullCalendarConfig(calendarSettings, cmpsUiCalendarConfig);
253253
var localeFullCalendarConfig = controller.getLocaleConfig(fullCalendarConfig);
254254
angular.extend(localeFullCalendarConfig, fullCalendarConfig);
255255
options = {
@@ -273,7 +273,7 @@ angular.module('ui.calendar', [])
273273
calendar.fullCalendar('destroy');
274274
}
275275
if (attrs.calendar) {
276-
calendar = uiCalendarConfig.calendars[attrs.calendar] = angular.element(elm).html('');
276+
calendar = cmpsUiCalendarConfig.calendars[attrs.calendar] = angular.element(elm).html('');
277277
} else {
278278
calendar = angular.element(elm).html('');
279279
}
@@ -285,7 +285,7 @@ angular.module('ui.calendar', [])
285285
}
286286
calendar.fullCalendar(options);
287287
if (attrs.calendar) {
288-
uiCalendarConfig.calendars[attrs.calendar] = calendar;
288+
cmpsUiCalendarConfig.calendars[attrs.calendar] = calendar;
289289
}
290290
};
291291

@@ -297,7 +297,7 @@ angular.module('ui.calendar', [])
297297
if (calendar && calendar.fullCalendar) {
298298
calendar.fullCalendar(options);
299299
if (attrs.calendar) {
300-
uiCalendarConfig.calendars[attrs.calendar] = calendar;
300+
cmpsUiCalendarConfig.calendars[attrs.calendar] = calendar;
301301
}
302302
calendar.fullCalendar('addEventSource', source);
303303
sourcesChanged = true;

0 commit comments

Comments
 (0)