ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-14 05:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:bugfix/FS-8089-pop-out-member-list-on-conference to master

Browse Source 
* commit 'f7ba4c440279fbefda1e61052a4960909ed3ff74':
  FS-8089 [verto_communicator] Opening members list when start conference
This commit is contained in:
Ítalo Rossi committed 2015-09-22 09:02:17 -05:00
2 parents 64a2e68201 f7ba4c4402
commit a96290291b
3 files changed
+18 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
+8 -10
View File
@@ -12,7 +12,7 @@
$scope.verto = verto;
$scope.storage = storage;
$scope.call_history = angular.element("#call_history").hasClass('active');
$scope.chatStatus = angular.element('#wrapper').hasClass('toggled');
$rootScope.chatStatus = angular.element('#wrapper').hasClass('toggled');
/**
* (explanation) scope in another controller extends rootScope (singleton)
@@ -202,20 +202,20 @@
};
$scope.toggleChat = function() {
if ($scope.chatStatus && $rootScope.activePane === 'chat') {
if ($rootScope.chatStatus && $rootScope.activePane === 'chat') {
$rootScope.chat_counter = 0;
}
angular.element('#wrapper').toggleClass('toggled');
$scope.chatStatus = angular.element('#wrapper').hasClass('toggled');
$rootScope.chatStatus = angular.element('#wrapper').hasClass('toggled');
};
$scope.openChat = function() {
$scope.chatStatus = false;
$rootScope.openChat = function() {
$rootScope.chatStatus = false;
angular.element('#wrapper').removeClass('toggled');
};
$scope.closeChat = function() {
$scope.chatStatus = true;
$rootScope.chatStatus = true;
angular.element('#wrapper').addClass('toggled');
};
@@ -240,11 +240,9 @@
Fullscreen.cancel();
}
console.log($scope.chatStatus);
if (!$scope.chatStatus) {
if (!$rootScope.chatStatus) {
angular.element('#wrapper').toggleClass('toggled');
$scope.chatStatus = angular.element('#wrapper').hasClass('toggled');
$rootScope.chatStatus = angular.element('#wrapper').hasClass('toggled');
}
$rootScope.dialpadNumber = '';