diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-06-01 16:44:35 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-06-01 16:44:35 -0400 |
| commit | b2732e73c3bf40896023872f985f13f49ec83c7b (patch) | |
| tree | f86d41882dc3caf270a5f17f14007853451a1aaa /www/js | |
| parent | d11b8c040a45bcf13d7764a07f764146a82a698c (diff) | |
various updates, hide cast, add loader icons to thumbnails
Former-commit-id: 0e6de5d09b64c79a9488def8775ca61d7027da96
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 14864648..512ae20c 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -337,7 +337,7 @@ angular.module('zmApp.controllers') { if (urls.length > 0 && $rootScope.userCancelledAuth != true) { - $ionicLoading.show({template: $translate.instant('kTrying') + urls[0].server}); + $ionicLoading.show({template: $translate.instant('kTrying') + ' ' +urls[0].server}); zmLog ("Reachability test.." + urls[0].url); return $http.get(urls[0].url).then(function () { zmLog ("Success: reachability on "+ urls[0].url); diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index ebdc5326..ef9b9509 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -198,7 +198,13 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ console.log ("PASSED WITH " + JSON.stringify(mon)); //ConnectSDK.discoveryManager.startDiscovery(); + + console.log ("Stopping"); + ConnectSDK.discoveryManager.stopDiscovery(); + + console.log ("Starting"); ConnectSDK.discoveryManager.startDiscovery(); + console.log ("picking"); ConnectSDK.discoveryManager.pickDevice() .success(function (device) { //device.disconnect(); |