diff --git a/www/plugins/map/js/controllers/wot-controllers.js b/www/plugins/map/js/controllers/wot-controllers.js index 99de21daa3a68523669506f8272d0f06c1d527ca..8128c72fca3adf4cec6588e5f42951b3a0cf1149 100644 --- a/www/plugins/map/js/controllers/wot-controllers.js +++ b/www/plugins/map/js/controllers/wot-controllers.js @@ -82,6 +82,7 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti }; $scope.loading = true; + $scope.loadingMarker = true; $scope.mapId = 'map-wot-' + $scope.$id; $scope.map = MapUtils.map({ @@ -130,8 +131,6 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti if ($scope.loading) { - // $translate.get('') - //$ionicBackdrop.retain(); UIUtils.loading.show({ noBackdrop: true // avoid a too long release }); @@ -308,8 +307,9 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti // add bounding box if ($scope.map.bounds) { - options.bounds = angular.copy($scope.map.bounds); - delete options.bounds.options; + // FIXME - this is not working well + //options.bounds = angular.copy($scope.map.bounds); + //delete options.bounds.options; } // Load wot data, from service @@ -338,7 +338,7 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti lat: hit.geoPoint.lat, lng: hit.geoPoint.lon, getMessageScope: function () { - $scope.loading = true; + $scope.loadingMarker = true; $scope.$applyAsync(function() { $scope.formData = { pubkey: hit.pubkey, @@ -346,7 +346,7 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti name: hit.name, profile: hit }; - $scope.loading = false; + $scope.loadingMarker = false; }); return $scope; }, diff --git a/www/plugins/map/templates/wot/popup_marker.html b/www/plugins/map/templates/wot/popup_marker.html index 84322f5c700140fc74f475804c75bcbfca9a48f7..633503f07bc9d95856f124fe591b13a70bc7dfb0 100644 --- a/www/plugins/map/templates/wot/popup_marker.html +++ b/www/plugins/map/templates/wot/popup_marker.html @@ -1,6 +1,6 @@ <div class="item no-border no-padding item-avatar " - ng-if="loading"> + ng-if="loadingMarker"> <i class="item-image icon ion-person"></i> @@ -18,7 +18,7 @@ </div> <a class="item no-border no-padding item-avatar ink animate-fade-in animate-show-hide ng-hide" - ng-show="!loading" + ng-show="!loadingMarker" ui-sref="app.wot_identity({pubkey: formData.pubkey, uid: formData.uid})"> <i ng-if="formData.avatar" class="item-image avatar" style="background-image: url({{::formData.avatar.src}})"></i> @@ -52,7 +52,7 @@ ng-class="{'ion-arrow-down-b': !showDescription, 'ion-arrow-up-b': showDescription}" ng-click="showDescription=!showDescription;" title="{{'PROFILE.DESCRIPTION'|translate}}" - ng-show="!loading && formData.profile.description"> + ng-show="!loadingMarker && formData.profile.description"> </a> </div>