Merge pull request #381 from CodeNow/remove-safeapply

remove safeApply

Author: Nathan219

client/controllers/abstractLayouts/controllerInstanceLayout.js

@@ -10,6 +10,7 @@ function ControllerInstanceLayout(
   $stateParams,
   errs,
   $rootScope,
+  $timeout,
   keypather,
   async,
   $scope
@@ -36,7 +37,8 @@ function ControllerInstanceLayout(
       function (cb) {
         $rootScope.dataApp.state.loadingInstances = true;
         $rootScope.dataApp.data.instances = null;
-        $rootScope.safeApply(cb);
+        // Using $timeout to trigger digest
+        $timeout(cb);
       },
       function (cb) {
         fetchInstances(username, true, cb);
@@ -45,7 +47,7 @@ function ControllerInstanceLayout(
         if (username === keypather.get($rootScope, 'dataApp.data.activeAccount.oauthName()')) {
           $rootScope.dataApp.data.instances = instances;
           $rootScope.dataApp.state.loadingInstances = false;
-          $rootScope.safeApply(cb);
+          $timeout(cb);
         } else {
           cb();
         }

client/controllers/controllerApp.js

@@ -50,7 +50,6 @@ function ControllerApp(
             dataApp.data.activeAccount = thisUser;
           }
           $rootScope.$broadcast('INSTANCE_LIST_FETCH', dataApp.data.activeAccount.oauthName());
-          $rootScope.safeApply();
         }
       });
     }
@@ -115,7 +114,6 @@ function ControllerApp(
           $window.olark('api.visitor.updateFullName', { fullName: thisUser.oauthName() });
           $window.olark('api.box.show');
         }
-        $rootScope.safeApply();
       });
     } else {
       return errs.handler(err);

client/controllers/home/controllerHome.js

@@ -49,7 +49,6 @@ function ControllerHome(
         fetchUser(function (err, user) {
           if (err) { return cb(err); }
           $scope.user = user;
-          $scope.safeApply();
           cb();
         });
       },

client/controllers/instance/controllerInstance.js

@@ -119,7 +119,6 @@ function ControllerInstance(
               $stateParams.instanceName
             );
             data.instance.state = {};
-            $scope.safeApply();
             cb();
           }
         })

client/controllers/instanceEdit/controllerInstanceEdit.js

@@ -43,7 +43,6 @@ function ControllerInstanceEdit(
         var instance = instances.models[0];
         data.instance = instance;
         data.instance.state = {};
-        $scope.safeApply();
         cb();
       })
       .resolve(function (err, instances, cb) {
@@ -54,7 +53,6 @@ function ControllerInstanceEdit(
         var instance = instances.models[0];
         data.instance = instance;
         data.instance.state = {};
-        $scope.safeApply();
         cb();
       })
       .go();
@@ -70,12 +68,10 @@ function ControllerInstanceEdit(
           return cb(null, true);
         }
         $scope.build = build;
-        $scope.safeApply();
         cb();
       })
       .resolve(function (err, build, cb) {
         if (err) { throw err; }
-        $scope.safeApply();
         cb();
       })
       .go();
@@ -94,13 +90,11 @@ function ControllerInstanceEdit(
           throw new Error('instance not found');
         }
         data.instances = instances;
-        $scope.safeApply();
         cb();
       })
       .resolve(function (err, instances, cb) {
         if (err) { return $log.error(err); }
         data.instances = instances;
-        $scope.safeApply();
         cb();
       })
       .go();
@@ -125,7 +119,6 @@ function ControllerInstanceEdit(
     function (cb) {
       fetchUser(function (err, user) {
         $scope.user = user;
-        $scope.safeApply();
         cb();
       });
     },

client/controllers/setup/controllerNew.js

@@ -27,7 +27,6 @@ function ControllerNew(
       return cb();
     }
     var orgs = thisUser.fetchGithubOrgs(function (err) {
-      $scope.safeApply();
       cb(err);
       var currentOrg = orgs.find(hasKeypaths({
         'attrs.login.toLowerCase()': currentUserOrOrgName.toLowerCase()
@@ -73,7 +72,6 @@ function ControllerNew(
       fetchUser(function (err, user) {
         if (err) { return cb(err); }
         $scope.user = user;
-        $scope.safeApply();
         cb();
       });
     },

client/controllers/setup/controllerSetup.js

@@ -66,7 +66,6 @@ function ControllerSetup(
           cb(new Error('build already built'));
         } else {
           data.build = build;
-          $scope.safeApply();
           cb();
         }
       })
@@ -86,7 +85,6 @@ function ControllerSetup(
       fetchUser(function(err, user) {
         if (err) { return cb(err); }
         data.user = user;
-        $scope.safeApply();
         cb();
       });
     },

client/directives/accountsSelect/directiveAccountsSelect.js

@@ -34,7 +34,6 @@ function accountsSelect (
         //
         $scope.data.activeAccount = userOrOrg;
         $scope.data.instances = null;
-        $rootScope.safeApply();
         $scope.$emit('INSTANCE_LIST_FETCH', username);
         $state.go('^.home', {
           userName: username

client/directives/activePanel/directiveActivePanel.js

@@ -96,7 +96,6 @@ function activePanel(
             throw err;
           }
           delete activeFile.state.isDirty;
-          $rootScope.safeApply();
         });
       }
       var updateFileDebounce = debounce(updateFile, 333);
@@ -107,7 +106,6 @@ function activePanel(
         if (openItems.isFile(last)) {
           last.fetch(function () {
             last.state.reset();
-            $rootScope.safeApply();
           });
         }
       }

client/directives/addRepoPopover/directiveAddRepoPopover.js

@@ -96,7 +96,6 @@ function addRepoPopover(
           // acv
           cv.appCodeVersions.create(body, function (err) {
             if (err) { throw err; }
-            $rootScope.safeApply();
           });
         }
       };
@@ -109,7 +108,6 @@ function addRepoPopover(
         keypather.set(githubRepo, 'state.selectedBranch', activeBranch);
         // reset branch state
         activeBranch.state = {};
-        $rootScope.safeApply();
         return activeBranch;
       }
 
@@ -127,14 +125,12 @@ function addRepoPopover(
             var instance = instances.models[0];
             $scope.repoListPopover.data.instance = instance;
             $scope.repoListPopover.data.build = instance.build;
-            $rootScope.safeApply();
           })
           .resolve(function (err, instances, cb) {
             var instance = instances.models[0];
             if (!keypather.get(instance, 'containers.models') || !instance.containers.models.length) {
               return cb(new Error('instance has no containers'));
             }
-            $rootScope.safeApply();
             cb(err);
           })
           .go();
@@ -149,12 +145,10 @@ function addRepoPopover(
           .query($stateParams.buildId)
           .cacheFetch(function (build, cached, cb) {
             $scope.repoListPopover.data.build = build;
-            $rootScope.safeApply();
             cb();
           })
           .resolve(function (err, build, cb) {
             if (err) { throw err; }
-            $rootScope.safeApply();
             cb();
           })
           .go();
@@ -210,7 +204,6 @@ function addRepoPopover(
                   noStore: true
                 });
               }
-              $rootScope.safeApply();
               // recursive until result set returns fewer than
               // 100 repos, indicating last paginated result
               if (githubRepos.models.length < 100) {
@@ -230,7 +223,6 @@ function addRepoPopover(
             if (err) { return cb(err); }
             $scope.user = user;
             $scope.repoListPopover.data.user = user;
-            $rootScope.safeApply();
             cb();
           });
         },