Selaa lähdekoodia

Renames config.minimized to config.filmStripOnly .

master
hristoterezov 10 vuotta sitten
vanhempi
commit
7793d65a99

+ 1
- 1
index.html Näytä tiedosto

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

+ 9
- 9
libs/app.bundle.js Näytä tiedosto

@@ -3318,7 +3318,7 @@ function registerListeners() {
3318 3318
         AudioLevels.init();
3319 3319
     });
3320 3320
 
3321
-    if (!config.minimized) {
3321
+    if (!config.filmStripOnly) {
3322 3322
         APP.xmpp.addListener(XMPPEvents.MESSAGE_RECEIVED, updateChatConversation);
3323 3323
         APP.xmpp.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, chatAddError);
3324 3324
         // Listens for video interruption events.
@@ -3386,7 +3386,7 @@ UI.start = function (init) {
3386 3386
 
3387 3387
     bindEvents();
3388 3388
     setupPrezi();
3389
-    if(!config.minimized) {
3389
+    if(!config.filmStripOnly) {
3390 3390
         $("#videospace").mousemove(function () {
3391 3391
             return ToolbarToggler.showToolbar();
3392 3392
         });
@@ -3429,7 +3429,7 @@ UI.start = function (init) {
3429 3429
 
3430 3430
     init();
3431 3431
 
3432
-    if(!config.minimized) {
3432
+    if(!config.filmStripOnly) {
3433 3433
         toastr.options = {
3434 3434
             "closeButton": true,
3435 3435
             "debug": false,
@@ -7234,7 +7234,7 @@ var ToolbarToggler = {
7234 7234
      * Shows the main toolbar.
7235 7235
      */
7236 7236
     showToolbar: function () {
7237
-        if(config.minimized)
7237
+        if(config.filmStripOnly)
7238 7238
             return;
7239 7239
         var header = $("#header"),
7240 7240
             bottomToolbar = $("#bottomToolbar");
@@ -7271,7 +7271,7 @@ var ToolbarToggler = {
7271 7271
      * @param isDock indicates what operation to perform
7272 7272
      */
7273 7273
     dockToolbar: function (isDock) {
7274
-        if(config.minimized)
7274
+        if(config.filmStripOnly)
7275 7275
             return;
7276 7276
 
7277 7277
         if (isDock) {
@@ -9132,7 +9132,7 @@ RemoteVideo.prototype.addRemoteVideoContainer = function() {
9132 9132
  * @param parentElement the parent element where this menu will be added
9133 9133
  */
9134 9134
 
9135
-if(!config.minimized) {
9135
+if(!config.filmStripOnly) {
9136 9136
     RemoteVideo.prototype.addRemoteVideoMenu = function () {
9137 9137
         var spanElement = document.createElement('span');
9138 9138
         spanElement.className = 'remotevideomenu';
@@ -9911,7 +9911,7 @@ var VideoLayout = (function (my) {
9911 9911
     my.init = function (emitter) {
9912 9912
         eventEmitter = emitter;
9913 9913
         localVideoThumbnail = new LocalVideo(VideoLayout);
9914
-        if(config.minimized)
9914
+        if(config.filmStripOnly)
9915 9915
         {
9916 9916
             showLargeVideo = false;
9917 9917
             LargeVideo.disable();
@@ -10077,7 +10077,7 @@ var VideoLayout = (function (my) {
10077 10077
                                           resourceJid) {
10078 10078
         if(focusedVideoResourceJid) {
10079 10079
             var oldSmallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
10080
-            if(oldSmallVideo && !config.minimized)
10080
+            if(oldSmallVideo && !config.filmStripOnly)
10081 10081
                 oldSmallVideo.focus(false);
10082 10082
         }
10083 10083
 
@@ -10104,7 +10104,7 @@ var VideoLayout = (function (my) {
10104 10104
 
10105 10105
         // Update focused/pinned interface.
10106 10106
         if (resourceJid) {
10107
-            if(smallVideo && !config.minimized)
10107
+            if(smallVideo && !config.filmStripOnly)
10108 10108
                 smallVideo.focus(true);
10109 10109
 
10110 10110
             if (!noPinnedEndpointChangedEvent) {

+ 3
- 3
modules/UI/UI.js Näytä tiedosto

@@ -331,7 +331,7 @@ function registerListeners() {
331 331
         AudioLevels.init();
332 332
     });
333 333
 
334
-    if (!config.minimized) {
334
+    if (!config.filmStripOnly) {
335 335
         APP.xmpp.addListener(XMPPEvents.MESSAGE_RECEIVED, updateChatConversation);
336 336
         APP.xmpp.addListener(XMPPEvents.CHAT_ERROR_RECEIVED, chatAddError);
337 337
         // Listens for video interruption events.
@@ -399,7 +399,7 @@ UI.start = function (init) {
399 399
 
400 400
     bindEvents();
401 401
     setupPrezi();
402
-    if(!config.minimized) {
402
+    if(!config.filmStripOnly) {
403 403
         $("#videospace").mousemove(function () {
404 404
             return ToolbarToggler.showToolbar();
405 405
         });
@@ -442,7 +442,7 @@ UI.start = function (init) {
442 442
 
443 443
     init();
444 444
 
445
-    if(!config.minimized) {
445
+    if(!config.filmStripOnly) {
446 446
         toastr.options = {
447 447
             "closeButton": true,
448 448
             "debug": false,

+ 2
- 2
modules/UI/toolbars/ToolbarToggler.js Näytä tiedosto

@@ -53,7 +53,7 @@ var ToolbarToggler = {
53 53
      * Shows the main toolbar.
54 54
      */
55 55
     showToolbar: function () {
56
-        if(config.minimized)
56
+        if(config.filmStripOnly)
57 57
             return;
58 58
         var header = $("#header"),
59 59
             bottomToolbar = $("#bottomToolbar");
@@ -90,7 +90,7 @@ var ToolbarToggler = {
90 90
      * @param isDock indicates what operation to perform
91 91
      */
92 92
     dockToolbar: function (isDock) {
93
-        if(config.minimized)
93
+        if(config.filmStripOnly)
94 94
             return;
95 95
 
96 96
         if (isDock) {

+ 1
- 1
modules/UI/videolayout/RemoteVideo.js Näytä tiedosto

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

+ 3
- 3
modules/UI/videolayout/VideoLayout.js Näytä tiedosto

@@ -36,7 +36,7 @@ var VideoLayout = (function (my) {
36 36
     my.init = function (emitter) {
37 37
         eventEmitter = emitter;
38 38
         localVideoThumbnail = new LocalVideo(VideoLayout);
39
-        if(config.minimized)
39
+        if(config.filmStripOnly)
40 40
         {
41 41
             showLargeVideo = false;
42 42
             LargeVideo.disable();
@@ -202,7 +202,7 @@ var VideoLayout = (function (my) {
202 202
                                           resourceJid) {
203 203
         if(focusedVideoResourceJid) {
204 204
             var oldSmallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
205
-            if(oldSmallVideo && !config.minimized)
205
+            if(oldSmallVideo && !config.filmStripOnly)
206 206
                 oldSmallVideo.focus(false);
207 207
         }
208 208
 
@@ -229,7 +229,7 @@ var VideoLayout = (function (my) {
229 229
 
230 230
         // Update focused/pinned interface.
231 231
         if (resourceJid) {
232
-            if(smallVideo && !config.minimized)
232
+            if(smallVideo && !config.filmStripOnly)
233 233
                 smallVideo.focus(true);
234 234
 
235 235
             if (!noPinnedEndpointChangedEvent) {

Loading…
Peruuta
Tallenna