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(modal): trigger resize event on the window when modal opens

Browse Source 
A better approach to resolving an issue with collection-repeat sizing itself properly. This keeps directives independent of eachother.
This commit is contained in:
Perry Govier
2014-07-24 14:45:40 -05:00
parent 1fbd3c5632
commit 4f6d02cfcb
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/angular/directive/collectionRepeat.js vendored
View File

@@ -225,11 +225,6 @@ function($collectionRepeatManager, $collectionDataSource, $parse) {
rerender($scope.$eval(listExpr));
}
// for lists inside a modal, recalc when the modal is shown
$scope.$on('modal.shown',function(){
onWindowResize();
});
ionic.on('resize', onWindowResize, window);
$scope.$on('$destroy', function() {

1
js/angular/service/modal.js vendored
View File

@@ -148,6 +148,7 @@ function($rootScope, $document, $compile, $timeout, $ionicPlatform, $ionicTempla
$timeout(function(){
modalEl.addClass('ng-enter-active');
ionic.trigger('resize');
self.scope.$parent && self.scope.$parent.$broadcast('modal.shown', self);
self.el.classList.add('active');
}, 20);

18
test/unit/angular/directive/collectionRepeat.unit.js
View File

@@ -152,24 +152,6 @@ describe('collectionRepeat directive', function() {
expect(scrollView.resize.callCount).toBe(1);
});
it('should rerender on modal popup', function() {
inject(function($rootScope) {
var el = setup('collection-repeat="item in items" collection-item-height="50"');
var scrollView = el.controller('$ionicScroll').scrollView;
spyOn(scrollView, 'resize');
dataSource.setData.reset();
repeatManager.resize.reset();
el.scope().items = [1, 2, 3];
$rootScope.$broadcast('modal.shown');
expect(dataSource.setData).toHaveBeenCalledWith(el.scope().items);
expect(repeatManager.resize.callCount).toBe(1);
expect(scrollView.resize.callCount).toBe(1);
});
});
it('$destroy', function() {
var el = setup('collection-repeat="item in items" collection-item-height="50"');
dataSource.destroy = jasmine.createSpy('dataSourceDestroy');

8
test/unit/angular/service/modal.unit.js
View File

@@ -48,6 +48,14 @@ describe('Ionic Modal', function() {
expect(instance.isShown()).toBe(false);
});
it('should trigger a resize event', function() {
var instance = modal.fromTemplate('<div class="modal">hello</div>');
spyOn(ionic, 'trigger');
instance.show();
timeout.flush();
expect(ionic.trigger).toHaveBeenCalledWith('resize');
});
it('should set isShown on remove', function() {
var instance = modal.fromTemplate('<div class="modal">hello</div>');
expect(instance.isShown()).toBe(false);