diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 7 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 5 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 5 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 5 |
4 files changed, 16 insertions, 6 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index c59b314f..be97d773 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1375,7 +1375,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro // This function returns neighbor events if applicable - + function noop() { + + } function neighborEvents(eid, mid) { @@ -1444,7 +1446,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro d.reject(neighbors); return (d.promise); - }); + }) + .catch (noop); return (d.promise); diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 0b6b9985..e36d233d 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -64,6 +64,8 @@ angular.module('zmApp.controllers') return; } }; + + function noop() {} //----------------------------------------------------------------------- // This function takes care of changing monitor parameters // For now, I've only limited it to enable/disable and change monitor mode @@ -221,7 +223,8 @@ angular.module('zmApp.controllers') });*/ doRefresh(); } - }); + }) + .catch (noop); } }, diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 50061d0d..6b528ce8 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -261,6 +261,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc }); + function noop() {} + function getNextSetHistory() { // grab events that start on or after the time @@ -373,7 +375,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc } - ); + ) + .catch (noop); // At this stage, we have both a general events grab, and specific event grabs for MIDS that were empty diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 14f282b8..524f1dcc 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -1013,7 +1013,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla NVR.debug("Error getting incremental timeline data"); isProcessNewEventsWaiting = false; - }); + }) + .catch (noop); // check all events that started 10+10 seconds ago @@ -1022,7 +1023,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla function noop() { }; - + //------------------------------------------------- // This function draws the graph //------------------------------------------------- |