Revert "cherry-pick 1be1379 from 0.2.17"

This reverts commit 94fa6db.

Author: christopherthielen

src/ng1/viewDirective.ts

@@ -177,7 +177,7 @@ function $ViewDirective(   $view,   $animate,   $uiViewScroll,   $interpolate,
         trace.traceUiViewEvent("Linking", viewData);
 
         function configUpdatedCallback(config?: ViewConfig) {
-          if (configsEqual(viewConfig, config) || scope._willBeDestroyed) return;
+          if (configsEqual(viewConfig, config)) return;
           trace.traceUiViewConfigUpdated(viewData, config && config.context);
 
           viewConfig = config;
@@ -195,42 +195,27 @@ function $ViewDirective(   $view,   $animate,   $uiViewScroll,   $interpolate,
         });
 
         function cleanupLastView() {
-          var _previousEl = previousEl;
-          var _currentScope = currentScope;
-
-          if (_currentScope) {
-            _currentScope._willBeDestroyed = true;
+          if (previousEl) {
+            trace.traceUiViewEvent("Removing    (previous) el", viewData);
+            previousEl.remove();
+            previousEl = null;
           }
 
-          function cleanOld() {
-            if (_previousEl) {
-              trace.traceUiViewEvent("Removing    (previous) el", viewData);
-              _previousEl.remove();
-              _previousEl = null;
-            }
-
-            if (_currentScope) {
-              trace.traceUiViewEvent("Destroying  (previous) scope", viewData);
-              _currentScope.$destroy();
-              _currentScope = null;
-            }
+          if (currentScope) {
+            trace.traceUiViewEvent("Destroying  (previous) scope", viewData);
+            currentScope.$destroy();
+            currentScope = null;
           }
 
           if (currentEl) {
             trace.traceUiViewEvent("Animate out (previous)", viewData);
             renderer.leave(currentEl, function() {
-              cleanOld();
               previousEl = null;
             });
 
             previousEl = currentEl;
-          } else {
-            cleanOld();
-            previousEl = null;
+            currentEl = null;
           }
-
-          currentEl = null;
-          currentScope = null;
         }
 
         function updateView(config?: ViewConfig) {

test/viewDirectiveSpec.js

@@ -14,7 +14,7 @@ function animateFlush($animate) {
 describe('uiView', function () {
   'use strict';
 
-  var log, scope, $compile, elem;
+  var scope, $compile, elem;
 
   beforeEach(function() {
     var depends = ['ui.router'];
@@ -37,10 +37,6 @@ describe('uiView', function () {
     });
   }));
 
-  beforeEach(function() {
-    log = '';
-  });
-
   var aState = {
     template: 'aState template'
   },
@@ -112,9 +108,8 @@ describe('uiView', function () {
       }
     }
   },
-
-  oState = {
-    template: 'oState',
+  mState = {
+    template: 'mState',
     controller: function ($scope, $element) {
       $scope.elementId = $element.attr('id');
     }
@@ -134,22 +129,7 @@ describe('uiView', function () {
       .state('j', jState)
       .state('k', kState)
       .state('l', lState)
-      .state('m', {
-        template: 'mState',
-        controller: function($scope) {
-          log += 'm;';
-          $scope.$on('$destroy', function() {
-            log += '$destroy(m);';
-          });
-        },
-      })
-      .state('n', {
-        template: 'nState',
-        controller: function($scope) {
-          log += 'n;';
-        },
-      })
-      .state('o', oState)
+      .state('m', mState)
   }));
 
   beforeEach(inject(function ($rootScope, _$compile_) {
@@ -160,23 +140,6 @@ describe('uiView', function () {
 
   describe('linking ui-directive', function () {
 
-    it('$destroy event is triggered after animation ends', inject(function($state, $q, $animate) {
-      elem.append($compile('<div><ui-view></ui-view></div>')(scope));
-
-      $state.transitionTo('m');
-      $q.flush();
-      expect(log).toBe('m;');
-      $state.transitionTo('n');
-      $q.flush();
-      if ($animate) {
-        expect(log).toBe('m;n;');
-        animateFlush($animate);
-        expect(log).toBe('m;n;$destroy(m);');
-      } else {
-        expect(log).toBe('m;$destroy(m);n;');
-      }
-    }));
-
     it('anonymous ui-view should be replaced with the template of the current $state', inject(function ($state, $q) {
       elem.append($compile('<div><ui-view></ui-view></div>')(scope));
 
@@ -362,11 +325,11 @@ describe('uiView', function () {
   }));
 
   it('should instantiate a controller with both $scope and $element injections', inject(function ($state, $q) {
-    elem.append($compile('<div><ui-view id="oState">{{elementId}}</ui-view></div>')(scope));
-    $state.transitionTo(oState);
+    elem.append($compile('<div><ui-view id="mState">{{elementId}}</ui-view></div>')(scope));
+    $state.transitionTo(mState);
     $q.flush();
 
-    expect(elem.text()).toBe('oState');
+    expect(elem.text()).toBe('mState');
   }));
 
   describe('play nicely with other directives', function() {