small fix in view-segment.update

veerendrakumar-github · Aug 16, 2013 · 9e0bdf1 · 9e0bdf1
1 parent 4fded2d
commit 9e0bdf1
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 97 deletions.
diff --git a/build/angular-route-segment.js b/build/angular-route-segment.js
@@ -358,124 +358,122 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
 })(angular);;'use strict';
 
 /**
- * The directive app:view is more powerful replacement of built-in ng:view. It allows views to be nested, where each 
+ * The directive app:view is more powerful replacement of built-in ng:view. It allows views to be nested, where each
  * following view in the chain corresponds to the next route segment (see $routeSegment service).
- * 
+ *
  * Sample:
  * <div>
  *     <h4>Section</h4>
  *     <div app:view>Nothing selected</div>
  * </div>
- * 
+ *
  * Initial contents of an element with app:view will display if corresponding route segment doesn't exist.
- * 
+ *
  * View resolving are depends on route segment params:
  * - `template` define contents of the view
  * - `controller` is attached to view contents when compiled and linked
  */
 
 (function(angular) {
 
-angular.module( 'view-segment', [ 'route-segment' ] ).directive( 'appViewSegment', 
-        ['$route', '$compile', '$controller', '$routeParams', '$routeSegment', '$q', '$injector',
-         function($route, $compile, $controller, $routeParams, $routeSegment, $q, $injector) {
-
-    return {
-        restrict : 'ECA',
-        priority: 500,
-        compile : function(tElement, tAttrs) {
-
-            var defaultContent = tElement.html(), isDefault = true,
-                anchor = angular.element(document.createComment(' view-segment '));
+    angular.module( 'view-segment', [ 'route-segment' ] ).directive( 'appViewSegment',
+    ['$route', '$compile', '$controller', '$routeParams', '$routeSegment', '$q', '$injector',
+        function($route, $compile, $controller, $routeParams, $routeSegment, $q, $injector) {
 
-            tElement.prepend(anchor);
-
-            return function($scope) {
-
-                var currentScope, currentElement, onloadExp = tAttrs.onload || '', animate,
-                    viewSegmentIndex = parseInt(tAttrs.appViewSegment);
-
-                try {
-                    // angular 1.1.x
-                    var $animator = $injector.get('$animator')
-                    animate = $animator($scope, tAttrs);
-                }
-                catch(e) {}
-                try {
-                    // angular 1.2.x
-                    animate = $injector.get('$animate');
-                }
-                catch(e) {}
+            return {
+                restrict : 'ECA',
+                priority: 500,
+                compile : function(tElement, tAttrs) {
 
-                // Watching for the specified route segment and updating contents
-                $scope.$on('routeSegmentChange', function(event, args) {
-                    if(args.index == viewSegmentIndex)
-                        update(args.segment);
-                });
+                    var defaultContent = tElement.html(), isDefault = true,
+                    anchor = angular.element(document.createComment(' view-segment '));
 
-                function clearContent() {
-
-                    if(currentElement) {
-                        animate.leave(currentElement);
-                        currentElement = null;
-                    }
+                    tElement.prepend(anchor);
 
-                    if (currentScope) {
-                        currentScope.$destroy();
-                        currentScope = null;
-                    }
-                }
+                    return function($scope) {
 
-
-                function update(segment) {
+                        var currentScope, currentElement, onloadExp = tAttrs.onload || '', animate,
+                        viewSegmentIndex = parseInt(tAttrs.appViewSegment);
 
-                    if(isDefault) {
-                        isDefault = false;
-                        tElement.replaceWith(anchor);
-                    }
-
-                   if(!segment) {
-                       clearContent();
-                       currentElement = tElement.clone();
-                       currentElement.html(defaultContent);
-                       animate.enter( currentElement, null, anchor );
-                       $compile(currentElement, false, 499)($scope);
-                       return;
-                   }
+                        try {
+                            // angular 1.1.x
+                            var $animator = $injector.get('$animator')
+                            animate = $animator($scope, tAttrs);
+                        }
+                        catch(e) {}
+                        try {
+                            // angular 1.2.x
+                            animate = $injector.get('$animate');
+                        }
+                        catch(e) {}
 
+                        // Watching for the specified route segment and updating contents
+                        $scope.$on('routeSegmentChange', function(event, args) {
+                            if(args.index == viewSegmentIndex)
+                                update(args.segment);
+                        });
 
-
-                    var locals = angular.extend({}, segment.locals),
-                        template = locals && locals.$template;
-
-                    if (template) {
-
-                        clearContent();
-
-                        currentElement = tElement.clone();
-                        currentElement.html(template);
-                        animate.enter( currentElement, null, anchor );
-
-                        var link = $compile(currentElement, false, 499), controller;
-
-                        currentScope = $scope.$new();
-                        if (segment.params.controller) {
-                            locals.$scope = currentScope;
-                            controller = $controller(segment.params.controller, locals);
-                            currentElement.data('$ngControllerController', controller);
-                            currentElement.children().data('$ngControllerController', controller);
+                        function clearContent() {
+
+                            if(currentElement) {
+                                animate.leave(currentElement);
+                                currentElement = null;
+                            }
+
+                            if (currentScope) {
+                                currentScope.$destroy();
+                                currentScope = null;
+                            }
                         }
 
-                        link(currentScope);
-                        currentScope.$emit('$viewContentLoaded');
-                        currentScope.$eval(onloadExp);
-                    } else {
-                        clearContent();
+
+                        function update(segment) {
+
+                            if(isDefault) {
+                                isDefault = false;
+                                tElement.replaceWith(anchor);
+                            }
+
+                            if(!segment) {
+                                clearContent();
+                                currentElement = tElement.clone();
+                                currentElement.html(defaultContent);
+                                animate.enter( currentElement, null, anchor );
+                                $compile(currentElement, false, 499)($scope);
+                                return;
+                            }
+
+                            var locals = angular.extend({}, segment.locals),
+                            template = locals && locals.$template;
+
+                            if (template) {
+
+                                clearContent();
+
+                                currentElement = tElement.clone();
+                                currentElement.html(template);
+                                animate.enter( currentElement, null, anchor );
+
+                                var link = $compile(currentElement, false, 499), controller;
+
+                                currentScope = $scope.$new();
+                                if (segment.params.controller) {
+                                    locals.$scope = currentScope;
+                                    controller = $controller(segment.params.controller, locals);
+                                    currentElement.data('$ngControllerController', controller);
+                                    currentElement.children().data('$ngControllerController', controller);
+                                }
+
+                                link(currentScope);
+                                currentScope.$emit('$viewContentLoaded');
+                                currentScope.$eval(onloadExp);
+                            } else {
+                                clearContent();
+                            }
+                        }
                     }
                 }
             }
-        }
-    }
-}]);
+        }]);
 
 })(angular);
diff --git a/src/view-segment.js b/src/view-segment.js
@@ -72,6 +72,11 @@
 
                         function update(segment) {
 
+                            if(isDefault) {
+                                isDefault = false;
+                                tElement.replaceWith(anchor);
+                            }
+
                             if(!segment) {
                                 clearContent();
                                 currentElement = tElement.clone();
@@ -81,11 +86,6 @@
                                 return;
                             }
 
-                            if(isDefault) {
-                                isDefault = false;
-                                tElement.replaceWith(anchor);
-                            }
-
                             var locals = angular.extend({}, segment.locals),
                             template = locals && locals.$template;