javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(controllers): only assign to parent scope when needed

Browse Source
This commit is contained in:
Andy Joslin
2014-03-21 09:59:42 -05:00
parent 38acea337a
commit f594f653d5
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/ext/angular/src/directive/ionicBar.js vendored
View File

@@ -124,14 +124,14 @@ function barDirective(isHeader) {
alignTitle: $attr.alignTitle || 'center'
});
$parse($attr.controllerBind ||
(isHeader ? '$ionicHeaderBarController' : '$ionicFooterBarController')
).assign($scope, hb);
var el = $element[0];
//just incase header is on rootscope
var parentScope = $scope.$parent || $scope;
$parse($attr.controllerBind ||
(isHeader ? '$ionicHeaderBarController' : '$ionicFooterBarController')
).assign(parentScope, hb);
if (isHeader) {
$scope.$watch(function() { return el.className; }, function(value) {
var isSubheader = value.indexOf('bar-subheader') !== -1;

2
js/ext/angular/src/directive/ionicSideMenu.js vendored
View File

@@ -120,7 +120,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
$scope.sideMenuContentTranslateX = 0;
$parse($attrs.controllerBind || '$ionicSideMenusController')
.assign($scope.$parent || $scope, this);
.assign($scope, this);
}],
replace: true,
transclude: true,

5
js/ext/angular/test/directive/ionicSideMenu.unit.js
View File

@@ -18,11 +18,8 @@ describe('Ionic Angular Side Menu', function() {
var el = $compile('<ion-side-menus controller-bind="supermodel"></ion-side-menus>')($rootScope.$new());
var scope = el.scope();
expect(el.controller('ionSideMenus')).toBeDefined();
expect(scope.$parent.supermodel).toBe(el.controller('ionSideMenus'));
expect(scope.supermodel).toBe(el.controller('ionSideMenus'));
}));
it('should init with custom model attr', function() {
});
});
describe('Ionic Side Menu Content Directive', function () {