Skip to content

Commit

Permalink
fix(ngRoute): instantiate controller when template is empty
Browse files Browse the repository at this point in the history
Before this change, $route controllers are not instantiated if the template is falsy, which includes
the empty string. This change tests if the template is not undefined, rather than just falsy, in
order to ensure that templates are instantiated even when the template is empty, which people may
have some reason to do.

This "bug" was reported in http://robb.weblaws.org/2013/06/21/angularjs-vs-emberjs/, as a "gotcha"
for AngularJS / ngRoute.

Closes angular#5550
  • Loading branch information
caitp authored and jamesdaily committed Jan 27, 2014
1 parent 55befc1 commit bc6aec6
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/ngRoute/directive/ngView.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ function ngViewFactory( $route, $anchorScroll, $animate) {
var locals = $route.current && $route.current.locals,
template = locals && locals.$template;

if (template) {
if (angular.isDefined(template)) {
var newScope = scope.$new();
var current = $route.current;

Expand Down
23 changes: 23 additions & 0 deletions test/ngRoute/directive/ngViewSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,29 @@ describe('ngView', function() {
});


it('should instantiate controller for empty template', function() {
var log = [], controllerScope,
Ctrl = function($scope) {
controllerScope = $scope;
log.push('ctrl-init');
};

module(function($routeProvider) {
$routeProvider.when('/some', {templateUrl: '/tpl.html', controller: Ctrl});
});

inject(function($route, $rootScope, $templateCache, $location) {
$templateCache.put('/tpl.html', [200, '', {}]);
$location.path('/some');
$rootScope.$digest();

expect(controllerScope.$parent).toBe($rootScope);
expect(controllerScope).toBe($route.current.scope);
expect(log).toEqual(['ctrl-init']);
});
});


it('should instantiate controller with an alias', function() {
var log = [], controllerScope,
Ctrl = function($scope) {
Expand Down

0 comments on commit bc6aec6

Please sign in to comment.