Bladeren bron

Moves recording button related code to toolbar.js.

j8
Boris Grozev 11 jaren geleden
bovenliggende
commit
05975e30a3
2 gewijzigde bestanden met toevoegingen van 25 en 18 verwijderingen
  1. 6
    18
      app.js
  2. 19
    0
      toolbar.js

+ 6
- 18
app.js Bestand weergeven

636
             focus.setEndpointDisplayName(connection.emuc.myroomjid,
636
             focus.setEndpointDisplayName(connection.emuc.myroomjid,
637
                                          nickname);
637
                                          nickname);
638
         }
638
         }
639
-        showRecordingButton(false);
639
+        Toolbar.showRecordingButton(false);
640
     }
640
     }
641
 
641
 
642
     if (focus && config.etherpad_base) {
642
     if (focus && config.etherpad_base) {
668
         if (focus.confid === null) {
668
         if (focus.confid === null) {
669
             console.log('make new conference with', jid);
669
             console.log('make new conference with', jid);
670
             focus.makeConference(Object.keys(connection.emuc.members));
670
             focus.makeConference(Object.keys(connection.emuc.members));
671
-            showRecordingButton(true);
671
+            Toolbar.showRecordingButton(true);
672
         } else {
672
         } else {
673
             console.log('invite', jid, 'into conference');
673
             console.log('invite', jid, 'into conference');
674
             focus.addNewParticipant(jid);
674
             focus.addNewParticipant(jid);
721
 
721
 
722
         if (Object.keys(connection.emuc.members).length > 0) {
722
         if (Object.keys(connection.emuc.members).length > 0) {
723
             focus.makeConference(Object.keys(connection.emuc.members));
723
             focus.makeConference(Object.keys(connection.emuc.members));
724
-            showRecordingButton(true);
724
+            Toolbar.showRecordingButton(true);
725
         }
725
         }
726
         $(document).trigger('focusechanged.muc', [focus]);
726
         $(document).trigger('focusechanged.muc', [focus]);
727
     }
727
     }
735
             focus.setEndpointDisplayName(connection.emuc.myroomjid,
735
             focus.setEndpointDisplayName(connection.emuc.myroomjid,
736
                                          nickname);
736
                                          nickname);
737
         }
737
         }
738
-        showRecordingButton(false);
738
+        Toolbar.showRecordingButton(false);
739
     }
739
     }
740
     if (connection.emuc.getPrezi(jid)) {
740
     if (connection.emuc.getPrezi(jid)) {
741
         $(document).trigger('presentationremoved.muc',
741
         $(document).trigger('presentationremoved.muc',
943
     }
943
     }
944
 
944
 
945
     var oldState = focus.recordingEnabled;
945
     var oldState = focus.recordingEnabled;
946
-    $('#recordButton').toggleClass('active');
946
+    Toolbar.toggleRecordingButtonState();
947
     focus.setRecording(!oldState,
947
     focus.setRecording(!oldState,
948
                         recordingToken,
948
                         recordingToken,
949
                         function (state) {
949
                         function (state) {
950
                             console.log("New recording state: ", state);
950
                             console.log("New recording state: ", state);
951
                             if (state == oldState) //failed to change, reset the token because it might have been wrong
951
                             if (state == oldState) //failed to change, reset the token because it might have been wrong
952
                             {
952
                             {
953
-                                $('#recordButton').toggleClass('active');
953
+                                Toolbar.toggleRecordingButtonState();
954
                                 setRecordingToken(null);
954
                                 setRecordingToken(null);
955
                             }
955
                             }
956
                         }
956
                         }
1263
 //    }
1263
 //    }
1264
 }
1264
 }
1265
 
1265
 
1266
-function showRecordingButton(show) {
1267
-    if (!config.enableRecording) {
1268
-        return;
1269
-    }
1270
-
1271
-    if (show) {
1272
-        $('#recording').css({display: "inline"});
1273
-    }
1274
-    else {
1275
-        $('#recording').css({display: "none"});
1276
-    }
1277
 
1266
 
1278
-}
1279
 
1267
 
1280
 $(document).bind('fatalError.jingle',
1268
 $(document).bind('fatalError.jingle',
1281
     function (event, session, error)
1269
     function (event, session, error)

+ 19
- 0
toolbar.js Bestand weergeven

284
         }
284
         }
285
     };
285
     };
286
 
286
 
287
+    // Shows or hides the 'recording' button.
288
+    my.showRecordingButton = function (show) {
289
+        if (!config.enableRecording) {
290
+            return;
291
+        }
292
+
293
+        if (show) {
294
+            $('#recording').css({display: "inline"});
295
+        }
296
+        else {
297
+            $('#recording').css({display: "none"});
298
+        }
299
+    };
300
+
301
+    // Toggle the state of the recording button
302
+    my.toggleRecordingButtonState = function() {
303
+        $('#recordButton').toggleClass('active');
304
+    };
305
+
287
     return my;
306
     return my;
288
 }(Toolbar || {}));
307
 }(Toolbar || {}));

Laden…
Annuleren
Opslaan