Przeglądaj źródła

Renames config.minimized to config.filmStripOnly .

master
hristoterezov 10 lat temu
rodzic
commit
7793d65a99

+ 1
- 1
index.html Wyświetl plik

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

+ 9
- 9
libs/app.bundle.js Wyświetl plik

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

+ 3
- 3
modules/UI/UI.js Wyświetl plik

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

+ 2
- 2
modules/UI/toolbars/ToolbarToggler.js Wyświetl plik

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

+ 1
- 1
modules/UI/videolayout/RemoteVideo.js Wyświetl plik

43
  * @param parentElement the parent element where this menu will be added
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
     RemoteVideo.prototype.addRemoteVideoMenu = function () {
47
     RemoteVideo.prototype.addRemoteVideoMenu = function () {
48
         var spanElement = document.createElement('span');
48
         var spanElement = document.createElement('span');
49
         spanElement.className = 'remotevideomenu';
49
         spanElement.className = 'remotevideomenu';

+ 3
- 3
modules/UI/videolayout/VideoLayout.js Wyświetl plik

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

Ładowanie…
Anuluj
Zapisz