@@ -1970,26 +1970,25 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
1970
1970
}
1971
1971
if ( elementControllers ) {
1972
1972
// Initialize bindToController bindings for new/isolate scopes
1973
- var scopeDirective = newIsolateScopeDirective || newScopeDirective ;
1974
- var bindings ;
1975
- var controllerForBindings ;
1976
- if ( scopeDirective && elementControllers [ scopeDirective . name ] ) {
1977
- bindings = scopeDirective . $$bindings . bindToController ;
1978
- controller = elementControllers [ scopeDirective . name ] ;
1979
-
1980
- if ( controller && controller . identifier && bindings ) {
1981
- controllerForBindings = controller ;
1982
- thisLinkFn . $$destroyBindings =
1983
- initializeDirectiveBindings ( scope , attrs , controller . instance ,
1984
- bindings , scopeDirective ) ;
1985
- }
1986
- }
1987
1973
for ( i in elementControllers ) {
1974
+ var scopeDirective = newIsolateScopeDirective || controllerDirectives [ i ] ;
1975
+ var bindings ;
1976
+ var controllerForBindings ;
1977
+ if ( scopeDirective && elementControllers [ scopeDirective . name ] ) {
1978
+ bindings = scopeDirective . $$bindings . bindToController ;
1979
+ controller = elementControllers [ scopeDirective . name ] ;
1980
+ if ( controller && controller . identifier && bindings ) {
1981
+ controllerForBindings = controller ;
1982
+ thisLinkFn . $$destroyBindings =
1983
+ initializeDirectiveBindings ( scope , attrs , controller . instance ,
1984
+ bindings , scopeDirective ) ;
1985
+ }
1986
+ }
1988
1987
controller = elementControllers [ i ] ;
1989
1988
var controllerResult = controller ( ) ;
1990
1989
if ( controllerResult !== controller . instance ) {
1991
1990
controller . instance = controllerResult ;
1992
- $element . data ( '$' + directive . name + 'Controller' , controllerResult ) ;
1991
+ $element . data ( '$' + controllerDirectives [ i ] . name + 'Controller' , controllerResult ) ;
1993
1992
if ( controller === controllerForBindings ) {
1994
1993
// Remove and re-install bindToController bindings
1995
1994
thisLinkFn . $$destroyBindings ( ) ;
0 commit comments