kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit 'd8d7a9f352a2fae5e12633470326d7eba59e94b8':
  FS-8257 #resolve [verto_communicator] fix config provision url
This commit is contained in:
Ken Rice 2015-09-30 14:11:51 -05:00
parent 0c5a97739e d8d7a9f352
commit 6062570427
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
html5/verto/verto_communicator/Gruntfile.js
View File

@ -130,6 +130,7 @@ module.exports = function (grunt) {
],
routes: {
'/partials': 'src/partials',
'/config.json': 'src/config.json',
'/bower_components': './bower_components',
'/js/src': '../js/src',
'/js': './js'

3
html5/verto/verto_communicator/src/vertoService/services/configService.js
View File

@ -25,7 +25,8 @@ vertoService.service('config', ['$rootScope', '$http', '$location', 'storage', '
* Load the Configs before logging in
* 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 data = response.data;