Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Moving controls to templateCache #304

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

Moving controls to templateCache #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c48ffec
moving controls to template
raphaelluchini Feb 25, 2015
368f73a
Merge branch 'master' of https://github.com/revolunet/angular-carouse…
raphaelluchini Feb 25, 2015
5d5673a
Merge pull request #320 from emersion/master
Apr 21, 2015
d158e2b
moving controls to template
raphaelluchini Feb 25, 2015
8bc7e03
Merge branch 'master' of https://github.com/raphaelluchini/angular-ca…
raphaelluchini May 18, 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
2 changes: 2 additions & 0 deletions dist/angular-carousel.css
View file
Open in desktop

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

49 changes: 34 additions & 15 deletions dist/angular-carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Angular Carousel - Mobile friendly touch carousel for AngularJS
* @version v0.3.10 - 2015-02-11
* @version v0.3.10 - 2015-05-18
* @link http://revolunet.github.com/angular-carousel
* @author Julien Bouquillon <[email protected]>
* @license MIT License, http://www.opensource.org/licenses/MIT
Expand Down Expand Up @@ -80,8 +80,16 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
(function() {
"use strict";

angular.module('angular-carousel')
angular.module('angular-carousel');

angular.module('angular-carousel').run(['$templateCache', function($templateCache) {
$templateCache.put('carousel-controls.html',
'<div class="rn-carousel-controls">\n' +
' <span class="rn-carousel-control rn-carousel-control-prev" ng-click="prevSlide()" ng-if="carouselIndex > 0"></span>\n' +
' <span class="rn-carousel-control rn-carousel-control-next" ng-click="nextSlide()" ng-if="carouselIndex < currentSlides.length-1"></span>\n' +
'</div>'
);
}])
.service('DeviceCapabilities', function() {

// TODO: merge in a single function
Expand Down Expand Up @@ -198,8 +206,8 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
};
})

.directive('rnCarousel', ['$swipe', '$window', '$document', '$parse', '$compile', '$timeout', '$interval', 'computeCarouselSlideStyle', 'createStyleString', 'Tweenable',
function($swipe, $window, $document, $parse, $compile, $timeout, $interval, computeCarouselSlideStyle, createStyleString, Tweenable) {
.directive('rnCarousel', ['$swipe', '$window', '$document', '$parse', '$compile', '$timeout', '$interval', '$templateCache', 'computeCarouselSlideStyle', 'createStyleString', 'Tweenable',
function($swipe, $window, $document, $parse, $compile, $timeout, $interval, $templateCache, computeCarouselSlideStyle, createStyleString, Tweenable) {
// internal ids to allow multiple instances
var carouselId = 0,
// in absolute pixels, at which distance the slide stick to the edge on release
Expand Down Expand Up @@ -271,7 +279,8 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
autoSlideDuration: 3,
bufferSize: 5,
/* in container % how much we need to drag to trigger the slide change */
moveTreshold: 0.1
moveTreshold: 0.1,
defaultIndex: 0
};

// TODO
Expand Down Expand Up @@ -373,6 +382,7 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
updateSlidesPosition(state.x);
},
finish: function() {
scope.currentSlides = currentSlides;
scope.$apply(function() {
scope.carouselIndex = index;
offset = index * -100;
Expand Down Expand Up @@ -438,6 +448,7 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach

var init = true;
scope.carouselIndex = 0;
scope.currentSlides = 0;

if (!isRepeatBased) {
// fake array when no ng-repeat
Expand All @@ -446,15 +457,12 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
currentSlides.push({id: index});
});
}

if (iAttributes.rnCarouselControls!==undefined) {
// dont use a directive for this
var nextSlideIndexCompareValue = isRepeatBased ? repeatCollection.replace('::', '') + '.length - 1' : currentSlides.length - 1;
var tpl = '<div class="rn-carousel-controls">\n' +
' <span class="rn-carousel-control rn-carousel-control-prev" ng-click="prevSlide()" ng-if="carouselIndex > 0"></span>\n' +
' <span class="rn-carousel-control rn-carousel-control-next" ng-click="nextSlide()" ng-if="carouselIndex < ' + nextSlideIndexCompareValue + '"></span>\n' +
'</div>';
var tpl = $templateCache.get('carousel-controls.html');
iElement.append($compile(angular.element(tpl))(scope));
scope.showNexControll = false;
}

if (iAttributes.rnCarouselAutoSlide!==undefined) {
Expand All @@ -471,6 +479,11 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
}, duration * 1000);
};
}

if (iAttributes.rnCarouselDefaultIndex) {
var defaultIndexModel = $parse(iAttributes.rnCarouselDefaultIndex);
options.defaultIndex = defaultIndexModel(scope.$parent) || 0;
}

if (iAttributes.rnCarouselIndex) {
var updateParentIndex = function(value) {
Expand All @@ -485,7 +498,7 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
scope.$parent.$watch(indexModel, function(newValue, oldValue) {

if (newValue !== undefined && newValue !== null) {
if (currentSlides && newValue >= currentSlides.length) {
if (currentSlides && currentSlides.length > 0 && newValue >= currentSlides.length) {
newValue = currentSlides.length - 1;
updateParentIndex(newValue);
} else if (currentSlides && newValue < 0) {
Expand All @@ -501,14 +514,20 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
}
});
isIndexBound = true;

if (options.defaultIndex) {
goToSlide(options.defaultIndex, {
animate: !init
});
}
} else if (!isNaN(iAttributes.rnCarouselIndex)) {
/* if user just set an initial number, set it */
goToSlide(parseInt(iAttributes.rnCarouselIndex, 10), {
animate: false
});
}
} else {
goToSlide(0, {
goToSlide(options.defaultIndex, {
animate: !init
});
init = false;
Expand All @@ -531,7 +550,7 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
var deepWatch = (iAttributes.rnCarouselDeepWatch!==undefined);

scope[deepWatch?'$watch':'$watchCollection'](repeatCollection, function(newValue, oldValue) {
//console.log('repeatCollection', currentSlides);
// console.log('repeatCollection', currentSlides);
currentSlides = newValue;
// if deepWatch ON ,manually compare objects to guess the new position
if (deepWatch && angular.isArray(newValue)) {
Expand All @@ -542,8 +561,8 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
goToSlide(scope.carouselIndex, {animate: false});
}
}, true);
scope.currentSlides = currentSlides;
}

function swipeEnd(coords, event, forceAnimation) {
// console.log('swipeEnd', 'scope.carouselIndex', scope.carouselIndex);
// Prevent clicks on buttons inside slider to trigger "swipeEnd" event on touchend/mouseup
Expand Down
Loading