Merge pull request #1072 from appirio-tech/dev

Listings fixes
appirio-tech · Mar 6, 2017 · c4c1a74 · c4c1a74
2 parents 684c42f + 7b7bd0a
commit c4c1a74
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js
@@ -11,7 +11,7 @@ import { loadUser } from '../services/userv3.service.js'
     'TcAuthService', 'UserService', 'UserStatsService', 'ProfileService', 'ChallengeService', 'ExternalAccountService',
     'ngDialog', '$anchorScroll'
   ]
-  
+
   function ListingsCtrl($location, $scope, CONSTANTS, logger, $q, TcAuthService,
   UserService, UserStatsService,ProfileService, ChallengeService, ExternalAccountService, ngDialog, $anchorScroll) {
     var vm = this
@@ -32,8 +32,8 @@ import { loadUser } from '../services/userv3.service.js'
         s.async = true
         s.src = '//api.usersnap.com/load/'+
                 '3e7c8f0c-6cf6-41b6-9f2c-e8e4e60dfc59.js'
-        var x = document.getElementsByTagName('script')[0]
-        x.parentNode.insertBefore(s, x)
+        var x = document.getElementById('react-component')
+        x.appendChild(s, x)
       })()
 
       $scope.myChallenges = []

diff --git a/app/listings/listings.jade b/app/listings/listings.jade
@@ -1 +1 @@
-react-component.listings(name="ChallengeFiltersExample" props="reactProps" watch-depth="reference")
+react-component.listings(name="ChallengeFiltersExample" props="reactProps" watch-depth="reference" id="react-component")
diff --git a/app/listings/listings.routes.js b/app/listings/listings.routes.js
@@ -14,6 +14,13 @@ import angular from 'angular'
 //        $state.go('404')
 //      }
     })
+    $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams, error) {
+      if (toState.name !== 'listings') {
+        // remove usersnap widget if not in listings page
+        var usersnapWidget = document.querySelectorAll('div[id*="_report_button"]')
+        if (usersnapWidget && usersnapWidget[0]) usersnapWidget[0].remove()
+      }
+    })
   }])
 
   function routes($stateProvider) {