Merge pull request #4 from shankari/strip_down

Stripping out some more modules
covid19database · Mar 30, 2020 · b88c729 · b88c729
2 parents db32b25 + 2c4a93e
commit b88c729
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 401 deletions.
diff --git a/www/index.html b/www/index.html
@@ -63,8 +63,6 @@
     <!-- your app's js -->
     <script src="js/app.js"></script>
     <script src="js/stats/clientstats.js"></script>
-    <script src="js/splash/referral.js"></script>
-    <script src="js/splash/customURL.js"></script>
     <script src="js/splash/startprefs.js"></script>
     <script src="js/splash/localnotify.js"></script>
     <script src="js/controllers.js"></script>

diff --git a/www/js/app.js b/www/js/app.js
@@ -9,13 +9,11 @@
 
 angular.module('emission', ['ionic',
     'emission.controllers','emission.services', 'emission.plugin.logger',
-    'emission.splash.customURLScheme', 'emission.splash.referral',
     'emission.services.email',
   'emission.intro', 'emission.main',
   'pascalprecht.translate'])
 
-.run(function($ionicPlatform, $rootScope, $http, Logger,
-    CustomURLScheme, ReferralHandler) {
+.run(function($ionicPlatform, $rootScope, $http, Logger) {
   console.log("Starting run");
   // alert("Starting run");
   $ionicPlatform.ready(function() {

diff --git a/www/js/splash/customURL.js b/www/js/splash/customURL.js
diff --git a/www/js/splash/referral.js b/www/js/splash/referral.js
diff --git a/www/js/splash/startprefs.js b/www/js/splash/startprefs.js
@@ -1,9 +1,8 @@
 angular.module('emission.splash.startprefs', ['emission.plugin.logger',
-                                              'emission.splash.referral',
                                               'emission.plugin.kvstore'])
 
 .factory('StartPrefs', function($window, $state, $interval, $rootScope, $ionicPlatform,
-      $ionicPopup, KVStore, storage, $http, Logger, ReferralHandler) {
+      $ionicPopup, KVStore, storage, $http, Logger) {
     var logger = Logger;
     var nTimesCalled = 0;
     var startprefs = {};
@@ -164,7 +163,6 @@ angular.module('emission.splash.startprefs', ['emission.plugin.logger',
     startprefs.getNextState = function() {
       return startprefs.getPendingOnboardingState().then(function(result){
         if (result == null) {
-          var temp = ReferralHandler.getReferralNavigation();
           if ($rootScope.tripConfirmParams) {
             logger.log("Showing tripconfirm from startprefs");
             var startEndParams = $rootScope.tripConfirmParams;
@@ -186,16 +184,8 @@ angular.module('emission.splash.startprefs', ['emission.plugin.logger',
     var changeState = function(destState) {
         logger.log('changing state to '+destState);
         console.log("loading "+destState);
-        // TODO: Fix this the right way when we fix the FSM
-        // https://github.com/e-mission/e-mission-phone/issues/146#issuecomment-251061736
-        var reload = false;
-        if (($state.$current == destState.state) && ($state.$current.name == 'root.main.goals')) {
-          reload = true;
-        }
         $state.go(destState.state, destState.params).then(function() {
-            if (reload) {
-              $rootScope.$broadcast("RELOAD_GOAL_PAGE_FOR_REFERRAL")
-            }
+            logger.log("state change to "+destState+" was successful");
         });
     };