Download as
Browse Code »

Commit b1f65488dfeea1c6ae4ece67e6568e0a01e5afa8

Authored by Leonardo Merlin
1 parent 1f88da39
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Fix focus on proposal box

Showing 4 changed files with 8 additions and 4 deletions   Show diff stats
src/app/components/proposal-box/proposal-box.directive.js
  Diff comments   View file @b1f6548
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 var vm = this; 24 var vm = this;
25 25
26 if (!vm.vote) { vm.vote = false; } 26 if (!vm.vote) { vm.vote = false; }
  27 + if (!vm.focus) { vm.focus = false; }
27 28
28 }; 29 };
29 30
@@ -45,7 +46,11 @@ @@ -45,7 +46,11 @@
45 proposal: '=', 46 proposal: '=',
46 topic: '=', 47 topic: '=',
47 category: '=', 48 category: '=',
48 - vote: '=' 49 + vote: '=',
  50 + focus: '@'
  51 + // @ -> Text binding / one-way binding
  52 + // = -> Direct model binding / two-way binding
  53 + // & -> Behaviour binding / Method binding
49 }, 54 },
50 controller: ProposalBoxController, 55 controller: ProposalBoxController,
51 controllerAs: 'vm', 56 controllerAs: 'vm',
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @b1f6548
1 -<div class="proposal-box" ng-class="[{'focus': vm.isFocused}, vm.category.slug]"> 1 +<div class="proposal-box" ng-class="[{'focus': vm.focus}, vm.category.slug]">
2 <div class="proposal-box--top"> 2 <div class="proposal-box--top">
3 <div class="proposal-box--theme color-theme-bg-darker">{{::vm.category.name}}</div> 3 <div class="proposal-box--theme color-theme-bg-darker">{{::vm.category.name}}</div>
4 <div class="proposal-box--program color-theme-bg">{{::vm.topic.title}}</div> 4 <div class="proposal-box--program color-theme-bg">{{::vm.topic.title}}</div>
src/app/components/proposal-list/proposal-list.directive.js
  Diff comments   View file @b1f6548
@@ -97,7 +97,6 @@ @@ -97,7 +97,6 @@
97 }, { 97 }, {
98 location: true 98 location: true
99 }); 99 });
100 -  
101 } 100 }
102 101
103 function attachPopover(){ 102 function attachPopover(){
src/app/pages/programas/programa.html
  Diff comments   View file @b1f6548
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 </div> 64 </div>
65 <div class="col-xs-12" ng-if="pageProgramaContent.randomProposal"> 65 <div class="col-xs-12" ng-if="pageProgramaContent.randomProposal">
66 <h3 class="color-theme-fg">Propostas nesse programa</h3> 66 <h3 class="color-theme-fg">Propostas nesse programa</h3>
67 - <proposal-box proposal="pageProgramaContent.randomProposal" topic="pageProgramaContent.article" category="pageProgramaContent.category" vote="true" ></proposal-box> 67 + <proposal-box proposal="pageProgramaContent.randomProposal" topic="pageProgramaContent.article" category="pageProgramaContent.category" vote="true" focus="{{pageProgramaContent.search.proposal_id}}" ></proposal-box>
68 </div> 68 </div>
69 <div class="col-xs-12" ng-if="!pageProgramaContent.randomProposal && !(pageProgramaContent.proposalsTopRated && pageProgramaContent.proposalsTopRated.length > 0)"> 69 <div class="col-xs-12" ng-if="!pageProgramaContent.randomProposal && !(pageProgramaContent.proposalsTopRated && pageProgramaContent.proposalsTopRated.length > 0)">
70 <h3>Programas sem propostas</h3> 70 <h3>Programas sem propostas</h3>