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

ionicScrollController: do not try to remember scorll if no viewId

Browse Source
This commit is contained in:
Andy Joslin
2014-03-19 16:51:18 -06:00
parent 73b750fb37
commit 4e1140702b
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/ext/angular/src/controller/ionicScrollController.js vendored
View File

@@ -81,17 +81,18 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
if (e.defaultPrevented) { return; }
e.preventDefault();
var viewId = historyData.viewId;
var viewId = historyData && historyData.viewId;
if (viewId) {
self.rememberScrollPosition(viewId);
self.scrollToRememberedPosition();
self.rememberScrollPosition(viewId);
self.scrollToRememberedPosition();
backListenDone = $rootScope.$on('$viewHistory.viewBack', function(e, fromViewId, toViewId) {
//When going back from this view, forget its saved scroll position
if (viewId === fromViewId) {
self.forgetScrollPosition();
}
});
backListenDone = $rootScope.$on('$viewHistory.viewBack', function(e, fromViewId, toViewId) {
//When going back from this view, forget its saved scroll position
if (viewId === fromViewId) {
self.forgetScrollPosition();
}
});
}
});
$timeout(function() {

11
js/ext/angular/test/controller/ionicScrollController.unit.js
View File

@@ -91,6 +91,17 @@ describe('$ionicScroll Controller', function() {
expect(ctrl.scrollView.resize).toHaveBeenCalled();
});
it('should not remember scroll position on $viewContentLoaded if no viewId', function() {
var historyData = {};
setup();
spyOn(ctrl, 'rememberScrollPosition');
spyOn(ctrl, 'scrollToRememberedPosition');
scope.$broadcast('$viewContentLoaded', historyData);
timeout.flush();
expect(ctrl.rememberScrollPosition).not.toHaveBeenCalledWith();
expect(ctrl.scrollToRememberedPosition).not.toHaveBeenCalled();
});
it('should remember scroll position on $viewContentLoaded event', function() {
var historyData = { viewId: '1' };
setup();