Skip to content

Commit fc61886

Browse files
committed
Merge pull request #7 from borislit/master
Align with latest 1.5 changes
2 parents 47d5dcc + f1ddf0e commit fc61886

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

dist/angular-component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
return {
4040
controller: options.controller || angular.noop,
41-
controllerAs: identifierForController(options.controller) || options.controllerAs || name,
41+
controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
4242
template: makeInjectable(
4343
!options.template && !options.templateUrl ? '' : options.template
4444
),
4545
templateUrl: makeInjectable(options.templateUrl),
4646
transclude: options.transclude === undefined ? true : options.transclude,
47-
scope: (options.isolate === false ? true : (options.bindings || {})),
47+
scope: {},
4848
bindToController: !!options.bindings,
4949
restrict: options.restrict || 'E'
5050
};

dist/angular-component.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/angular-component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737

3838
return {
3939
controller: options.controller || angular.noop,
40-
controllerAs: identifierForController(options.controller) || options.controllerAs || name,
40+
controllerAs: identifierForController(options.controller) || options.controllerAs || '$ctrl',
4141
template: makeInjectable(
4242
!options.template && !options.templateUrl ? '' : options.template
4343
),
4444
templateUrl: makeInjectable(options.templateUrl),
4545
transclude: options.transclude === undefined ? true : options.transclude,
46-
scope: (options.isolate === false ? true : (options.bindings || {})),
46+
scope: {},
4747
bindToController: !!options.bindings,
4848
restrict: options.restrict || 'E'
4949
};

0 commit comments

Comments
 (0)