提交 60625704 authored 作者: Ken Rice's avatar Ken Rice

Merge pull request #523 in FS/freeswitch from…

Merge pull request #523 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:bugfix/FS-8257-config-doesn-t-work-with-grunt-serve to master

* commit 'd8d7a9f3':
  FS-8257 #resolve [verto_communicator] fix config provision url
...@@ -130,6 +130,7 @@ module.exports = function (grunt) { ...@@ -130,6 +130,7 @@ module.exports = function (grunt) {
], ],
routes: { routes: {
'/partials': 'src/partials', '/partials': 'src/partials',
'/config.json': 'src/config.json',
'/bower_components': './bower_components', '/bower_components': './bower_components',
'/js/src': '../js/src', '/js/src': '../js/src',
'/js': './js' '/js': './js'
......
...@@ -25,7 +25,8 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', ' ...@@ -25,7 +25,8 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', '
* Load the Configs before logging in * Load the Configs before logging in
* with cache buster * with cache buster
*/ */
var httpRequest = $http.get(window.location.pathname + '/config.json?cachebuster=' + Math.floor((Math.random()*1000000)+1)); var url = window.location.origin + window.location.pathname;
var httpRequest = $http.get(url + 'config.json?cachebuster=' + Math.floor((Math.random()*1000000)+1));
var httpReturn = httpRequest.then(function(response) { var httpReturn = httpRequest.then(function(response) {
var data = response.data; var data = response.data;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论