diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-18 10:30:08 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-18 10:30:08 -0500 |
| commit | e98dcf8552d3fbb5b98afb1fd0e660154f491d78 (patch) | |
| tree | 123122655f955eec6bfdfb0cc8e3bb18fef6875c /www/templates | |
| parent | dbad85a9bc38f20b2af26510493648d0d294c5c1 (diff) | |
#89 - replace ng-if with ng-show - causes problems with devices as collection-repeat reuses cells so they need to be in the DOM
Former-commit-id: 309ea6ede5fc94fd8f9870fbb7e6a6187105b036
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-popover.html | 2 | ||||
| -rw-r--r-- | www/templates/events.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html index 43142ec0..88d9c189 100644 --- a/www/templates/events-popover.html +++ b/www/templates/events-popover.html @@ -11,7 +11,7 @@ </a> <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='1'">Show all events</a> - <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='0'">Only show alarmed events</a> + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='0'"> Show alarmed events</a> </div> </ion-content> </ion-popover-view> diff --git a/www/templates/events.html b/www/templates/events.html index 37161fa7..22846f22 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -37,7 +37,7 @@ <div ng-if="!eventsBeingLoaded"> <ion-list show-delete="eventList.showDelete"> - <ion-item repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" overflow-scroll="true" ng-if="event.Event.AlarmFrames >= minAlarmCount"> + <ion-item repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" overflow-scroll="true" ng-show="event.Event.AlarmFrames >= minAlarmCount"> <!--<span class="events-filter-on" ng-if="isEventFilterOn">Filter</span>--> |