Initial refactor.

 - Return home early
 - Extract repeated animator branching logic into internal service

Author: nateabele

src/viewDirective.js

@@ -1,9 +1,11 @@
 
 $ViewDirective.$inject = ['$state', '$compile', '$controller', '$injector', '$anchorScroll'];
 function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $anchorScroll) {
-  // Unfortunately there is no neat way to ask $injector if a service exists
+  // TODO: Change to $injector.has() when we version bump to Angular 1.1.5.
+  // See: https://github.com/angular/angular.js/blob/master/CHANGELOG.md#115-triangle-squarification-2013-05-22
   var $animator; try { $animator = $injector.get('$animator'); } catch (e) { /* do nothing */ }
 
+
   var directive = {
     restrict: 'ECA',
     terminal: true,
@@ -15,6 +17,28 @@ function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $an
             onloadExp = attr.onload || '',
             animate = isDefined($animator) && $animator(scope, attr);
 
+        var renderer = function(doAnimate) {
+          return ({
+            "true": {
+              remove: function(element) { animate.leave(element.contents(), element); },
+              restore: function(compiled, element) { animate.enter(compiled, element); },
+              populate: function(template, element) {
+                var contents = angular.element('<div></div>').html(template).contents();
+                animate.enter(contents, element);
+                return contents;
+              }
+            },
+            "false": {
+              remove: function(element) { element.html(''); },
+              restore: function(compiled, element) { element.append(compiled); },
+              populate: function(template, element) {
+                element.html(template);
+                return element.contents();
+              }
+            }
+          })[doAnimate.toString()];
+        };
+
         // Put back the compiled initial view
         element.append(transclude(scope));
 
@@ -32,59 +56,44 @@ function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $an
         function updateView(doAnimate) {
           var locals = $state.$current && $state.$current.locals[name];
           if (locals === viewLocals) return; // nothing to do
+          var render = renderer(animate && doAnimate);
 
           // Remove existing content
-          if (animate && doAnimate) {
-            animate.leave(element.contents(), element);
-          } else {
-            element.html('');
-          }
+          render.remove(element);
 
           // Destroy previous view scope
           if (viewScope) {
             viewScope.$destroy();
             viewScope = null;
           }
 
-          if (locals) {
-            viewLocals = locals;
-            view.state = locals.$$state;
-
-            var contents;
-            if (animate && doAnimate) {
-              contents = angular.element('<div></div>').html(locals.$template).contents();
-              animate.enter(contents, element);
-            } else {
-              element.html(locals.$template);
-              contents = element.contents();
-            }
-
-            var link = $compile(contents);
-            viewScope = scope.$new();
-            if (locals.$$controller) {
-              locals.$scope = viewScope;
-              var controller = $controller(locals.$$controller, locals);
-              element.children().data('$ngControllerController', controller);
-            }
-            link(viewScope);
-            viewScope.$emit('$viewContentLoaded');
-            viewScope.$eval(onloadExp);
-
-            // TODO: This seems strange, shouldn't $anchorScroll listen for $viewContentLoaded if necessary?
-            // $anchorScroll might listen on event...
-            $anchorScroll();
-          } else {
+          if (!locals) {
             viewLocals = null;
             view.state = null;
 
             // Restore the initial view
-            var compiledElem = transclude(scope);
-            if (animate && doAnimate) {
-              animate.enter(compiledElem, element);
-            } else {
-              element.append(compiledElem);
-            }
+            return render.restore(transclude(scope), element);
+          }
+
+          viewLocals = locals;
+          view.state = locals.$$state;
+
+          var contents = render.populate(locals.$template, element);
+          var link = $compile(contents);
+          viewScope = scope.$new();
+
+          if (locals.$$controller) {
+            locals.$scope = viewScope;
+            var controller = $controller(locals.$$controller, locals);
+            element.children().data('$ngControllerController', controller);
           }
+          link(viewScope);
+          viewScope.$emit('$viewContentLoaded');
+          if (onloadExp) viewScope.$eval(onloadExp);
+
+          // TODO: This seems strange, shouldn't $anchorScroll listen for $viewContentLoaded if necessary?
+          // $anchorScroll might listen on event...
+          $anchorScroll();
         }
       };
     }