From f27766532ee24f46831e29e2b5ad1c1a61a12ee9 Mon Sep 17 00:00:00 2001 From: Leonardo Merlin Date: Wed, 9 Sep 2015 18:29:56 -0300 Subject: [PATCH] Fix path --- src/app/components/article-box/article-box.directive.js | 5 +++-- src/app/components/article-preview/article-preview.directive.js | 10 +++------- src/app/index.constants.js | 6 ++++-- src/app/index.run.js | 5 ++--- src/app/pages/programas/programa-content.controller.js | 5 +++-- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/app/components/article-box/article-box.directive.js b/src/app/components/article-box/article-box.directive.js index 700fe94..27ccf64 100644 --- a/src/app/components/article-box/article-box.directive.js +++ b/src/app/components/article-box/article-box.directive.js @@ -9,11 +9,12 @@ function articleBox($rootScope) { /** @ngInject */ - function ArticleBoxController($state, $log) { + function ArticleBoxController($state, PATH, $log) { $log.debug('ArticleBoxController'); var vm = this; vm.$state = $state; + vm.PATH = PATH; vm.$log = $log; vm.init(); @@ -32,7 +33,7 @@ if(!vm.image && vm.article.image){ vm.image = { - src: $rootScope.basePath + vm.article.image.url, + src: vm.PATH.image + vm.article.image.url, alt: 'Imagem de destaque do conteúdo' }; } diff --git a/src/app/components/article-preview/article-preview.directive.js b/src/app/components/article-preview/article-preview.directive.js index 2f54b23..94ad7c1 100644 --- a/src/app/components/article-preview/article-preview.directive.js +++ b/src/app/components/article-preview/article-preview.directive.js @@ -9,11 +9,12 @@ function articlePreview($rootScope) { /** @ngInject */ - function ArticlePreviewController($state, $log) { + function ArticlePreviewController($state, PATH, $log) { $log.debug('ArticlePreviewController'); var vm = this; vm.$state = $state; + vm.PATH = PATH; vm.$log = $log; vm.init(); @@ -32,15 +33,10 @@ if(!vm.banner){ vm.banner = { - src: $rootScope.basePath + vm.article.image.url, + src: vm.PATH.image + vm.article.image.url, alt: 'Imagem de destaque do programa' }; } - - // if(vm.article.color && !vm.article.bgColor){ - // // 15% more darker - // vm.article.colorDarker = window.ColorLuminance(vm.article.color, 0.15); - // } }; ArticlePreviewController.prototype.showContent = function () { diff --git a/src/app/index.constants.js b/src/app/index.constants.js index faf964e..39aacd3 100644 --- a/src/app/index.constants.js +++ b/src/app/index.constants.js @@ -4,9 +4,12 @@ angular .module('dialoga') + .constant('PATH', { + host: 'http://hom.dialoga.gov.br', + image: 'http://hom.login.dialoga.gov.br' + }) .constant('API', { token: null, - host: 'http://hom.dialoga.gov.br', articleId: { home: '103358', about: '108073', @@ -37,7 +40,6 @@ }) .constant('Modernizr', window.Modernizr) .constant('jQuery', window.jQuery) - // .constant('key', value) ; })(); diff --git a/src/app/index.run.js b/src/app/index.run.js index 63faa2b..394e620 100644 --- a/src/app/index.run.js +++ b/src/app/index.run.js @@ -110,9 +110,8 @@ } /** @ngInject */ - function runPath($rootScope, API, $window, $log) { - // $rootScope.basePath = API.host; - $rootScope.basePath = ''; + function runPath($rootScope, PATH, $window, $log) { + $rootScope.basePath = PATH.host; $log.debug('[RUN] Path end.'); } diff --git a/src/app/pages/programas/programa-content.controller.js b/src/app/pages/programas/programa-content.controller.js index 02ce88b..abfa2b3 100644 --- a/src/app/pages/programas/programa-content.controller.js +++ b/src/app/pages/programas/programa-content.controller.js @@ -6,12 +6,13 @@ .controller('ProgramaContentPageController', ProgramaContentPageController); /** @ngInject */ - function ProgramaContentPageController(DialogaService, $state, $location, $scope, $rootScope, $element, $timeout, $log) { + function ProgramaContentPageController(DialogaService, PATH, $state, $location, $scope, $rootScope, $element, $timeout, $log) { $log.debug('ProgramaContentPageController'); var vm = this; vm.DialogaService = DialogaService; + vm.PATH = PATH; vm.$state = $state; vm.$location = $location; vm.$scope = $scope; @@ -59,7 +60,7 @@ // set the banner image with full image path if (!vm.banner) { vm.banner = { - src: vm.$rootScope.basePath + vm.article.image.url, + src: vm.PATH.image + vm.article.image.url, alt: 'Imagem de destaque do conteúdo' }; } -- libgit2 0.21.2