haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renames config.minimized to config.filmStripOnly .

This commit is contained in:
hristoterezov 2015-08-06 18:59:51 -05:00
parent b77791f4b2
commit 7793d65a99
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

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

18
libs/app.bundle.js
View File

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

6
modules/UI/UI.js
View File

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

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

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

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

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

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

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