Merge branch 'master' into develop

ushahidi · Oct 3, 2017 · 7b371b1 · 7b371b1
2 parents 5544984 + 6b82100
commit 7b371b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/app/main/posts/views/post-view-map.directive.js b/app/main/posts/views/post-view-map.directive.js
@@ -19,15 +19,15 @@ function PostViewMap(PostEndpoint, Maps, _, PostFilters, L, $q, $rootScope, $com
         var limit = 200;
         var requestBlockSize = 5;
         var numberOfChunks = 0;
-        $scope.getUIClass = getUIClass;
+        $scope.getUIClass = $location.path() === '/map/noui' ? 'map-only' : 'full-size';
 
         activate();
 
         function activate() {
             // Start loading data
             var posts = loadPosts();
-            var createMap = Maps.createMap(element[0].querySelector('#map'))
-            .then(function (data) {
+            var createMapDirective =  Maps.createMap(element[0].querySelector('#map'));
+            var createMap = createMapDirective.then(function (data) {
                 map = data;
             });
 
@@ -57,9 +57,6 @@ function PostViewMap(PostEndpoint, Maps, _, PostFilters, L, $q, $rootScope, $com
                 markers = undefined;
             }
         }
-        function getUIClass() {
-            return $location.path() === '/map/noui' ? 'map-only' : 'full-size';
-        }
 
         function addPostsToMap(posts) {
 

diff --git a/app/main/posts/views/post-view-map.html b/app/main/posts/views/post-view-map.html
@@ -1,3 +1,3 @@
 <div class="map-view">
-    <div id="map" class="map" ng-class="getUIClass()" ></div>
-</div>
+    <div id="map" class="map {{getUIClass}}" ></div>
+</div>