apitech
/
jitsi-meet
mirror of https://github.com/jitsi/jitsi-meet
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renames config.minimized to config.filmStripOnly .

Browse Source
pull/334/merge
hristoterezov 10 years ago
parent b77791f4b2
commit 7793d65a99
6 changed files with 19 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      index.html
  2. 18
      libs/app.bundle.js
  3. 6
      modules/UI/UI.js
  4. 4
      modules/UI/toolbars/ToolbarToggler.js
  5. 2
      modules/UI/videolayout/RemoteVideo.js
  6. 6
      modules/UI/videolayout/VideoLayout.js

2
index.html
Unescape View File

@ -22,7 +22,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=121"></script>
<script src="libs/app.bundle.js?v=122"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1">

18
libs/app.bundle.js
Unescape View File

@ -3318,7 +3318,7 @@ function registerListeners() {
AudioLevels.init();
});
if (!config.minimized) {
if (!config.filmStripOnly) {
APP.xmpp.addListener(XMPPEvents.MESSAGE_RECEIVED, updateChatConversation);
APP.xmpp.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, chatAddError);
// Listens for video interruption events.
@ -3386,7 +3386,7 @@ UI.start = function (init) {
bindEvents();
setupPrezi();
if(!config.minimized) {
if(!config.filmStripOnly) {
$("#videospace").mousemove(function () {
return ToolbarToggler.showToolbar();
});
@ -3429,7 +3429,7 @@ UI.start = function (init) {
init();
if(!config.minimized) {
if(!config.filmStripOnly) {
toastr.options = {
"closeButton": true,
"debug": false,
@ -7234,7 +7234,7 @@ var ToolbarToggler = {
* Shows the main toolbar.
*/
showToolbar: function () {
if(config.minimized)
if(config.filmStripOnly)
return;
var header = $("#header"),
bottomToolbar = $("#bottomToolbar");
@ -7271,7 +7271,7 @@ var ToolbarToggler = {
* @param isDock indicates what operation to perform
*/
dockToolbar: function (isDock) {
if(config.minimized)
if(config.filmStripOnly)
return;
if (isDock) {
@ -9132,7 +9132,7 @@ RemoteVideo.prototype.addRemoteVideoContainer = function() {
* @param parentElement the parent element where this menu will be added
*/
if(!config.minimized) {
if(!config.filmStripOnly) {
RemoteVideo.prototype.addRemoteVideoMenu = function () {
var spanElement = document.createElement('span');
spanElement.className = 'remotevideomenu';
@ -9911,7 +9911,7 @@ var VideoLayout = (function (my) {
my.init = function (emitter) {
eventEmitter = emitter;
localVideoThumbnail = new LocalVideo(VideoLayout);
if(config.minimized)
if(config.filmStripOnly)
{
showLargeVideo = false;
LargeVideo.disable();
@ -10077,7 +10077,7 @@ var VideoLayout = (function (my) {
resourceJid) {
if(focusedVideoResourceJid) {
var oldSmallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
if(oldSmallVideo && !config.minimized)
if(oldSmallVideo && !config.filmStripOnly)
oldSmallVideo.focus(false);
}
@ -10104,7 +10104,7 @@ var VideoLayout = (function (my) {
// Update focused/pinned interface.
if (resourceJid) {
if(smallVideo && !config.minimized)
if(smallVideo && !config.filmStripOnly)
smallVideo.focus(true);
if (!noPinnedEndpointChangedEvent) {

6
modules/UI/UI.js
Unescape View File

@ -331,7 +331,7 @@ function registerListeners() {
AudioLevels.init();
});
if (!config.minimized) {
if (!config.filmStripOnly) {
APP.xmpp.addListener(XMPPEvents.MESSAGE_RECEIVED, updateChatConversation);
APP.xmpp.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, chatAddError);
// Listens for video interruption events.
@ -399,7 +399,7 @@ UI.start = function (init) {
bindEvents();
setupPrezi();
if(!config.minimized) {
if(!config.filmStripOnly) {
$("#videospace").mousemove(function () {
return ToolbarToggler.showToolbar();
});
@ -442,7 +442,7 @@ UI.start = function (init) {
init();
if(!config.minimized) {
if(!config.filmStripOnly) {
toastr.options = {
"closeButton": true,
"debug": false,

4
modules/UI/toolbars/ToolbarToggler.js
Unescape View File

@ -53,7 +53,7 @@ var ToolbarToggler = {
* Shows the main toolbar.
*/
showToolbar: function () {
if(config.minimized)
if(config.filmStripOnly)
return;
var header = $("#header"),
bottomToolbar = $("#bottomToolbar");
@ -90,7 +90,7 @@ var ToolbarToggler = {
* @param isDock indicates what operation to perform
*/
dockToolbar: function (isDock) {
if(config.minimized)
if(config.filmStripOnly)
return;
if (isDock) {

2
modules/UI/videolayout/RemoteVideo.js
Unescape View File

@ -43,7 +43,7 @@ RemoteVideo.prototype.addRemoteVideoContainer = function() {
* @param parentElement the parent element where this menu will be added
*/
if(!config.minimized) {
if(!config.filmStripOnly) {
RemoteVideo.prototype.addRemoteVideoMenu = function () {
var spanElement = document.createElement('span');
spanElement.className = 'remotevideomenu';

6
modules/UI/videolayout/VideoLayout.js
Unescape View File

@ -36,7 +36,7 @@ var VideoLayout = (function (my) {
my.init = function (emitter) {
eventEmitter = emitter;
localVideoThumbnail = new LocalVideo(VideoLayout);
if(config.minimized)
if(config.filmStripOnly)
{
showLargeVideo = false;
LargeVideo.disable();
@ -202,7 +202,7 @@ var VideoLayout = (function (my) {
resourceJid) {
if(focusedVideoResourceJid) {
var oldSmallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
if(oldSmallVideo && !config.minimized)
if(oldSmallVideo && !config.filmStripOnly)
oldSmallVideo.focus(false);
}
@ -229,7 +229,7 @@ var VideoLayout = (function (my) {
// Update focused/pinned interface.
if (resourceJid) {
if(smallVideo && !config.minimized)
if(smallVideo && !config.filmStripOnly)
smallVideo.focus(true);
if (!noPinnedEndpointChangedEvent) {

Write Preview
Loading…
Cancel
Save