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

Merge pull request #417 in FS/freeswitch from ~JONATASOLIVEIRA/freeswitch:FS-8022-clicking-refresh-device-list-should to master 

* commit 'ea4fe4f942e73fa2b7595399523054b8e09840d8':
  FS-8022 - fix refresh devices and prevent reset previous selected configuration
This commit is contained in:
Ítalo Rossi 2015-08-21 12:41:25 -05:00
parent 4e79ac1363 ea4fe4f942
commit 175fb8667e
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html5/verto/verto_communicator/js/controllers.js
View File

@ -676,7 +676,7 @@ vertoControllers.controller('ModalSettingsController', ['$scope', '$http',
}; };
$scope.refreshDeviceList = function() { $scope.refreshDeviceList = function() {
verto.refreshDevices(); return verto.refreshDevices();
} }
} }
]); ]);

4
html5/verto/verto_communicator/js/verto-service.js
View File

@ -248,10 +248,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}]; }];
data.audioDevices = []; data.audioDevices = [];
data.selectedVideo = 'none';
data.selectedShare = 'screen';
data.selectedAudio = null;
for (var i in jQuery.verto.videoDevices) { for (var i in jQuery.verto.videoDevices) {
var device = jQuery.verto.videoDevices[i]; var device = jQuery.verto.videoDevices[i];
if (!device.label) { if (!device.label) {