diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-31 16:24:58 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-31 16:24:58 -0400 |
| commit | c7373686044592f576bc638230ae0f2fcb0de062 (patch) | |
| tree | fe70d166eded698e07c37703fc01a1b7511282c0 /www/js/EventModalCtrl.js | |
| parent | fd323c81b66cf2099c991cf95bde9d9f4a9c8eb6 (diff) | |
#209 replaced vis with the new ChartJS 2.0 (beta) - allows for much better performance and drag/hover which is easier
Former-commit-id: 2dbca6b7378a6f8f21ff386969150bba7ace504e
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index d62199e9..be1f0abf 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -697,13 +697,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.$on('modal.removed', function () { $scope.isModalActive = false; - $timeout (function(){ZMDataModel.stopNetwork();},300); + //console.log("**MODAL REMOVED: Stopping modal timer"); $interval.cancel(eventQueryHandle); //$timeout.cancel(eventQueryHandle); ZMDataModel.zmDebug ("Modal removed - killing connkey"); sendCommand(17,$scope.connKey); - + $timeout (function(){ZMDataModel.stopNetwork();},400); // Execute action }); |