From e27f3b3c0e690bbe1f99e2ace679d6502564df07 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Mon, 14 Sep 2015 10:58:47 -0300 Subject: [PATCH] Fix scroll behaviour. Add footer directive --- src/app/components/proposal-carousel/proposal-carousel.directive.js | 15 ++++++++++++++- src/app/components/proposal-carousel/proposal-carousel.html | 12 ++++++++++-- src/app/components/proposal-carousel/proposal-carousel.scss | 20 ++++++++++++++++---- src/app/index.run.js | 2 +- src/app/pages/article/article.controller.js | 5 ++++- src/app/pages/auth/auth.controller.js | 2 ++ src/app/pages/programas/programa.controller.js | 5 +++-- src/app/pages/programas/programa.html | 12 ++++++------ src/app/pages/programas/programas.controller.js | 6 ++++-- src/app/pages/programas/programas.html | 2 +- src/index.html | 5 +++-- 11 files changed, 64 insertions(+), 22 deletions(-) diff --git a/src/app/components/proposal-carousel/proposal-carousel.directive.js b/src/app/components/proposal-carousel/proposal-carousel.directive.js index 866e432..8cdb508 100644 --- a/src/app/components/proposal-carousel/proposal-carousel.directive.js +++ b/src/app/components/proposal-carousel/proposal-carousel.directive.js @@ -9,11 +9,12 @@ function proposalCarousel() { /** @ngInject */ - function ProposalCarouselController($scope, $element, $timeout, $log) { + function ProposalCarouselController($scope, $state, $element, $timeout, $log) { $log.debug('ProposalCarouselController'); var vm = this; vm.$scope = $scope; + vm.$state = $state; vm.$element = $element; vm.$timeout = $timeout; vm.$log = $log; @@ -63,6 +64,18 @@ vm.$scope.$emit('proposal-carousel:showProposalsList'); }; + ProposalCarouselController.prototype.showContent = function (proposal) { + var vm = this; + + vm.$state.go('programa', { + slug: proposal.parent.slug, + proposal_id: proposal.id + }, { + location: true, + reload: true + }); + }; + var directive = { restrict: 'E', templateUrl: 'app/components/proposal-carousel/proposal-carousel.html', diff --git a/src/app/components/proposal-carousel/proposal-carousel.html b/src/app/components/proposal-carousel/proposal-carousel.html index a7855cc..54bc9fd 100644 --- a/src/app/components/proposal-carousel/proposal-carousel.html +++ b/src/app/components/proposal-carousel/proposal-carousel.html @@ -16,7 +16,15 @@