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

Commit 6e0c509

Browse files
committed
fix(calendar): getting parent config object
Signed-off-by: Josh Kurz <jkurz25@gmail.com>
1 parent c21ef93 commit 6e0c509

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

demo/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ <h4>{{alertMessage}}</h4>
136136
<button class="btn btn-success" ng-click="changeView('month', 'myCalendar1')">Month</button>
137137
</div>
138138
</div>
139-
<div class="calendar" ng-model="eventSources" calendar="myCalendar1" ui-calendar="{{uiConfig.calendar}}"></div>
139+
<div class="calendar" ng-model="eventSources" calendar="myCalendar1" ui-calendar="uiConfig.calendar"></div>
140140
</tab>
141141
<tab select="renderCalender('myCalendar2');">
142142
<tab-heading>
@@ -153,7 +153,7 @@ <h4>{{alertMessage}}</h4>
153153
<button class="btn btn-success" ng-click="changeView('month', 'myCalendar2')">Month</button>
154154
</div>
155155
</div>
156-
<div class="calendar" ng-model="eventSources" calendar="myCalendar2" ui-calendar="{{uiConfig.calendar}}"></div>
156+
<div class="calendar" ng-model="eventSources" calendar="myCalendar2" ui-calendar="uiConfig.calendar"></div>
157157
</tab>
158158
<tab select="renderCalender('myCalendar3');">
159159
<tab-heading>
@@ -170,7 +170,7 @@ <h4>This calendar uses the extended form</h4>
170170
<button class="btn btn-success" ng-click="changeView('month', 'myCalendar3')">Month</button>
171171
</div>
172172
</div>
173-
<div class="calendar" ng-model="eventSources2" calendar="myCalendar3" ui-calendar="{{uiConfig.calendar}}"></div>
173+
<div class="calendar" ng-model="eventSources2" calendar="myCalendar3" ui-calendar="uiConfig.calendar"></div>
174174
</tab>
175175
</tabset>
176176
</div>

src/calendar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ angular.module('ui.calendar', [])
226226
options = null;
227227

228228
function getOptions(){
229-
var calendarSettings = attrs.uiCalendar ? scope.$eval(attrs.uiCalendar) : {},
229+
var calendarSettings = attrs.uiCalendar ? scope.$parent.$eval(attrs.uiCalendar) : {},
230230
fullCalendarConfig;
231231

232232
fullCalendarConfig = controller.getFullCalendarConfig(calendarSettings, uiCalendarConfig);

0 commit comments

Comments
 (0)