Merge pull request #5446 from fdmota/master

dlgski · web-flow · commit 4cbacdb210ae · 2016-09-20T14:27:22.000-04:00
Fix compile sequence to allow custom directives with required controllers to work
diff --git a/src/features/expandable/js/expandable.js b/src/features/expandable/js/expandable.js
@@ -441,8 +441,9 @@
                       }
                     }
                   }
-                  var expandedRowElement = $compile(template)($scope);
+                  var expandedRowElement = angular.element(template);
                   $elm.append(expandedRowElement);
+                  expandedRowElement = $compile(expandedRowElement)($scope);
                   $scope.row.expandedRendered = true;
               });
             },

Original file line number	Diff line number	Diff line change
`@@ -441,8 +441,9 @@`
`441`	`441`	`}`
`442`	`442`	`}`
`443`	`443`	`}`
`444`		`- var expandedRowElement = $compile(template)($scope);`
	`444`	`+ var expandedRowElement = angular.element(template);`
`445`	`445`	`$elm.append(expandedRowElement);`
	`446`	`+ expandedRowElement = $compile(expandedRowElement)($scope);`
`446`	`447`	`$scope.row.expandedRendered = true;`
`447`	`448`	`});`
`448`	`449`	`},`