adjusting layout-class-directive to set correct layout in embeds no m…

…atter current url #2454 (#986)
ushahidi · Feb 12, 2018 · 3d000b7 · 3d000b7
1 parent d379643
commit 3d000b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/app/common/directives/layout-class.directive.js b/app/common/directives/layout-class.directive.js
@@ -14,13 +14,8 @@ function LayoutClassDirective() {
 LayoutClassController.$inject = ['$scope', '$rootScope', '$window', 'Util'];
 function LayoutClassController($scope, $rootScope, $window, Util) {
     var isEmbed = ($window.self !== $window.top) ? true : false;
-    // In the case of map we omit the layout-a class
-    var isMap = (Util.currentUrl()) ? Util.currentUrl().indexOf('map') > 0 : false;
-
     if (!isEmbed) {
         $rootScope.setLayout('layout-' + $scope.layout);
-    } else if (isEmbed && isMap) {
-        $rootScope.setLayout('layout-embed');
     } else {
         // If we are in embed mode
         // we must append the layout to the embed layout

diff --git a/app/main/posts/detail/post-detail-data.directive.js b/app/main/posts/detail/post-detail-data.directive.js
@@ -61,10 +61,10 @@ function PostDetailDataController(
     $scope.$watch('post', function (post) {
         activate();
     });
-    /* need to check for embed here to set the correct class
-    * if coming from map to detail-view in embed, TODO: should go to a service! */
-    var isEmbed = ($window.self !== $window.top) ? true : false;
-    isEmbed ? $rootScope.setLayout('layout-d layout-embed') : $rootScope.setLayout('layout-d');
+    // /* need to check for embed here to set the correct class
+    // * if coming from map to detail-view in embed, TODO: should go to a service! */
+    // var isEmbed = ($window.self !== $window.top) ? true : false;
+    // isEmbed ? $rootScope.setLayout('layout-d layout-embed') : $rootScope.setLayout('layout-d');
 
     $scope.post = $scope.post;
     $scope.post_task = {};

diff --git a/app/main/posts/detail/post-detail-data.html b/app/main/posts/detail/post-detail-data.html
@@ -1,4 +1,5 @@
 <div>
+  <layout-class layout="d"></layout-class>
   <article class="postcard" role="article">
     <button class="button-beta button-flat postcard-close" ng-click="close()">
         <svg class="iconic">