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

Commit 2fedcd9

Browse files
committed
Fix custom names overriding
1 parent 359e1a9 commit 2fedcd9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/calendar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ angular.module('ui.calendar', [])
208208

209209
fullCalendarConfig = controller.getFullCalendarConfig(calendarSettings, uiCalendarConfig);
210210

211-
var localeConfig = controller.getLocaleConfig(fullCalendarConfig);
212-
angular.extend(fullCalendarConfig, localeConfig);
211+
var localeFullCalendarConfig = controller.getLocaleConfig(fullCalendarConfig);
212+
angular.extend(localeFullCalendarConfig, fullCalendarConfig);
213213

214214
options = { eventSources: sources };
215-
angular.extend(options, fullCalendarConfig);
215+
angular.extend(options, localeFullCalendarConfig);
216216

217217
var options2 = {};
218218
for(var o in options){

0 commit comments

Comments
 (0)