');
})
);
@@ -2085,7 +2085,7 @@ describe('$compile', function() {
describe('isolated locals', function() {
- var componentScope;
+ var componentScope, regularScope;
beforeEach(module(function() {
directive('myComponent', function() {
@@ -2112,6 +2112,23 @@ describe('$compile', function() {
scope: { attr: 'xxx' }
};
});
+ directive('storeScope', function() {
+ return {
+ link: function(scope) {
+ regularScope = scope;
+ }
+ }
+ });
+ }));
+
+ it('should give other directives the parent scope', inject(function($rootScope) {
+ compile('
');
+ $rootScope.$apply(function() {
+ $rootScope.value = 'from-parent';
+ });
+ expect(element.find('input').val()).toBe('from-parent');
+ expect(componentScope).not.toBe(regularScope);
+ expect(componentScope.$parent).toBe(regularScope)
}));
describe('attribute', function() {
@@ -2376,6 +2393,68 @@ describe('$compile', function() {
});
+ it('should require controller of an isolate directive from a non-isolate directive on the ' +
+ 'same element', function() {
+ var IsolateController = function() {};
+ var isolateDirControllerInNonIsolateDirective;
+
+ module(function() {
+ directive('isolate', function() {
+ return {
+ scope: {},
+ controller: IsolateController
+ };
+ });
+ directive('nonIsolate', function() {
+ return {
+ require: 'isolate',
+ link: function(_, __, ___, isolateDirController) {
+ isolateDirControllerInNonIsolateDirective = isolateDirController;
+ }
+ };
+ });
+ });
+
+ inject(function($compile, $rootScope) {
+ element = $compile('
')($rootScope);
+
+ expect(isolateDirControllerInNonIsolateDirective).toBeDefined();
+ expect(isolateDirControllerInNonIsolateDirective instanceof IsolateController).toBe(true);
+ });
+ });
+
+
+ it('should require controller of a non-isolate directive from an isolate directive on the ' +
+ 'same element', function() {
+ var NonIsolateController = function() {};
+ var nonIsolateDirControllerInIsolateDirective;
+
+ module(function() {
+ directive('isolate', function() {
+ return {
+ scope: {},
+ require: 'nonIsolate',
+ link: function(_, __, ___, nonIsolateDirController) {
+ nonIsolateDirControllerInIsolateDirective = nonIsolateDirController;
+ }
+ };
+ });
+ directive('nonIsolate', function() {
+ return {
+ controller: NonIsolateController
+ };
+ });
+ });
+
+ inject(function($compile, $rootScope) {
+ element = $compile('
')($rootScope);
+
+ expect(nonIsolateDirControllerInIsolateDirective).toBeDefined();
+ expect(nonIsolateDirControllerInIsolateDirective instanceof NonIsolateController).toBe(true);
+ });
+ });
+
+
it('should support controllerAs', function() {
module(function() {
directive('main', function() {
diff --git a/xx b/xx
new file mode 100644
index 000000000000..e69de29bb2d1