Download as
Browse Code »

Commit f27766532ee24f46831e29e2b5ad1c1a61a12ee9

Authored by Leonardo Merlin
1 parent 7127be1a
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 path

Showing 5 changed files with 15 additions and 16 deletions   Show diff stats
src/app/components/article-box/article-box.directive.js
  Diff comments   View file @f277665
... ... @@ -9,11 +9,12 @@
9 9 function articleBox($rootScope) {
10 10  
11 11 /** @ngInject */
12   - function ArticleBoxController($state, $log) {
  12 + function ArticleBoxController($state, PATH, $log) {
13 13 $log.debug('ArticleBoxController');
14 14  
15 15 var vm = this;
16 16 vm.$state = $state;
  17 + vm.PATH = PATH;
17 18 vm.$log = $log;
18 19  
19 20 vm.init();
... ... @@ -32,7 +33,7 @@
32 33  
33 34 if(!vm.image && vm.article.image){
34 35 vm.image = {
35   - src: $rootScope.basePath + vm.article.image.url,
  36 + src: vm.PATH.image + vm.article.image.url,
36 37 alt: 'Imagem de destaque do conteúdo'
37 38 };
38 39 }
... ...
src/app/components/article-preview/article-preview.directive.js
  Diff comments   View file @f277665
... ... @@ -9,11 +9,12 @@
9 9 function articlePreview($rootScope) {
10 10  
11 11 /** @ngInject */
12   - function ArticlePreviewController($state, $log) {
  12 + function ArticlePreviewController($state, PATH, $log) {
13 13 $log.debug('ArticlePreviewController');
14 14  
15 15 var vm = this;
16 16 vm.$state = $state;
  17 + vm.PATH = PATH;
17 18 vm.$log = $log;
18 19  
19 20 vm.init();
... ... @@ -32,15 +33,10 @@
32 33  
33 34 if(!vm.banner){
34 35 vm.banner = {
35   - src: $rootScope.basePath + vm.article.image.url,
  36 + src: vm.PATH.image + vm.article.image.url,
36 37 alt: 'Imagem de destaque do programa'
37 38 };
38 39 }
39   -
40   - // if(vm.article.color && !vm.article.bgColor){
41   - // // 15% more darker
42   - // vm.article.colorDarker = window.ColorLuminance(vm.article.color, 0.15);
43   - // }
44 40 };
45 41  
46 42 ArticlePreviewController.prototype.showContent = function () {
... ...
src/app/index.constants.js
  Diff comments   View file @f277665
... ... @@ -4,9 +4,12 @@
4 4  
5 5 angular
6 6 .module('dialoga')
  7 + .constant('PATH', {
  8 + host: 'http://hom.dialoga.gov.br',
  9 + image: 'http://hom.login.dialoga.gov.br'
  10 + })
7 11 .constant('API', {
8 12 token: null,
9   - host: 'http://hom.dialoga.gov.br',
10 13 articleId: {
11 14 home: '103358',
12 15 about: '108073',
... ... @@ -37,7 +40,6 @@
37 40 })
38 41 .constant('Modernizr', window.Modernizr)
39 42 .constant('jQuery', window.jQuery)
40   - // .constant('key', value)
41 43 ;
42 44  
43 45 })();
... ...
src/app/index.run.js
  Diff comments   View file @f277665
... ... @@ -110,9 +110,8 @@
110 110 }
111 111  
112 112 /** @ngInject */
113   - function runPath($rootScope, API, $window, $log) {
114   - // $rootScope.basePath = API.host;
115   - $rootScope.basePath = '';
  113 + function runPath($rootScope, PATH, $window, $log) {
  114 + $rootScope.basePath = PATH.host;
116 115  
117 116 $log.debug('[RUN] Path end.');
118 117 }
... ...
src/app/pages/programas/programa-content.controller.js
  Diff comments   View file @f277665
... ... @@ -6,12 +6,13 @@
6 6 .controller('ProgramaContentPageController', ProgramaContentPageController);
7 7  
8 8 /** @ngInject */
9   - function ProgramaContentPageController(DialogaService, $state, $location, $scope, $rootScope, $element, $timeout, $log) {
  9 + function ProgramaContentPageController(DialogaService, PATH, $state, $location, $scope, $rootScope, $element, $timeout, $log) {
10 10 $log.debug('ProgramaContentPageController');
11 11  
12 12 var vm = this;
13 13  
14 14 vm.DialogaService = DialogaService;
  15 + vm.PATH = PATH;
15 16 vm.$state = $state;
16 17 vm.$location = $location;
17 18 vm.$scope = $scope;
... ... @@ -59,7 +60,7 @@
59 60 // set the banner image with full image path
60 61 if (!vm.banner) {
61 62 vm.banner = {
62   - src: vm.$rootScope.basePath + vm.article.image.url,
  63 + src: vm.PATH.image + vm.article.image.url,
63 64 alt: 'Imagem de destaque do conteúdo'
64 65 };
65 66 }
... ...