wbrawner/tasks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use getter for calendar properties

Browse source
This commit is contained in:
Raimund Schlüßler 2016-02-28 17:13:02 +01:00
parent f2aa79e1a0
commit 04030b5233
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/public/app.js
View file

@ -2772,6 +2772,9 @@ angular.module('Tasks').factory('Calendar', ['$rootScope', '$filter', function($
get enabled() {
return this._properties.enabled;
},
get uri() {
return this._properties.uri;
},
get components() {
return this._properties.components;
},

18
templates/main.php
View file

@ -22,30 +22,30 @@
</div>
</li>
<li class="list with-menu handler"
id="list_{{ calendar._properties.uri }}"
calendarID="{{calendar._properties.uri}}"
id="list_{{ calendar.uri }}"
calendarID="{{calendar.uri}}"
ng-repeat="calendar in calendars"
ng-class="{active: calendar._properties.uri==route.calendarID, edit:route.listparameter == 'name' && route.calendarID == calendar._properties.uri}"
ng-class="{active: calendar.uri==route.calendarID, edit:route.listparameter == 'name' && route.calendarID == calendar.uri}"
dnd-list="draggedTasks"
dnd-drop="dropList(event, item, index)"
dnd-dragover="dragoverList(event, item, index)">
<a href="#/calendars/{{ calendar._properties.uri }}" style="border-right: 4px solid {{ calendar._properties.calendarcolor }};" ng-dblclick="editName(calendar._properties.uri)">
<a href="#/calendars/{{ calendar.uri }}" style="border-right: 4px solid {{ calendar.color }};" ng-dblclick="editName(calendar.uri)">
<span class="icon list-list"></span>
<span class="title">{{ calendar._properties.displayname }}</span>
<span class="title">{{ calendar.displayname }}</span>
</a>
<div class="app-navigation-entry-utils">
<ul>
<li class="app-navigation-entry-utils-counter">{{ getListCount(calendar._properties.uri,'all') | counterFormatter }}</li>
<li class="app-navigation-entry-utils-counter">{{ getListCount(calendar.uri,'all') | counterFormatter }}</li>
<li class="app-navigation-entry-utils-menu-button svg"><button></button></li>
</ul>
</div>
<div class="app-navigation-entry-menu">
<ul>
<li title="<?php p($l->t('rename')); ?>" ng-click="editName(calendar._properties.uri)" >
<li title="<?php p($l->t('rename')); ?>" ng-click="editName(calendar.uri)" >
<img class="icon-rename svg" src="<?php p(image_path('core', 'actions/rename.svg'))?>"/>
<span><?php p($l->t('rename')); ?></span>
</li>
<li title="<?php p($l->t('delete')); ?>" ng-click="deleteList(calendar)" ng-show="showDelete(calendar._properties.uri)" >
<li title="<?php p($l->t('delete')); ?>" ng-click="deleteList(calendar)" ng-show="showDelete(calendar.uri)" >
<img class="icon-delete svg" src="<?php p(image_path('core', 'actions/delete.svg'))?>"/>
<span><?php p($l->t('delete')); ?></span>
</li>
@ -53,7 +53,7 @@
</div>
<div class="app-navigation-entry-edit">
<form>
<input ng-model="calendar._properties.displayname" class="edit" type="text" ng-keydown="checkName($event)" autofocus-on-insert>
<input ng-model="calendar.displayname" class="edit" type="text" ng-keydown="checkName($event)" autofocus-on-insert>
<input type="submit" value="" class="action icon-checkmark svg" ng-click="submitNewName()">
</form>
</div>