Download as
Browse Code »

Commit 726528eb32924cf90cc810e6870e3090cf7fa630

Authored by Rafael Diego
2 parents 8cc604c3 9a88f218
Exists in master and in 2 other branches production, staging

Merge branch 'master' into staging

Showing 3 changed files with 14 additions and 12 deletions   Show diff stats
gulp/build.js
  Diff comments   View file @726528e
... ... @@ -48,6 +48,8 @@ gulp.task('html', ['inject', 'partials'], function () {
48 48 .pipe($.if($.util.env.production, $.replace('http://hom.dialoga.gov.br', 'http://dialoga.gov.br')))
49 49 .pipe($.if($.util.env.production, $.replace('http://hom.login.dialoga.gov.br', 'http://login.dialoga.gov.br')))
50 50 .pipe($.if($.util.env.production, $.replace('6LcLPAcTAAAAAKsd0bxY_TArhD_A7OL19SRCW7_i', '6LeDTRUTAAAAAA1VMOmIa2oqqWaPfXsv7J90r_49')))
  51 + .pipe($.if($.util.env.production, $.replace('faq: \'117322\'', 'faq: \'128956\'')))
  52 + .pipe($.if($.util.env.production, $.replace('acessibility: \'117319\'', 'acessibility: \'128972\'')))
51 53 // staging
52 54 .pipe($.if($.util.env.staging, $.replace('http://dialoga.gov.br', 'http://hom.dialoga.gov.br')))
53 55 .pipe($.if($.util.env.staging, $.replace('http://login.dialoga.gov.br', 'http://hom.login.dialoga.gov.br')))
... ...
src/app/components/social-share/social-share.directive.js
  Diff comments   View file @726528e
... ... @@ -11,10 +11,10 @@
11 11 restrict: 'E',
12 12 templateUrl: 'app/components/social-share/social-share.html',
13 13 scope: {
14   - socialVia: '=',
15   - socialUrl: '=',
16   - socialImage: '=',
17   - socialText: '=',
  14 + socialVia: '=?',
  15 + socialUrl: '=?',
  16 + socialImage: '=?',
  17 + socialText: '=?',
18 18 arrowClass: '@'
19 19 },
20 20 controller: SocialShareController,
... ...
src/app/components/social-share/social-share.html
  Diff comments   View file @726528e
... ... @@ -7,11 +7,11 @@
7 7 socialshare
8 8 socialshare-provider="facebook"
9 9 socialshare-type="feed"
10   - socialshare-via="{{vm.socialVia}}"
11   - socialshare-url="{{vm.socialUrl}}"
  10 + socialshare-via="vm.socialVia"
  11 + socialshare-url="vm.socialUrl"
12 12 socialshare-redirect-uri="https://dialoga.gov.br/"
13   - socialshare-media="{{vm.socialImage}}"
14   - socialshare-text="{{vm.socialText}}"
  13 + socialshare-media="vm.socialImage"
  14 + socialshare-text="vm.socialText"
15 15 title="Compartilhar no Facebook">
16 16 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
17 17 <span class="sr-only">Compartilhar no Facebook</span>
... ... @@ -21,8 +21,8 @@
21 21 <a href="#" role="button"
22 22 socialshare
23 23 socialshare-provider="twitter"
24   - socialshare-url="{{vm.socialUrl}}"
25   - socialshare-text="{{vm.socialText}}"
  24 + socialshare-url="vm.socialUrl"
  25 + socialshare-text="vm.socialText"
26 26 socialshare-hastags="dialogabrasil"
27 27 title="Compartilhar no Twitter">
28 28 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
... ... @@ -33,8 +33,8 @@
33 33 <a href="#" role="button"
34 34 socialshare
35 35 socialshare-provider="google+"
36   - socialshare-url="{{vm.socialUrl}}"
37   - socialshare-text="{{vm.socialText}}"
  36 + socialshare-url="vm.socialUrl"
  37 + socialshare-text="vm.socialText"
38 38 title="Compartilhar no Google Plus">
39 39 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
40 40 <span class="sr-only">Compartilhar no Google Plus</span>
... ...