kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-22 20:04:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #539 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:bugfix/FS-8291-fix-contributors-url to master

Browse Source 
* commit 'ae2583fd1bfda3983952789f431975cde51e072f':
  FS-8291 [verto_communicator] fix contributors url
This commit is contained in:
Ken Rice 2015-10-02 17:39:06 -05:00
commit 68a0e507e2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
html5/verto/verto_communicator/src/vertoControllers/controllers/ContributorsController.js
View File

@ -6,7 +6,8 @@
.controller('ContributorsController', ['$scope', '$http', .controller('ContributorsController', ['$scope', '$http',
'toastr', 'toastr',
function($scope, $http, toastr) { function($scope, $http, toastr) {
$http.get(window.location.pathname + '/contributors.txt') var url = window.location.origin + window.location.pathname;
$http.get(url + 'contributors.txt')
.success(function(data) { .success(function(data) {
var contributors = []; var contributors = [];