Skip to content

Fix for #27 Splicing slides intermittently creates blank slides #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wilsonwc wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix for #27 Splicing slides intermittently creates blank slides #67

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b9efd5
Fix to enable javascript minification.
Jan 23, 2014
d64646e
Fix bug in slide collection removal (thanks @jmallison)
thenikso May 4, 2014
64bcf11
Add `$slider` local to callbacks
thenikso May 22, 2014
cd3f671
Reflect repo ownership change
thenikso May 22, 2014
54cc02f
Fixes 'track by' adding the ability to track by `$index` variable.
thenikso Jun 24, 2014
f51578f
Fixes a bug that was showing only one slider when multiple were gener…
thenikso Jun 24, 2014
87338db
Bump version
thenikso Jun 24, 2014
0b43a84
Small fix for missing character
dsem Jun 27, 2014
c1331c7
Fix for adding multiple slides
Aug 8, 2014
1e37718
Merge remote-tracking branch 'upstream/master'
Aug 12, 2015
0da221d
compiling js from cs, cleanup merge
Aug 12, 2015
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
Next Next commit
Fixes a bug that was showing only one slider when multiple were gener… 
…ated with an `ng-repeat`.

Fix #20
  • Loading branch information
@thenikso
thenikso authored and Ross Wilson committed Aug 8, 2014
commit f51578f43d665b7677dbcbe4dcd8f7a6bef3fe80
14 changes: 7 additions & 7 deletions angular-flexslider.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ angular.module('angular-flexslider', [])
transclude: yes
template: '<div class="flexslider-container"></div>'
compile: (element, attr, linker) ->
match = attr.slide.match /^\s*(.+)\s+in\s+(.*?)(?:\s+track\s+by\s+(.+?))?\s*$/
indexString = match[1]
collectionString = match[2]
trackBy = if angular.isDefined(match[3]) then $parse(match[3]) else $parse("#{indexString}")
($scope, $element) ->
match = attr.slide.match /^\s*(.+)\s+in\s+(.*?)(?:\s+track\s+by\s+(.+?))?\s*$/
indexString = match[1]
collectionString = match[2]
trackBy = if angular.isDefined(match[3]) then $parse(match[3]) else $parse("#{indexString}")

flexsliderDiv = null
slidesItems = {}
flexsliderDiv = null
slidesItems = {}

($scope, $element) ->
getTrackFromItem = (collectionItem, index) ->
locals = {}
locals[indexString] = collectionItem
Expand Down
16 changes: 7 additions & 9 deletions angular-flexslider.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions examples/multiple-sliders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html ng-app="MultipleSliders">

<head>
<title>Angular FlexSlider Example - Multiple Sliders</title>
<link rel="stylesheet" type="text/css" href="../bower_components/flexslider/flexslider.css">
<style type="text/css">
.flexslider-container {
height: 300px;
}
</style>
</head>

<body ng-controller="MultipleSlidersCtrl">

<div ng-repeat="slideshow in slideshows">
<flex-slider
slide="s in slideshow track by $index"
animation="slide">
<li>
<img ng-src="{{s}}">
</li>
</flex-slider>
</div>

<script src="../bower_components/jquery/jquery.js"></script>
<script src="../bower_components/flexslider/jquery.flexslider.js"></script>
<script src="../bower_components/angular/angular.js"></script>
<script src="../angular-flexslider.js"></script>
<script type="text/javascript">
angular.module('MultipleSliders', ['angular-flexslider'])
.controller('MultipleSlidersCtrl', function ($scope) {
$scope.slideshows = [
[
'http://flexslider.woothemes.com/images/kitchen_adventurer_cheesecake_brownie.jpg',
'http://flexslider.woothemes.com/images/kitchen_adventurer_lemon.jpg',
'http://flexslider.woothemes.com/images/kitchen_adventurer_donut.jpg',
'http://flexslider.woothemes.com/images/kitchen_adventurer_caramel.jpg'
],
[
'http://flexslider.woothemes.com/images/kitchen_adventurer_cheesecake_brownie.jpg',
'http://flexslider.woothemes.com/images/kitchen_adventurer_lemon.jpg',
'http://flexslider.woothemes.com/images/kitchen_adventurer_donut.jpg',
'http://flexslider.woothemes.com/images/kitchen_adventurer_caramel.jpg'
]
];
});
</script>
</body>

</html>