diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 8 | ||||
| -rw-r--r-- | www/templates/montage-history.html | 33 |
2 files changed, 19 insertions, 22 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 1cfbb9a9..da5a6d68 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -86,14 +86,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc //window.stop(); // force it here - connkey changes - FIXME: investigate why - ZMDataModel.zmLog ("Nullifying the streams..."); + ZMDataModel.zmLog ("footerCollapse: Nullifying the streams..."); for (i=0; i< $scope.MontageMonitors.length; i++) { var element = document.getElementById("img-"+i); if (element) { - ZMDataModel.zmDebug("Nullifying " + element.src); + ZMDataModel.zmDebug("footerCollapse: Nullifying " + element.src); element.src=""; } @@ -1382,14 +1382,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc /*ZMDataModel.zmLog ("Forcing a window.stop() here"); window.stop();*/ - ZMDataModel.zmLog ("Nullifying the streams..."); + ZMDataModel.zmLog ("BeforeLeave: Nullifying the streams..."); for (i=0; i< $scope.MontageMonitors.length; i++) { var element = document.getElementById("img-"+i); if (element) { - ZMDataModel.zmDebug("Nullifying " + element.src); + ZMDataModel.zmDebug("BeforeLeave: Nullifying " + element.src); element.src=""; } diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index e51d7d77..89b5bc81 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -25,16 +25,13 @@ - <div class="timeline_text" ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value" ng-change="dateChanged()"> + <div class="timeline_text" ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value" ng-change="dateChanged()"> <b>From: </b>{{datetimeValueFrom.value | date: "yyyy-MMM-dd hh:mma"}} </div> - + <div class="timeline_text" ion-datetime-picker am-pm ng-model="datetimeValueTo.value" ng-change="dateChanged()"> - <b>To: </b>{{datetimeValueTo.value | date: "yyyy-MMM-dd hh:mma"}} - </div> - - <div class="timeline_text"> - @ {{sliderVal.rate}}x <div ng-if="$root.platformOS != 'ios'">(max of 6 monitors - chrome limit)</div> + <b>To: </b>{{datetimeValueTo.value | date: "yyyy-MMM-dd hh:mma"}} @ {{sliderVal.rate}}x + <div ng-if="$root.platformOS != 'ios'">(max of 6 monitors - chrome limit)</div> </div> @@ -158,8 +155,8 @@ <ion-toggle ng-model="sliderVal.hideNoEvents" ng-checked="{{sliderVal.hideNoEvents}}" toggle-class="toggle-dark"><span class="item-text-wrap">Hide monitors without events</span></ion-toggle> - - + + <!--<div class="item item-divider" ion-datetime-picker ng-model="datetimeValueFrom.value"> Tap to change: {{datetimeValueFrom.value| date: "yyyy-MMM-dd hh:mma"}} @@ -181,19 +178,19 @@ speed </div> </div> - + <div class="item item-divider">Timeline</div> - + <ion-item> - <div ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value" > - <b>From: </b>{{datetimeValueFrom.value | date: "MMM-dd-yyyy hh:mma"}} - </div> + <div ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value"> + <b>From: </b>{{datetimeValueFrom.value | date: "MMM-dd-yyyy hh:mma"}} + </div> </ion-item> - + <ion-item> - <div ion-datetime-picker am-pm ng-model="datetimeValueTo.value" > - <b>To: </b>{{datetimeValueTo.value | date: "MMM-dd-yyyy hh:mma"}} - </div> + <div ion-datetime-picker am-pm ng-model="datetimeValueTo.value"> + <b>To: </b>{{datetimeValueTo.value | date: "MMM-dd-yyyy hh:mma"}} + </div> </ion-item> </div> |