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

amend(slidebox): always reselect on dragend

Browse Source
This commit is contained in:
Andrew
2014-11-18 10:34:42 -07:00
parent fc3865755f
commit 7ca780f22c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/angular/controller/slideBoxController.js vendored
View File

@@ -125,7 +125,7 @@ function(scope, element, $$ionicAttachDrag, $interval, $rootScope, $timeout) {
/*
* Select and change slides
*/
function select(newIndex, transitionDuration) {
function select(newIndex, transitionDuration, force) {
if (!self.isInRange(newIndex)) return;
scope.selectedIndex = newIndex;
@@ -137,7 +137,8 @@ function(scope, element, $$ionicAttachDrag, $interval, $rootScope, $timeout) {
next: self.at(self.next())
};
if (oldRelevantSlides.next === relevantSlides.next &&
if (!force &&
oldRelevantSlides.next === relevantSlides.next &&
oldRelevantSlides.previous === relevantSlides.previous &&
oldRelevantSlides.selected === relevantSlides.selected) {
// do nothing;
@@ -201,7 +202,7 @@ function(scope, element, $$ionicAttachDrag, $interval, $rootScope, $timeout) {
);
self.select(nextIndex, transitionDuration);
} else {
self.select(scope.selectedIndex);
self.select(scope.selectedIndex, 0, true);
}
}