Browse Source

Merge c75d55ddda into a61ad61979

pull/247/merge
theurere 9 years ago committed by GitHub
parent
commit
e7d2af4138
  1. 8
      src/styles/components/_audiovideo.scss
  2. 1
      src/styles/global/_base.scss
  3. 7
      static/js/directives/audiovideo.js

8
src/styles/components/_audiovideo.scss

@ -71,6 +71,14 @@
} }
} }
.mainPresentation #audiovideo.fullscreen {
top: 51px !important;
}
.mainYoutubevideo #audiovideo.fullscreen {
top: 51px !important;
}
.audiovideo { .audiovideo {
bottom: 0; bottom: 0;
left: 0; left: 0;

1
src/styles/global/_base.scss

@ -42,6 +42,7 @@ body {
min-width: $buddylist-width; min-width: $buddylist-width;
position: absolute; position: absolute;
width: 100%; width: 100%;
left: 0;
} }
} }

7
static/js/directives/audiovideo.js

@ -240,8 +240,13 @@ define(['jquery', 'underscore', 'text!partials/audiovideo.html', 'text!partials/
$scope.toggleFullscreen = function() { $scope.toggleFullscreen = function() {
//console.log("Toggle full screen", BigScreen.enabled, $scope.isActive, $scope.hasUsermedia); //console.log("Toggle full screen", BigScreen.enabled, $scope.isActive, $scope.hasUsermedia);
var target = $scope.layoutparent[0];
// Display whole page in fullscreen when in specific layout modes
if ($scope.layout.presentation || $scope.layout.youtubevideo) {
target = null;
}
if (BigScreen.enabled && ($scope.isActive || $scope.hasUsermedia)) { if (BigScreen.enabled && ($scope.isActive || $scope.hasUsermedia)) {
BigScreen.toggle($scope.layoutparent[0], function() { BigScreen.toggle(target, function() {
// onEnter // onEnter
$scope.layoutparent.addClass("fullscreen"); $scope.layoutparent.addClass("fullscreen");
}, function() { }, function() {

Loading…
Cancel
Save