Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

fix(carousel): #488 Carousel fails to update model changes. #2953

Closed
kkruit wants to merge 2 commits into from
Closed

fix(carousel): #488 Carousel fails to update model changes. #2953

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfa58c0
fix(carousel): #488 Carousel fails to update model changes.
kurykruitbosch Nov 11, 2014
efcf9d5
fix(carousel): Prev direction and dont rely on scope hierarchy
kurykruitbosch Nov 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(carousel): Prev direction and dont rely on scope hierarchy 
 - Prev function calls change slide with directon of 'prev'.
 - Find element in slides array rather than through scope's $$childHead.
  • Loading branch information
@kurykruitbosch
kurykruitbosch committed Nov 11, 2014
commit efcf9d5d13b3b4d25cddfd0bccf98a227d890127
22 changes: 15 additions & 7 deletions src/carousel/carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
}
var nextElement = self.currentSlide.$element.next();
if(nextElement.length === 1){
nextSlide = getSlideFromElement(nextElement);
nextSlide = getSlideFromDomElement(nextElement);
} else {
nextSlide = getFirstSlide();
}
Expand All @@ -116,11 +116,11 @@ angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
}
var prevElement = self.currentSlide.$element[0].previousElementSibling;
if(prevElement !== null){
prevSlide = getSlideFromElement(prevElement);
prevSlide = getSlideFromDomElement(prevElement);
} else {
prevSlide = getLastSlide();
}
return self.select(prevSlide, 'next');
return self.select(prevSlide, 'prev');
}
};

Expand Down Expand Up @@ -168,8 +168,16 @@ angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
}
};

function getSlideFromElement(element) {
return angular.element(element).scope().$$childHead;
function getSlideFromDomElement(element) {
if(element.length){
element = element[0];
}
for (var i = slides.length - 1; i >= 0; i--) {
if(slides[i].$element[0] === element){
return slides[i];
}
}
return false;
}

function getSlideElements() {
Expand All @@ -179,12 +187,12 @@ angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
function getLastSlide() {
var slideElements = getSlideElements();
var lastSlideElement = slideElements[slideElements.length-1];
return getSlideFromElement(lastSlideElement);
return getSlideFromDomElement(lastSlideElement);
}

function getFirstSlide(){
var firstSlideElement = getSlideElements()[0];
return getSlideFromElement(firstSlideElement);
return getSlideFromDomElement(firstSlideElement);
}

self.addSlide = function(slide, element) {
Expand Down