Browse Source

Approach consistent filmstrip naming

We seemed to be using the names "film strip" and "filmstrip" (and,
consequently, their source code-conscious forms such as film-strip,
FilmStrip, etc.) In order to comply with our coding style which requires
a consistent one name for a given abstraction, choose one name and
rename the uses of the other name.

Wikipedia has a definition of a "filmstrip", I couldn't find a "film
strip". I guess our abstraction can be seen as what's described there.
When I google "film strip", I get results about "filmstrip" at the top.
That's why I chose "filmstrip".

Certain uses of "film strip" such as interfaceConfig.filmStripOnly and
in the external API I left untouched in an attempt to preserve
compatibility.

I wasn't sure whether CSS was tangled in compatibility so I made a
choice and renamed there was well.
j8
Lyubo Marinov 8 years ago
parent
commit
a9bdde193d
33 changed files with 192 additions and 187 deletions
  1. 2
    2
      css/overlay/_overlay.scss
  2. 1
    1
      css/themes/_light.scss
  3. 2
    2
      doc/api.md
  4. 1
    1
      modules/API/API.js
  5. 2
    2
      modules/API/external/external_api.js
  6. 27
    27
      modules/FollowMe.js
  7. 15
    15
      modules/UI/UI.js
  8. 2
    2
      modules/UI/etherpad/Etherpad.js
  9. 2
    2
      modules/UI/shared_video/SharedVideo.js
  10. 51
    51
      modules/UI/videolayout/Filmstrip.js
  11. 2
    2
      modules/UI/videolayout/VideoContainer.js
  12. 5
    5
      modules/UI/videolayout/VideoLayout.js
  13. 3
    3
      react/features/conference/components/Conference.native.js
  14. 0
    1
      react/features/film-strip/components/index.js
  15. 10
    10
      react/features/filmstrip/components/Filmstrip.js
  16. 1
    1
      react/features/filmstrip/components/Thumbnail.js
  17. 0
    0
      react/features/filmstrip/components/_.native.js
  18. 1
    0
      react/features/filmstrip/components/index.js
  19. 0
    0
      react/features/filmstrip/components/native/AudioMutedIndicator.js
  20. 0
    0
      react/features/filmstrip/components/native/DominantSpeakerIndicator.js
  21. 0
    0
      react/features/filmstrip/components/native/ModeratorIndicator.js
  22. 0
    0
      react/features/filmstrip/components/native/VideoMutedIndicator.js
  23. 0
    0
      react/features/filmstrip/components/native/index.js
  24. 1
    1
      react/features/filmstrip/components/native/styles.js
  25. 5
    5
      react/features/filmstrip/components/styles.js
  26. 0
    0
      react/features/filmstrip/index.js
  27. 4
    4
      react/features/overlay/components/FilmstripOnlyOverlayFrame.js
  28. 23
    18
      react/features/overlay/components/OverlayContainer.js
  29. 3
    3
      react/features/overlay/components/OverlayFrame.js
  30. 6
    6
      react/features/overlay/components/PageReloadFilmstripOnlyOverlay.js
  31. 6
    6
      react/features/overlay/components/SuspendedFilmstripOnlyOverlay.js
  32. 6
    6
      react/features/overlay/components/UserMediaPermissionsFilmstripOnlyOverlay.js
  33. 11
    11
      service/UI/UIEvents.js

+ 2
- 2
css/overlay/_overlay.scss View File

9
         z-index: $overlayZ;
9
         z-index: $overlayZ;
10
         background: $defaultBackground;
10
         background: $defaultBackground;
11
         &.filmstrip-only {
11
         &.filmstrip-only {
12
-            @include transparentBg($filmStripOnlyOverlayBg, 0.8);
12
+            @include transparentBg($filmstripOnlyOverlayBg, 0.8);
13
         }
13
         }
14
     }
14
     }
15
 
15
 
16
     &__container-light {
16
     &__container-light {
17
         @include transparentBg($defaultBackground, 0.7);
17
         @include transparentBg($defaultBackground, 0.7);
18
         &.filmstrip-only {
18
         &.filmstrip-only {
19
-            @include transparentBg($filmStripOnlyOverlayBg, 0.2);
19
+            @include transparentBg($filmstripOnlyOverlayBg, 0.2);
20
         }
20
         }
21
     }
21
     }
22
 
22
 

+ 1
- 1
css/themes/_light.scss View File

41
 * Color variables
41
 * Color variables
42
 **/
42
 **/
43
 $defaultBackground: #474747;
43
 $defaultBackground: #474747;
44
-$filmStripOnlyOverlayBg: #000;
44
+$filmstripOnlyOverlayBg: #000;
45
 $reloadProgressBarBg: #0074E0;
45
 $reloadProgressBarBg: #0074E0;
46
 
46
 
47
 /**
47
 /**

+ 2
- 2
doc/api.md View File

44
 ```
44
 ```
45
 
45
 
46
 You can overwrite options set in [config.js] and [interface_config.js].
46
 You can overwrite options set in [config.js] and [interface_config.js].
47
-For example, to enable the film-strip-only interface mode, you can use:
47
+For example, to enable the filmstrip-only interface mode, you can use:
48
 
48
 
49
 ```javascript
49
 ```javascript
50
 var interfaceConfigOverwrite = {filmStripOnly: true};
50
 var interfaceConfigOverwrite = {filmStripOnly: true};
84
 api.executeCommand('toggleVideo')
84
 api.executeCommand('toggleVideo')
85
 ```
85
 ```
86
 
86
 
87
-* **toggleFilmStrip** - Hides / shows the film strip. No arguments are required.
87
+* **toggleFilmStrip** - Hides / shows the filmstrip. No arguments are required.
88
 ```javascript
88
 ```javascript
89
 api.executeCommand('toggleFilmStrip')
89
 api.executeCommand('toggleFilmStrip')
90
 ```
90
 ```

+ 1
- 1
modules/API/API.js View File

49
             APP.conference.changeLocalDisplayName.bind(APP.conference),
49
             APP.conference.changeLocalDisplayName.bind(APP.conference),
50
         "toggle-audio": APP.conference.toggleAudioMuted.bind(APP.conference),
50
         "toggle-audio": APP.conference.toggleAudioMuted.bind(APP.conference),
51
         "toggle-video": APP.conference.toggleVideoMuted.bind(APP.conference),
51
         "toggle-video": APP.conference.toggleVideoMuted.bind(APP.conference),
52
-        "toggle-film-strip": APP.UI.toggleFilmStrip,
52
+        "toggle-film-strip": APP.UI.toggleFilmstrip,
53
         "toggle-chat": APP.UI.toggleChat,
53
         "toggle-chat": APP.UI.toggleChat,
54
         "toggle-contact-list": APP.UI.toggleContactList,
54
         "toggle-contact-list": APP.UI.toggleContactList,
55
         "toggle-share-screen":
55
         "toggle-share-screen":

+ 2
- 2
modules/API/external/external_api.js View File

337
      * passed in the arguments array.
337
      * passed in the arguments array.
338
      * toggleAudio - mutes / unmutes audio with no arguments.
338
      * toggleAudio - mutes / unmutes audio with no arguments.
339
      * toggleVideo - mutes / unmutes video with no arguments.
339
      * toggleVideo - mutes / unmutes video with no arguments.
340
-     * filmStrip - hides / shows the film strip with no arguments.
340
+     * toggleFilmStrip - hides / shows the filmstrip with no arguments.
341
      * If the command doesn't require any arguments the parameter should be set
341
      * If the command doesn't require any arguments the parameter should be set
342
      * to empty array or it may be omitted.
342
      * to empty array or it may be omitted.
343
      *
343
      *
362
      * passed in the arguments array.
362
      * passed in the arguments array.
363
      * toggleAudio - mutes / unmutes audio. no arguments
363
      * toggleAudio - mutes / unmutes audio. no arguments
364
      * toggleVideo - mutes / unmutes video. no arguments
364
      * toggleVideo - mutes / unmutes video. no arguments
365
-     * filmStrip - hides / shows the film strip. no arguments
365
+     * toggleFilmStrip - hides / shows the filmstrip. no arguments
366
      * toggleChat - hides / shows chat. no arguments.
366
      * toggleChat - hides / shows chat. no arguments.
367
      * toggleContactList - hides / shows contact list. no arguments.
367
      * toggleContactList - hides / shows contact list. no arguments.
368
      * toggleShareScreen - starts / stops screen sharing. no arguments.
368
      * toggleShareScreen - starts / stops screen sharing. no arguments.

+ 27
- 27
modules/FollowMe.js View File

54
         this._propertyChangeCallback = propertyChangeCallback;
54
         this._propertyChangeCallback = propertyChangeCallback;
55
     }
55
     }
56
 
56
 
57
-    get filmStripVisible () { return this._filmStripVisible; }
57
+    get filmstripVisible () { return this._filmstripVisible; }
58
 
58
 
59
-    set filmStripVisible (b) {
60
-        var oldValue = this._filmStripVisible;
59
+    set filmstripVisible (b) {
60
+        var oldValue = this._filmstripVisible;
61
         if (oldValue !== b) {
61
         if (oldValue !== b) {
62
-            this._filmStripVisible = b;
63
-            this._firePropertyChange('filmStripVisible', oldValue, b);
62
+            this._filmstripVisible = b;
63
+            this._firePropertyChange('filmstripVisible', oldValue, b);
64
         }
64
         }
65
     }
65
     }
66
 
66
 
102
 
102
 
103
 /**
103
 /**
104
  * Represents the "Follow Me" feature which enables a moderator to
104
  * Represents the "Follow Me" feature which enables a moderator to
105
- * (partially) control the user experience/interface (e.g. film strip
105
+ * (partially) control the user experience/interface (e.g. filmstrip
106
  * visibility) of (other) non-moderator particiapnts.
106
  * visibility) of (other) non-moderator particiapnts.
107
  *
107
  *
108
  * @author Lyubomir Marinov
108
  * @author Lyubomir Marinov
143
      * @private
143
      * @private
144
      */
144
      */
145
     _setFollowMeInitialState() {
145
     _setFollowMeInitialState() {
146
-        this._filmStripToggled.bind(this, this._UI.isFilmStripVisible());
146
+        this._filmstripToggled.bind(this, this._UI.isFilmstripVisible());
147
 
147
 
148
         var pinnedId = VideoLayout.getPinnedId();
148
         var pinnedId = VideoLayout.getPinnedId();
149
         var isPinned = false;
149
         var isPinned = false;
169
      * @private
169
      * @private
170
      */
170
      */
171
     _addFollowMeListeners () {
171
     _addFollowMeListeners () {
172
-        this.filmStripEventHandler = this._filmStripToggled.bind(this);
173
-        this._UI.addListener(UIEvents.TOGGLED_FILM_STRIP,
174
-                            this.filmStripEventHandler);
172
+        this.filmstripEventHandler = this._filmstripToggled.bind(this);
173
+        this._UI.addListener(UIEvents.TOGGLED_FILMSTRIP,
174
+                            this.filmstripEventHandler);
175
 
175
 
176
         var self = this;
176
         var self = this;
177
         this.pinnedEndpointEventHandler = function (smallVideo, isPinned) {
177
         this.pinnedEndpointEventHandler = function (smallVideo, isPinned) {
190
      * @private
190
      * @private
191
      */
191
      */
192
     _removeFollowMeListeners () {
192
     _removeFollowMeListeners () {
193
-        this._UI.removeListener(UIEvents.TOGGLED_FILM_STRIP,
194
-                                this.filmStripEventHandler);
193
+        this._UI.removeListener(UIEvents.TOGGLED_FILMSTRIP,
194
+                                this.filmstripEventHandler);
195
         this._UI.removeListener(UIEvents.TOGGLED_SHARED_DOCUMENT,
195
         this._UI.removeListener(UIEvents.TOGGLED_SHARED_DOCUMENT,
196
                                 this.sharedDocEventHandler);
196
                                 this.sharedDocEventHandler);
197
         this._UI.removeListener(UIEvents.PINNED_ENDPOINT,
197
         this._UI.removeListener(UIEvents.PINNED_ENDPOINT,
214
     }
214
     }
215
 
215
 
216
     /**
216
     /**
217
-     * Notifies this instance that the (visibility of the) film strip was
217
+     * Notifies this instance that the (visibility of the) filmstrip was
218
      * toggled (in the user interface of the local participant).
218
      * toggled (in the user interface of the local participant).
219
      *
219
      *
220
-     * @param filmStripVisible {Boolean} {true} if the film strip was shown (as
221
-     * a result of the toggle) or {false} if the film strip was hidden
220
+     * @param filmstripVisible {Boolean} {true} if the filmstrip was shown (as a
221
+     * result of the toggle) or {false} if the filmstrip was hidden
222
      */
222
      */
223
-    _filmStripToggled (filmStripVisible) {
224
-        this._local.filmStripVisible = filmStripVisible;
223
+    _filmstripToggled (filmstripVisible) {
224
+        this._local.filmstripVisible = filmstripVisible;
225
     }
225
     }
226
 
226
 
227
     /**
227
     /**
279
                 _COMMAND,
279
                 _COMMAND,
280
                 {
280
                 {
281
                     attributes: {
281
                     attributes: {
282
-                        filmStripVisible: local.filmStripVisible,
282
+                        filmstripVisible: local.filmstripVisible,
283
                         nextOnStage: local.nextOnStage,
283
                         nextOnStage: local.nextOnStage,
284
                         sharedDocumentVisible: local.sharedDocumentVisible
284
                         sharedDocumentVisible: local.sharedDocumentVisible
285
                     }
285
                     }
316
 
316
 
317
         // Applies the received/remote command to the user experience/interface
317
         // Applies the received/remote command to the user experience/interface
318
         // of the local participant.
318
         // of the local participant.
319
-        this._onFilmStripVisible(attributes.filmStripVisible);
319
+        this._onFilmstripVisible(attributes.filmstripVisible);
320
         this._onNextOnStage(attributes.nextOnStage);
320
         this._onNextOnStage(attributes.nextOnStage);
321
         this._onSharedDocumentVisible(attributes.sharedDocumentVisible);
321
         this._onSharedDocumentVisible(attributes.sharedDocumentVisible);
322
     }
322
     }
323
 
323
 
324
     /**
324
     /**
325
-     * Process a film strip open / close event received from FOLLOW-ME
325
+     * Process a filmstrip open / close event received from FOLLOW-ME
326
      * command.
326
      * command.
327
-     * @param filmStripVisible indicates if the film strip has been shown or
327
+     * @param filmstripVisible indicates if the filmstrip has been shown or
328
      * hidden
328
      * hidden
329
      * @private
329
      * @private
330
      */
330
      */
331
-    _onFilmStripVisible(filmStripVisible) {
332
-        if (typeof filmStripVisible !== 'undefined') {
331
+    _onFilmstripVisible(filmstripVisible) {
332
+        if (typeof filmstripVisible !== 'undefined') {
333
             // XXX The Command(s) API doesn't preserve the types (of
333
             // XXX The Command(s) API doesn't preserve the types (of
334
             // attributes, at least) at the time of this writing so take into
334
             // attributes, at least) at the time of this writing so take into
335
             // account that what originated as a Boolean may be a String on
335
             // account that what originated as a Boolean may be a String on
336
             // receipt.
336
             // receipt.
337
-            filmStripVisible = (filmStripVisible == 'true');
337
+            filmstripVisible = (filmstripVisible == 'true');
338
 
338
 
339
             // FIXME The UI (module) very likely doesn't (want to) expose its
339
             // FIXME The UI (module) very likely doesn't (want to) expose its
340
             // eventEmitter as a public field. I'm not sure at the time of this
340
             // eventEmitter as a public field. I'm not sure at the time of this
341
-            // writing whether calling UI.toggleFilmStrip() is acceptable (from
341
+            // writing whether calling UI.toggleFilmstrip() is acceptable (from
342
             // a design standpoint) either.
342
             // a design standpoint) either.
343
-            if (filmStripVisible !== this._UI.isFilmStripVisible())
344
-                this._UI.eventEmitter.emit(UIEvents.TOGGLE_FILM_STRIP);
343
+            if (filmstripVisible !== this._UI.isFilmstripVisible())
344
+                this._UI.eventEmitter.emit(UIEvents.TOGGLE_FILMSTRIP);
345
         }
345
         }
346
     }
346
     }
347
 
347
 

+ 15
- 15
modules/UI/UI.js View File

15
 import Recording from "./recording/Recording";
15
 import Recording from "./recording/Recording";
16
 
16
 
17
 import VideoLayout from "./videolayout/VideoLayout";
17
 import VideoLayout from "./videolayout/VideoLayout";
18
-import FilmStrip from "./videolayout/FilmStrip";
18
+import Filmstrip from "./videolayout/Filmstrip";
19
 import SettingsMenu from "./side_pannels/settings/SettingsMenu";
19
 import SettingsMenu from "./side_pannels/settings/SettingsMenu";
20
 import Profile from "./side_pannels/profile/Profile";
20
 import Profile from "./side_pannels/profile/Profile";
21
 import Settings from "./../settings/Settings";
21
 import Settings from "./../settings/Settings";
258
 /***
258
 /***
259
  * Handler for toggling filmstrip
259
  * Handler for toggling filmstrip
260
  */
260
  */
261
-UI.handleToggleFilmStrip = () => UI.toggleFilmStrip();
261
+UI.handleToggleFilmstrip = () => UI.toggleFilmstrip();
262
 
262
 
263
 /**
263
 /**
264
  * Sets tooltip defaults.
264
  * Sets tooltip defaults.
300
     _setTooltipDefaults();
300
     _setTooltipDefaults();
301
 
301
 
302
     SideContainerToggler.init(eventEmitter);
302
     SideContainerToggler.init(eventEmitter);
303
-    FilmStrip.init(eventEmitter);
303
+    Filmstrip.init(eventEmitter);
304
 
304
 
305
     VideoLayout.init(eventEmitter);
305
     VideoLayout.init(eventEmitter);
306
     if (!interfaceConfig.filmStripOnly) {
306
     if (!interfaceConfig.filmStripOnly) {
323
     } else {
323
     } else {
324
         $("body").addClass("filmstrip-only");
324
         $("body").addClass("filmstrip-only");
325
         UI.showToolbar();
325
         UI.showToolbar();
326
-        FilmStrip.setFilmStripOnly();
326
+        Filmstrip.setFilmstripOnly();
327
         messageHandler.enableNotifications(false);
327
         messageHandler.enableNotifications(false);
328
         JitsiPopover.enabled = false;
328
         JitsiPopover.enabled = false;
329
     }
329
     }
575
 UI.toggleSmileys = () => Chat.toggleSmileys();
575
 UI.toggleSmileys = () => Chat.toggleSmileys();
576
 
576
 
577
 /**
577
 /**
578
- * Toggles film strip.
578
+ * Toggles filmstrip.
579
  */
579
  */
580
-UI.toggleFilmStrip = function () {
581
-    var self = FilmStrip;
582
-    self.toggleFilmStrip.apply(self, arguments);
580
+UI.toggleFilmstrip = function () {
581
+    var self = Filmstrip;
582
+    self.toggleFilmstrip.apply(self, arguments);
583
     VideoLayout.resizeVideoArea(true, false);
583
     VideoLayout.resizeVideoArea(true, false);
584
 };
584
 };
585
 
585
 
586
 /**
586
 /**
587
- * Indicates if the film strip is currently visible or not.
588
- * @returns {true} if the film strip is currently visible, otherwise
587
+ * Indicates if the filmstrip is currently visible or not.
588
+ * @returns {true} if the filmstrip is currently visible, otherwise
589
  */
589
  */
590
-UI.isFilmStripVisible = () => FilmStrip.isFilmStripVisible();
590
+UI.isFilmstripVisible = () => Filmstrip.isFilmstripVisible();
591
 
591
 
592
 /**
592
 /**
593
  * Toggles chat panel.
593
  * Toggles chat panel.
1336
 
1336
 
1337
 UI.showRingOverlay = function () {
1337
 UI.showRingOverlay = function () {
1338
     RingOverlay.show(APP.tokenData.callee, interfaceConfig.DISABLE_RINGING);
1338
     RingOverlay.show(APP.tokenData.callee, interfaceConfig.DISABLE_RINGING);
1339
-    FilmStrip.toggleFilmStrip(false, false);
1339
+    Filmstrip.toggleFilmstrip(false, false);
1340
 };
1340
 };
1341
 
1341
 
1342
 UI.hideRingOverLay = function () {
1342
 UI.hideRingOverLay = function () {
1343
     if (!RingOverlay.hide())
1343
     if (!RingOverlay.hide())
1344
         return;
1344
         return;
1345
-    FilmStrip.toggleFilmStrip(true, false);
1345
+    Filmstrip.toggleFilmstrip(true, false);
1346
 };
1346
 };
1347
 
1347
 
1348
 /**
1348
 /**
1391
         UIEvents.TOGGLE_PROFILE,
1391
         UIEvents.TOGGLE_PROFILE,
1392
         () => APP.tokenData.isGuest && UI.toggleSidePanel("profile_container")
1392
         () => APP.tokenData.isGuest && UI.toggleSidePanel("profile_container")
1393
     ], [
1393
     ], [
1394
-        UIEvents.TOGGLE_FILM_STRIP,
1395
-        UI.handleToggleFilmStrip
1394
+        UIEvents.TOGGLE_FILMSTRIP,
1395
+        UI.handleToggleFilmstrip
1396
     ], [
1396
     ], [
1397
         UIEvents.FOLLOW_ME_ENABLED,
1397
         UIEvents.FOLLOW_ME_ENABLED,
1398
         enabled => (followMeHandler && followMeHandler.enableFollowMe(enabled))
1398
         enabled => (followMeHandler && followMeHandler.enableFollowMe(enabled))

+ 2
- 2
modules/UI/etherpad/Etherpad.js View File

3
 import VideoLayout from "../videolayout/VideoLayout";
3
 import VideoLayout from "../videolayout/VideoLayout";
4
 import LargeContainer from '../videolayout/LargeContainer';
4
 import LargeContainer from '../videolayout/LargeContainer';
5
 import UIEvents from "../../../service/UI/UIEvents";
5
 import UIEvents from "../../../service/UI/UIEvents";
6
-import FilmStrip from '../videolayout/FilmStrip';
6
+import Filmstrip from '../videolayout/Filmstrip';
7
 
7
 
8
 /**
8
 /**
9
  * Etherpad options.
9
  * Etherpad options.
103
 
103
 
104
     // eslint-disable-next-line no-unused-vars
104
     // eslint-disable-next-line no-unused-vars
105
     resize (containerWidth, containerHeight, animate) {
105
     resize (containerWidth, containerHeight, animate) {
106
-        let height = containerHeight - FilmStrip.getFilmStripHeight();
106
+        let height = containerHeight - Filmstrip.getFilmstripHeight();
107
         let width = containerWidth;
107
         let width = containerWidth;
108
 
108
 
109
         $(this.iframe).width(width).height(height);
109
         $(this.iframe).width(width).height(height);

+ 2
- 2
modules/UI/shared_video/SharedVideo.js View File

8
 import VideoLayout from "../videolayout/VideoLayout";
8
 import VideoLayout from "../videolayout/VideoLayout";
9
 import LargeContainer from '../videolayout/LargeContainer';
9
 import LargeContainer from '../videolayout/LargeContainer';
10
 import SmallVideo from '../videolayout/SmallVideo';
10
 import SmallVideo from '../videolayout/SmallVideo';
11
-import FilmStrip from '../videolayout/FilmStrip';
11
+import Filmstrip from '../videolayout/Filmstrip';
12
 
12
 
13
 import { dockToolbox, showToolbox } from '../../../react/features/toolbox';
13
 import { dockToolbox, showToolbox } from '../../../react/features/toolbox';
14
 
14
 
606
     }
606
     }
607
 
607
 
608
     resize (containerWidth, containerHeight) {
608
     resize (containerWidth, containerHeight) {
609
-        let height = containerHeight - FilmStrip.getFilmStripHeight();
609
+        let height = containerHeight - Filmstrip.getFilmstripHeight();
610
 
610
 
611
         let width = containerWidth;
611
         let width = containerWidth;
612
 
612
 

modules/UI/videolayout/FilmStrip.js → modules/UI/videolayout/Filmstrip.js View File

3
 import UIEvents from "../../../service/UI/UIEvents";
3
 import UIEvents from "../../../service/UI/UIEvents";
4
 import UIUtil from "../util/UIUtil";
4
 import UIUtil from "../util/UIUtil";
5
 
5
 
6
-const FilmStrip = {
6
+const Filmstrip = {
7
     /**
7
     /**
8
      *
8
      *
9
-     * @param eventEmitter the {EventEmitter} through which {FilmStrip} is to
10
-     * emit/fire {UIEvents} (such as {UIEvents.TOGGLED_FILM_STRIP}).
9
+     * @param eventEmitter the {EventEmitter} through which {Filmstrip} is to
10
+     * emit/fire {UIEvents} (such as {UIEvents.TOGGLED_FILMSTRIP}).
11
      */
11
      */
12
     init (eventEmitter) {
12
     init (eventEmitter) {
13
         this.iconMenuDownClassName = 'icon-menu-down';
13
         this.iconMenuDownClassName = 'icon-menu-down';
14
         this.iconMenuUpClassName = 'icon-menu-up';
14
         this.iconMenuUpClassName = 'icon-menu-up';
15
-        this.filmStripContainerClassName = 'filmstrip';
16
-        this.filmStrip = $('#remoteVideos');
15
+        this.filmstripContainerClassName = 'filmstrip';
16
+        this.filmstrip = $('#remoteVideos');
17
         this.eventEmitter = eventEmitter;
17
         this.eventEmitter = eventEmitter;
18
-        this._initFilmStripToolbar();
18
+        this._initFilmstripToolbar();
19
         this.registerListeners();
19
         this.registerListeners();
20
     },
20
     },
21
 
21
 
22
     /**
22
     /**
23
      * Initializes the filmstrip toolbar.
23
      * Initializes the filmstrip toolbar.
24
      */
24
      */
25
-    _initFilmStripToolbar() {
26
-        // Do not show the toggle button in film strip only mode.
25
+    _initFilmstripToolbar() {
26
+        // Do not show the toggle button in filmstrip only mode.
27
         if (interfaceConfig.filmStripOnly)
27
         if (interfaceConfig.filmStripOnly)
28
             return;
28
             return;
29
 
29
 
30
         let toolbarContainerHTML = this._generateToolbarHTML();
30
         let toolbarContainerHTML = this._generateToolbarHTML();
31
-        let className = this.filmStripContainerClassName;
31
+        let className = this.filmstripContainerClassName;
32
         let container = document.querySelector(`.${className}`);
32
         let container = document.querySelector(`.${className}`);
33
 
33
 
34
         UIUtil.prependChild(container, toolbarContainerHTML);
34
         UIUtil.prependChild(container, toolbarContainerHTML);
35
 
35
 
36
-        let iconSelector = '#toggleFilmStripButton i';
37
-        this.toggleFilmStripIcon = document.querySelector(iconSelector);
36
+        let iconSelector = '#toggleFilmstripButton i';
37
+        this.toggleFilmstripIcon = document.querySelector(iconSelector);
38
     },
38
     },
39
 
39
 
40
     /**
40
     /**
44
      */
44
      */
45
     _generateToolbarHTML() {
45
     _generateToolbarHTML() {
46
         let container = document.createElement('div');
46
         let container = document.createElement('div');
47
-        let isVisible = this.isFilmStripVisible();
47
+        let isVisible = this.isFilmstripVisible();
48
         container.className = 'filmstrip__toolbar';
48
         container.className = 'filmstrip__toolbar';
49
         container.innerHTML = `
49
         container.innerHTML = `
50
-            <button id="toggleFilmStripButton">
50
+            <button id="toggleFilmstripButton">
51
                 <i class="icon-menu-${isVisible ? 'down' : 'up'}">
51
                 <i class="icon-menu-${isVisible ? 'down' : 'up'}">
52
                 </i>
52
                 </i>
53
             </button>
53
             </button>
64
         // Firing the event instead of executing toggleFilmstrip method because
64
         // Firing the event instead of executing toggleFilmstrip method because
65
         // it's important to hide the filmstrip by UI.toggleFilmstrip in order
65
         // it's important to hide the filmstrip by UI.toggleFilmstrip in order
66
         // to correctly resize the video area.
66
         // to correctly resize the video area.
67
-        $('#toggleFilmStripButton').on('click',
68
-            () => this.eventEmitter.emit(UIEvents.TOGGLE_FILM_STRIP));
67
+        $('#toggleFilmstripButton').on('click',
68
+            () => this.eventEmitter.emit(UIEvents.TOGGLE_FILMSTRIP));
69
 
69
 
70
         this._registerToggleFilmstripShortcut();
70
         this._registerToggleFilmstripShortcut();
71
     },
71
     },
82
         // Firing the event instead of executing toggleFilmstrip method because
82
         // Firing the event instead of executing toggleFilmstrip method because
83
         // it's important to hide the filmstrip by UI.toggleFilmstrip in order
83
         // it's important to hide the filmstrip by UI.toggleFilmstrip in order
84
         // to correctly resize the video area.
84
         // to correctly resize the video area.
85
-        let handler = () => this.eventEmitter.emit(UIEvents.TOGGLE_FILM_STRIP);
85
+        let handler = () => this.eventEmitter.emit(UIEvents.TOGGLE_FILMSTRIP);
86
 
86
 
87
         APP.keyboardshortcut.registerShortcut(
87
         APP.keyboardshortcut.registerShortcut(
88
             shortcut,
88
             shortcut,
96
      * Changes classes of icon for showing down state
96
      * Changes classes of icon for showing down state
97
      */
97
      */
98
     showMenuDownIcon() {
98
     showMenuDownIcon() {
99
-        let icon = this.toggleFilmStripIcon;
99
+        let icon = this.toggleFilmstripIcon;
100
         if(icon) {
100
         if(icon) {
101
             icon.classList.add(this.iconMenuDownClassName);
101
             icon.classList.add(this.iconMenuDownClassName);
102
             icon.classList.remove(this.iconMenuUpClassName);
102
             icon.classList.remove(this.iconMenuUpClassName);
107
      * Changes classes of icon for showing up state
107
      * Changes classes of icon for showing up state
108
      */
108
      */
109
     showMenuUpIcon() {
109
     showMenuUpIcon() {
110
-        let icon = this.toggleFilmStripIcon;
110
+        let icon = this.toggleFilmstripIcon;
111
         if(icon) {
111
         if(icon) {
112
             icon.classList.add(this.iconMenuUpClassName);
112
             icon.classList.add(this.iconMenuUpClassName);
113
             icon.classList.remove(this.iconMenuDownClassName);
113
             icon.classList.remove(this.iconMenuDownClassName);
115
     },
115
     },
116
 
116
 
117
     /**
117
     /**
118
-     * Toggles the visibility of the film strip.
118
+     * Toggles the visibility of the filmstrip.
119
      *
119
      *
120
      * @param visible optional {Boolean} which specifies the desired visibility
120
      * @param visible optional {Boolean} which specifies the desired visibility
121
-     * of the film strip. If not specified, the visibility will be flipped
121
+     * of the filmstrip. If not specified, the visibility will be flipped
122
      * (i.e. toggled); otherwise, the visibility will be set to the specified
122
      * (i.e. toggled); otherwise, the visibility will be set to the specified
123
      * value.
123
      * value.
124
      * @param {Boolean} sendAnalytics - True to send an analytics event. The
124
      * @param {Boolean} sendAnalytics - True to send an analytics event. The
129
      * It's important to hide the filmstrip with UI.toggleFilmstrip in order
129
      * It's important to hide the filmstrip with UI.toggleFilmstrip in order
130
      * to correctly resize the video area.
130
      * to correctly resize the video area.
131
      */
131
      */
132
-    toggleFilmStrip(visible, sendAnalytics = true) {
132
+    toggleFilmstrip(visible, sendAnalytics = true) {
133
         const isVisibleDefined = typeof visible === 'boolean';
133
         const isVisibleDefined = typeof visible === 'boolean';
134
         if (!isVisibleDefined) {
134
         if (!isVisibleDefined) {
135
-            visible = this.isFilmStripVisible();
136
-        } else if (this.isFilmStripVisible() === visible) {
135
+            visible = this.isFilmstripVisible();
136
+        } else if (this.isFilmstripVisible() === visible) {
137
             return;
137
             return;
138
         }
138
         }
139
         if (sendAnalytics) {
139
         if (sendAnalytics) {
140
             JitsiMeetJS.analytics.sendEvent('toolbar.filmstrip.toggled');
140
             JitsiMeetJS.analytics.sendEvent('toolbar.filmstrip.toggled');
141
         }
141
         }
142
-        this.filmStrip.toggleClass("hidden");
142
+        this.filmstrip.toggleClass("hidden");
143
 
143
 
144
         if (visible) {
144
         if (visible) {
145
             this.showMenuUpIcon();
145
             this.showMenuUpIcon();
147
             this.showMenuDownIcon();
147
             this.showMenuDownIcon();
148
         }
148
         }
149
 
149
 
150
-        // Emit/fire UIEvents.TOGGLED_FILM_STRIP.
150
+        // Emit/fire UIEvents.TOGGLED_FILMSTRIP.
151
         const eventEmitter = this.eventEmitter;
151
         const eventEmitter = this.eventEmitter;
152
         if (eventEmitter) {
152
         if (eventEmitter) {
153
             eventEmitter.emit(
153
             eventEmitter.emit(
154
-                UIEvents.TOGGLED_FILM_STRIP,
155
-                this.isFilmStripVisible());
154
+                UIEvents.TOGGLED_FILMSTRIP,
155
+                this.isFilmstripVisible());
156
         }
156
         }
157
     },
157
     },
158
 
158
 
160
      * Shows if filmstrip is visible
160
      * Shows if filmstrip is visible
161
      * @returns {boolean}
161
      * @returns {boolean}
162
      */
162
      */
163
-    isFilmStripVisible() {
164
-        return !this.filmStrip.hasClass('hidden');
163
+    isFilmstripVisible() {
164
+        return !this.filmstrip.hasClass('hidden');
165
     },
165
     },
166
 
166
 
167
     /**
167
     /**
168
-     * Adjusts styles for film-strip only mode.
168
+     * Adjusts styles for filmstrip-only mode.
169
      */
169
      */
170
-    setFilmStripOnly() {
171
-        this.filmStrip.addClass('filmstrip__videos-filmstripOnly');
170
+    setFilmstripOnly() {
171
+        this.filmstrip.addClass('filmstrip__videos-filmstripOnly');
172
     },
172
     },
173
 
173
 
174
     /**
174
     /**
175
      * Returns the height of filmstrip
175
      * Returns the height of filmstrip
176
      * @returns {number} height
176
      * @returns {number} height
177
      */
177
      */
178
-    getFilmStripHeight() {
179
-        if (this.isFilmStripVisible()) {
180
-            return $(`.${this.filmStripContainerClassName}`).outerHeight();
178
+    getFilmstripHeight() {
179
+        if (this.isFilmstripVisible()) {
180
+            return $(`.${this.filmstripContainerClassName}`).outerHeight();
181
         } else {
181
         } else {
182
             return 0;
182
             return 0;
183
         }
183
         }
187
      * Returns the width of filmstip
187
      * Returns the width of filmstip
188
      * @returns {number} width
188
      * @returns {number} width
189
      */
189
      */
190
-    getFilmStripWidth() {
191
-        return this.filmStrip.innerWidth()
192
-            - parseInt(this.filmStrip.css('paddingLeft'), 10)
193
-            - parseInt(this.filmStrip.css('paddingRight'), 10);
190
+    getFilmstripWidth() {
191
+        return this.filmstrip.innerWidth()
192
+            - parseInt(this.filmstrip.css('paddingLeft'), 10)
193
+            - parseInt(this.filmstrip.css('paddingRight'), 10);
194
     },
194
     },
195
 
195
 
196
     /**
196
     /**
220
 
220
 
221
         /**
221
         /**
222
          * If the videoAreaAvailableWidth is set we use this one to calculate
222
          * If the videoAreaAvailableWidth is set we use this one to calculate
223
-         * the filmStrip width, because we're probably in a state where the
224
-         * film strip size hasn't been updated yet, but it will be.
223
+         * the filmstrip width, because we're probably in a state where the
224
+         * filmstrip size hasn't been updated yet, but it will be.
225
          */
225
          */
226
         let videoAreaAvailableWidth
226
         let videoAreaAvailableWidth
227
             = UIUtil.getAvailableVideoWidth()
227
             = UIUtil.getAvailableVideoWidth()
228
             - this._getFilmstripExtraPanelsWidth()
228
             - this._getFilmstripExtraPanelsWidth()
229
-            - UIUtil.parseCssInt(this.filmStrip.css('right'), 10)
230
-            - UIUtil.parseCssInt(this.filmStrip.css('paddingLeft'), 10)
231
-            - UIUtil.parseCssInt(this.filmStrip.css('paddingRight'), 10)
232
-            - UIUtil.parseCssInt(this.filmStrip.css('borderLeftWidth'), 10)
233
-            - UIUtil.parseCssInt(this.filmStrip.css('borderRightWidth'), 10)
229
+            - UIUtil.parseCssInt(this.filmstrip.css('right'), 10)
230
+            - UIUtil.parseCssInt(this.filmstrip.css('paddingLeft'), 10)
231
+            - UIUtil.parseCssInt(this.filmstrip.css('paddingRight'), 10)
232
+            - UIUtil.parseCssInt(this.filmstrip.css('borderLeftWidth'), 10)
233
+            - UIUtil.parseCssInt(this.filmstrip.css('borderRightWidth'), 10)
234
             - 5;
234
             - 5;
235
 
235
 
236
         let availableWidth = videoAreaAvailableWidth;
236
         let availableWidth = videoAreaAvailableWidth;
297
      * @private
297
      * @private
298
      */
298
      */
299
     _getFilmstripExtraPanelsWidth() {
299
     _getFilmstripExtraPanelsWidth() {
300
-        let className = this.filmStripContainerClassName;
300
+        let className = this.filmstripContainerClassName;
301
         let width = 0;
301
         let width = 0;
302
         $(`.${className}`)
302
         $(`.${className}`)
303
             .children()
303
             .children()
405
                 }));
405
                 }));
406
             }
406
             }
407
             promises.push(new Promise((resolve) => {
407
             promises.push(new Promise((resolve) => {
408
-                this.filmStrip.animate({
408
+                this.filmstrip.animate({
409
                     // adds 2 px because of small video 1px border
409
                     // adds 2 px because of small video 1px border
410
                     height: remote.thumbHeight + 2
410
                     height: remote.thumbHeight + 2
411
                 }, this._getAnimateOptions(animate, resolve));
411
                 }, this._getAnimateOptions(animate, resolve));
415
                 let { localThumb } = this.getThumbs();
415
                 let { localThumb } = this.getThumbs();
416
                 let height = localThumb.height();
416
                 let height = localThumb.height();
417
                 let fontSize = UIUtil.getIndicatorFontSize(height);
417
                 let fontSize = UIUtil.getIndicatorFontSize(height);
418
-                this.filmStrip.find('.indicator').animate({
418
+                this.filmstrip.find('.indicator').animate({
419
                     fontSize
419
                     fontSize
420
                 }, this._getAnimateOptions(animate, resolve));
420
                 }, this._getAnimateOptions(animate, resolve));
421
             }));
421
             }));
455
         }
455
         }
456
 
456
 
457
         let localThumb = $("#localVideoContainer");
457
         let localThumb = $("#localVideoContainer");
458
-        let remoteThumbs = this.filmStrip.children(selector)
458
+        let remoteThumbs = this.filmstrip.children(selector)
459
             .not("#localVideoContainer");
459
             .not("#localVideoContainer");
460
 
460
 
461
         // Exclude the local video container if it has been hidden.
461
         // Exclude the local video container if it has been hidden.
467
     }
467
     }
468
 };
468
 };
469
 
469
 
470
-export default FilmStrip;
470
+export default Filmstrip;

+ 2
- 2
modules/UI/videolayout/VideoContainer.js View File

1
 /* global $, APP, interfaceConfig */
1
 /* global $, APP, interfaceConfig */
2
 /* jshint -W101 */
2
 /* jshint -W101 */
3
 
3
 
4
-import FilmStrip from './FilmStrip';
4
+import Filmstrip from './Filmstrip';
5
 import LargeContainer from './LargeContainer';
5
 import LargeContainer from './LargeContainer';
6
 import UIEvents from "../../../service/UI/UIEvents";
6
 import UIEvents from "../../../service/UI/UIEvents";
7
 import UIUtil from "../util/UIUtil";
7
 import UIUtil from "../util/UIUtil";
48
     let availableWidth = Math.max(videoWidth, videoSpaceWidth);
48
     let availableWidth = Math.max(videoWidth, videoSpaceWidth);
49
     let availableHeight = Math.max(videoHeight, videoSpaceHeight);
49
     let availableHeight = Math.max(videoHeight, videoSpaceHeight);
50
 
50
 
51
-    videoSpaceHeight -= FilmStrip.getFilmStripHeight();
51
+    videoSpaceHeight -= Filmstrip.getFilmstripHeight();
52
 
52
 
53
     if (availableWidth / aspectRatio >= videoSpaceHeight) {
53
     if (availableWidth / aspectRatio >= videoSpaceHeight) {
54
         availableHeight = videoSpaceHeight;
54
         availableHeight = videoSpaceHeight;

+ 5
- 5
modules/UI/videolayout/VideoLayout.js View File

1
 /* global APP, $, interfaceConfig */
1
 /* global APP, $, interfaceConfig */
2
 const logger = require("jitsi-meet-logger").getLogger(__filename);
2
 const logger = require("jitsi-meet-logger").getLogger(__filename);
3
 
3
 
4
-import FilmStrip from "./FilmStrip";
4
+import Filmstrip from "./Filmstrip";
5
 import UIEvents from "../../../service/UI/UIEvents";
5
 import UIEvents from "../../../service/UI/UIEvents";
6
 import UIUtil from "../util/UIUtil";
6
 import UIUtil from "../util/UIUtil";
7
 
7
 
270
     electLastVisibleVideo () {
270
     electLastVisibleVideo () {
271
         // pick the last visible video in the row
271
         // pick the last visible video in the row
272
         // if nobody else is left, this picks the local video
272
         // if nobody else is left, this picks the local video
273
-        let remoteThumbs = FilmStrip.getThumbs(true).remoteThumbs;
273
+        let remoteThumbs = Filmstrip.getThumbs(true).remoteThumbs;
274
         let thumbs = remoteThumbs.filter('[id!="mixedstream"]');
274
         let thumbs = remoteThumbs.filter('[id!="mixedstream"]');
275
 
275
 
276
         let lastVisible = thumbs.filter(':visible:last');
276
         let lastVisible = thumbs.filter(':visible:last');
285
         }
285
         }
286
 
286
 
287
         logger.info("Last visible video no longer exists");
287
         logger.info("Last visible video no longer exists");
288
-        thumbs = FilmStrip.getThumbs().remoteThumbs;
288
+        thumbs = Filmstrip.getThumbs().remoteThumbs;
289
         if (thumbs.length) {
289
         if (thumbs.length) {
290
             let id = getPeerContainerResourceId(thumbs[0]);
290
             let id = getPeerContainerResourceId(thumbs[0]);
291
             if (remoteVideos[id]) {
291
             if (remoteVideos[id]) {
530
                         forceUpdate = false,
530
                         forceUpdate = false,
531
                         onComplete = null) {
531
                         onComplete = null) {
532
         const { localVideo, remoteVideo }
532
         const { localVideo, remoteVideo }
533
-            = FilmStrip.calculateThumbnailSize();
533
+            = Filmstrip.calculateThumbnailSize();
534
 
534
 
535
-        FilmStrip.resizeThumbnails(localVideo, remoteVideo,
535
+        Filmstrip.resizeThumbnails(localVideo, remoteVideo,
536
             animate, forceUpdate)
536
             animate, forceUpdate)
537
             .then(function () {
537
             .then(function () {
538
                 if (onComplete && typeof onComplete === "function")
538
                 if (onComplete && typeof onComplete === "function")

+ 3
- 3
react/features/conference/components/Conference.native.js View File

4
 import { connect, disconnect } from '../../base/connection';
4
 import { connect, disconnect } from '../../base/connection';
5
 import { DialogContainer } from '../../base/dialog';
5
 import { DialogContainer } from '../../base/dialog';
6
 import { Container } from '../../base/react';
6
 import { Container } from '../../base/react';
7
-import { FilmStrip } from '../../film-strip';
7
+import { Filmstrip } from '../../filmstrip';
8
 import { LargeVideo } from '../../large-video';
8
 import { LargeVideo } from '../../large-video';
9
 import { setToolboxVisible, Toolbox } from '../../toolbox';
9
 import { setToolboxVisible, Toolbox } from '../../toolbox';
10
 
10
 
133
                 <LargeVideo />
133
                 <LargeVideo />
134
 
134
 
135
                 <Toolbox />
135
                 <Toolbox />
136
-                <FilmStrip />
136
+                <Filmstrip />
137
 
137
 
138
                 <DialogContainer />
138
                 <DialogContainer />
139
             </Container>
139
             </Container>
155
 
155
 
156
     /**
156
     /**
157
      * Changes the value of the toolboxVisible state, thus allowing us to switch
157
      * Changes the value of the toolboxVisible state, thus allowing us to switch
158
-     * between Toolbox and FilmStrip and change their visibility.
158
+     * between Toolbox and Filmstrip and change their visibility.
159
      *
159
      *
160
      * @private
160
      * @private
161
      * @returns {void}
161
      * @returns {void}

+ 0
- 1
react/features/film-strip/components/index.js View File

1
-export { default as FilmStrip } from './FilmStrip';

react/features/film-strip/components/FilmStrip.js → react/features/filmstrip/components/Filmstrip.js View File

8
 import { styles } from './_';
8
 import { styles } from './_';
9
 
9
 
10
 /**
10
 /**
11
- * React component for film strip.
11
+ * React component for filmstrip.
12
  *
12
  *
13
  * @extends Component
13
  * @extends Component
14
  */
14
  */
15
-class FilmStrip extends Component {
15
+class Filmstrip extends Component {
16
     /**
16
     /**
17
-     * FilmStrip component's property types.
17
+     * Filmstrip component's property types.
18
      *
18
      *
19
      * @static
19
      * @static
20
      */
20
      */
28
         _participants: React.PropTypes.array,
28
         _participants: React.PropTypes.array,
29
 
29
 
30
         /**
30
         /**
31
-         * The indicator which determines whether the film strip is visible.
31
+         * The indicator which determines whether the filmstrip is visible.
32
          *
32
          *
33
          * @private
33
          * @private
34
          * @type {boolean}
34
          * @type {boolean}
44
     render() {
44
     render() {
45
         return (
45
         return (
46
             <Container
46
             <Container
47
-                style = { styles.filmStrip }
47
+                style = { styles.filmstrip }
48
                 visible = { this.props._visible }>
48
                 visible = { this.props._visible }>
49
                 <ScrollView
49
                 <ScrollView
50
 
50
 
51
                     // eslint-disable-next-line react/jsx-curly-spacing
51
                     // eslint-disable-next-line react/jsx-curly-spacing
52
                     contentContainerStyle = {
52
                     contentContainerStyle = {
53
-                        styles.filmStripScrollViewContentContainer
53
+                        styles.filmstripScrollViewContentContainer
54
                     } // eslint-disable-line react/jsx-curly-spacing
54
                     } // eslint-disable-line react/jsx-curly-spacing
55
                     horizontal = { true }
55
                     horizontal = { true }
56
                     showsHorizontalScrollIndicator = { false }
56
                     showsHorizontalScrollIndicator = { false }
123
         _participants: state['features/base/participants'],
123
         _participants: state['features/base/participants'],
124
 
124
 
125
         /**
125
         /**
126
-         * The indicator which determines whether the film strip is visible.
126
+         * The indicator which determines whether the filmstrip is visible.
127
          *
127
          *
128
-         * XXX The React Component FilmStrip is used on mobile only at the time
129
-         * of this writing and on mobile the film strip is visible when the
128
+         * XXX The React Component Filmstrip is used on mobile only at the time
129
+         * of this writing and on mobile the filmstrip is visible when the
130
          * toolbar is not.
130
          * toolbar is not.
131
          *
131
          *
132
          * @private
132
          * @private
136
     };
136
     };
137
 }
137
 }
138
 
138
 
139
-export default connect(_mapStateToProps)(FilmStrip);
139
+export default connect(_mapStateToProps)(Filmstrip);

react/features/film-strip/components/Thumbnail.js → react/features/filmstrip/components/Thumbnail.js View File

145
  */
145
  */
146
 function _mapStateToProps(state, ownProps) {
146
 function _mapStateToProps(state, ownProps) {
147
     // We need read-only access to the state of features/large-video so that the
147
     // We need read-only access to the state of features/large-video so that the
148
-    // film strip doesn't render the video of the participant who is rendered on
148
+    // filmstrip doesn't render the video of the participant who is rendered on
149
     // the stage i.e. as a large video.
149
     // the stage i.e. as a large video.
150
     const largeVideo = state['features/large-video'];
150
     const largeVideo = state['features/large-video'];
151
     const tracks = state['features/base/tracks'];
151
     const tracks = state['features/base/tracks'];

react/features/film-strip/components/_.native.js → react/features/filmstrip/components/_.native.js View File


+ 1
- 0
react/features/filmstrip/components/index.js View File

1
+export { default as Filmstrip } from './Filmstrip';

react/features/film-strip/components/native/AudioMutedIndicator.js → react/features/filmstrip/components/native/AudioMutedIndicator.js View File


react/features/film-strip/components/native/DominantSpeakerIndicator.js → react/features/filmstrip/components/native/DominantSpeakerIndicator.js View File


react/features/film-strip/components/native/ModeratorIndicator.js → react/features/filmstrip/components/native/ModeratorIndicator.js View File


react/features/film-strip/components/native/VideoMutedIndicator.js → react/features/filmstrip/components/native/VideoMutedIndicator.js View File


react/features/film-strip/components/native/index.js → react/features/filmstrip/components/native/index.js View File


react/features/film-strip/components/native/styles.js → react/features/filmstrip/components/native/styles.js View File

15
 };
15
 };
16
 
16
 
17
 /**
17
 /**
18
- * Native-specific styles for the film strip.
18
+ * Native-specific styles for the filmstrip.
19
  */
19
  */
20
 export const styles = createStyleSheet(platformIndependentStyles, {
20
 export const styles = createStyleSheet(platformIndependentStyles, {
21
 
21
 

react/features/film-strip/components/styles.js → react/features/filmstrip/components/styles.js View File

1
 import { BoxModel, ColorPalette } from '../../base/styles';
1
 import { BoxModel, ColorPalette } from '../../base/styles';
2
 
2
 
3
 /**
3
 /**
4
- * Film strip related styles common to both Web and native.
4
+ * Filmstrip related styles common to both Web and native.
5
  */
5
  */
6
 export const styles = {
6
 export const styles = {
7
     /**
7
     /**
25
     },
25
     },
26
 
26
 
27
     /**
27
     /**
28
-     * The style of the Container which represents the very film strip.
28
+     * The style of the Container which represents the very filmstrip.
29
      */
29
      */
30
-    filmStrip: {
30
+    filmstrip: {
31
         alignItems: 'flex-end',
31
         alignItems: 'flex-end',
32
         alignSelf: 'stretch',
32
         alignSelf: 'stretch',
33
         bottom: BoxModel.margin,
33
         bottom: BoxModel.margin,
40
 
40
 
41
     /**
41
     /**
42
      * The style of the content container of the ScrollView which is placed
42
      * The style of the content container of the ScrollView which is placed
43
-     * inside filmStrip and which contains the participants' thumbnails in order
43
+     * inside filmstrip and which contains the participants' thumbnails in order
44
      * to allow scrolling through them if they do not fit within the display.
44
      * to allow scrolling through them if they do not fit within the display.
45
      */
45
      */
46
-    filmStripScrollViewContentContainer: {
46
+    filmstripScrollViewContentContainer: {
47
         paddingHorizontal: BoxModel.padding
47
         paddingHorizontal: BoxModel.padding
48
     },
48
     },
49
 
49
 

react/features/film-strip/index.js → react/features/filmstrip/index.js View File


react/features/overlay/components/FilmStripOnlyOverlayFrame.js → react/features/overlay/components/FilmstripOnlyOverlayFrame.js View File

13
  * Implements a React Component for the frame of the overlays in filmstrip only
13
  * Implements a React Component for the frame of the overlays in filmstrip only
14
  * mode.
14
  * mode.
15
  */
15
  */
16
-class FilmStripOnlyOverlayFrame extends Component {
16
+class FilmstripOnlyOverlayFrame extends Component {
17
     /**
17
     /**
18
-     * FilmStripOnlyOverlayFrame component's property types.
18
+     * FilmstripOnlyOverlayFrame component's property types.
19
      *
19
      *
20
      * @static
20
      * @static
21
      */
21
      */
105
 }
105
 }
106
 
106
 
107
 /**
107
 /**
108
- * Maps (parts of) the Redux state to the associated FilmStripOnlyOverlayFrame
108
+ * Maps (parts of) the Redux state to the associated FilmstripOnlyOverlayFrame
109
  * props.
109
  * props.
110
  *
110
  *
111
  * @param {Object} state - The Redux state.
111
  * @param {Object} state - The Redux state.
130
     };
130
     };
131
 }
131
 }
132
 
132
 
133
-export default connect(_mapStateToProps)(FilmStripOnlyOverlayFrame);
133
+export default connect(_mapStateToProps)(FilmstripOnlyOverlayFrame);

+ 23
- 18
react/features/overlay/components/OverlayContainer.js View File

1
 import React, { Component } from 'react';
1
 import React, { Component } from 'react';
2
 import { connect } from 'react-redux';
2
 import { connect } from 'react-redux';
3
 
3
 
4
-import PageReloadFilmStripOnlyOverlay from './PageReloadFilmStripOnlyOverlay';
4
+import PageReloadFilmstripOnlyOverlay from './PageReloadFilmstripOnlyOverlay';
5
 import PageReloadOverlay from './PageReloadOverlay';
5
 import PageReloadOverlay from './PageReloadOverlay';
6
-import SuspendedFilmStripOnlyOverlay from './SuspendedFilmStripOnlyOverlay';
6
+import SuspendedFilmstripOnlyOverlay from './SuspendedFilmstripOnlyOverlay';
7
 import SuspendedOverlay from './SuspendedOverlay';
7
 import SuspendedOverlay from './SuspendedOverlay';
8
-import UserMediaPermissionsFilmStripOnlyOverlay
9
-    from './UserMediaPermissionsFilmStripOnlyOverlay';
8
+import UserMediaPermissionsFilmstripOnlyOverlay
9
+    from './UserMediaPermissionsFilmstripOnlyOverlay';
10
 import UserMediaPermissionsOverlay from './UserMediaPermissionsOverlay';
10
 import UserMediaPermissionsOverlay from './UserMediaPermissionsOverlay';
11
 
11
 
12
 declare var APP: Object;
12
 declare var APP: Object;
108
      */
108
      */
109
     constructor(props) {
109
     constructor(props) {
110
         super(props);
110
         super(props);
111
+
111
         this.state = {
112
         this.state = {
112
             /**
113
             /**
113
-             * Indicates whether the film strip only mode is enabled or not.
114
+             * Indicates whether the filmstrip only mode is enabled or not.
114
              *
115
              *
115
              * @type {boolean}
116
              * @type {boolean}
116
              */
117
              */
117
-            filmStripOnly: interfaceConfig.filmStripOnly
118
+            filmstripOnly: interfaceConfig.filmStripOnly
118
         };
119
         };
119
     }
120
     }
120
 
121
 
141
      * @public
142
      * @public
142
      */
143
      */
143
     render() {
144
     render() {
144
-        const filmStripOnlyMode = this.state.filmStripOnly;
145
+        const { filmstripOnly } = this.state;
145
         let overlayComponent, props;
146
         let overlayComponent, props;
146
 
147
 
147
         if (this.props._connectionEstablished && this.props._haveToReload) {
148
         if (this.props._connectionEstablished && this.props._haveToReload) {
148
-            overlayComponent = filmStripOnlyMode
149
-                ? PageReloadFilmStripOnlyOverlay : PageReloadOverlay;
149
+            overlayComponent
150
+                = filmstripOnly
151
+                    ? PageReloadFilmstripOnlyOverlay
152
+                    : PageReloadOverlay;
150
             props = {
153
             props = {
151
                 isNetworkFailure: this.props._isNetworkFailure,
154
                 isNetworkFailure: this.props._isNetworkFailure,
152
                 reason: this.props._reason
155
                 reason: this.props._reason
153
             };
156
             };
154
         } else if (this.props._suspendDetected) {
157
         } else if (this.props._suspendDetected) {
155
-            overlayComponent = filmStripOnlyMode
156
-                ? SuspendedFilmStripOnlyOverlay : SuspendedOverlay;
158
+            overlayComponent
159
+                = filmstripOnly
160
+                    ? SuspendedFilmstripOnlyOverlay
161
+                    : SuspendedOverlay;
157
         } else if (this.props._isMediaPermissionPromptVisible) {
162
         } else if (this.props._isMediaPermissionPromptVisible) {
158
-            overlayComponent = filmStripOnlyMode
159
-                ? UserMediaPermissionsFilmStripOnlyOverlay
163
+            overlayComponent
164
+                = filmstripOnly
165
+                    ? UserMediaPermissionsFilmstripOnlyOverlay
160
                     : UserMediaPermissionsOverlay;
166
                     : UserMediaPermissionsOverlay;
161
             props = { browser: this.props._browser };
167
             props = { browser: this.props._browser };
162
         }
168
         }
163
 
169
 
164
-        if (overlayComponent) {
165
-            return React.createElement(overlayComponent, props);
166
-        }
167
-
168
-        return null;
170
+        return (
171
+            overlayComponent
172
+                ? React.createElement(overlayComponent, props)
173
+                : null);
169
     }
174
     }
170
 }
175
 }
171
 
176
 

+ 3
- 3
react/features/overlay/components/OverlayFrame.js View File

38
 
38
 
39
         this.state = {
39
         this.state = {
40
             /**
40
             /**
41
-             * Indicates whether the film strip only mode is enabled or not.
41
+             * Indicates whether the filmstrip only mode is enabled or not.
42
              *
42
              *
43
              * @type {boolean}
43
              * @type {boolean}
44
              */
44
              */
45
-            filmStripOnly: interfaceConfig.filmStripOnly
45
+            filmstripOnly: interfaceConfig.filmStripOnly
46
         };
46
         };
47
     }
47
     }
48
 
48
 
57
             ? 'overlay__container-light' : 'overlay__container';
57
             ? 'overlay__container-light' : 'overlay__container';
58
         let contentClass = 'overlay__content';
58
         let contentClass = 'overlay__content';
59
 
59
 
60
-        if (this.state.filmStripOnly) {
60
+        if (this.state.filmstripOnly) {
61
             containerClass += ' filmstrip-only';
61
             containerClass += ' filmstrip-only';
62
             contentClass += ' filmstrip-only';
62
             contentClass += ' filmstrip-only';
63
         }
63
         }

react/features/overlay/components/PageReloadFilmStripOnlyOverlay.js → react/features/overlay/components/PageReloadFilmstripOnlyOverlay.js View File

3
 import { translate } from '../../base/i18n';
3
 import { translate } from '../../base/i18n';
4
 
4
 
5
 import AbstractPageReloadOverlay from './AbstractPageReloadOverlay';
5
 import AbstractPageReloadOverlay from './AbstractPageReloadOverlay';
6
-import FilmStripOnlyOverlayFrame from './FilmStripOnlyOverlayFrame';
6
+import FilmstripOnlyOverlayFrame from './FilmstripOnlyOverlayFrame';
7
 
7
 
8
 /**
8
 /**
9
  * Implements a React Component for page reload overlay for filmstrip only
9
  * Implements a React Component for page reload overlay for filmstrip only
10
  * mode. Shown before the conference is reloaded. Shows a warning message and
10
  * mode. Shown before the conference is reloaded. Shows a warning message and
11
  * counts down towards the reload.
11
  * counts down towards the reload.
12
  */
12
  */
13
-class PageReloadFilmStripOnlyOverlay extends AbstractPageReloadOverlay {
13
+class PageReloadFilmstripOnlyOverlay extends AbstractPageReloadOverlay {
14
     /**
14
     /**
15
-     * PageReloadFilmStripOnlyOverlay component's property types.
15
+     * PageReloadFilmstripOnlyOverlay component's property types.
16
      *
16
      *
17
      * @static
17
      * @static
18
      */
18
      */
39
         const { message, timeLeft, title } = this.state;
39
         const { message, timeLeft, title } = this.state;
40
 
40
 
41
         return (
41
         return (
42
-            <FilmStripOnlyOverlayFrame>
42
+            <FilmstripOnlyOverlayFrame>
43
                 <div className = 'inlay-filmstrip-only__container'>
43
                 <div className = 'inlay-filmstrip-only__container'>
44
                     <div className = 'inlay-filmstrip-only__title'>
44
                     <div className = 'inlay-filmstrip-only__title'>
45
                         { t(title) }
45
                         { t(title) }
54
                 {
54
                 {
55
                     this._renderProgressBar()
55
                     this._renderProgressBar()
56
                 }
56
                 }
57
-            </FilmStripOnlyOverlayFrame>
57
+            </FilmstripOnlyOverlayFrame>
58
         );
58
         );
59
     }
59
     }
60
 }
60
 }
61
 
61
 
62
-export default translate(PageReloadFilmStripOnlyOverlay);
62
+export default translate(PageReloadFilmstripOnlyOverlay);

react/features/overlay/components/SuspendedFilmStripOnlyOverlay.js → react/features/overlay/components/SuspendedFilmstripOnlyOverlay.js View File

2
 
2
 
3
 import { translate, translateToHTML } from '../../base/i18n';
3
 import { translate, translateToHTML } from '../../base/i18n';
4
 
4
 
5
-import FilmStripOnlyOverlayFrame from './FilmStripOnlyOverlayFrame';
5
+import FilmstripOnlyOverlayFrame from './FilmstripOnlyOverlayFrame';
6
 import ReloadButton from './ReloadButton';
6
 import ReloadButton from './ReloadButton';
7
 
7
 
8
 /**
8
 /**
9
  * Implements a React Component for suspended overlay for filmstrip only mode.
9
  * Implements a React Component for suspended overlay for filmstrip only mode.
10
  * Shown when suspended is detected.
10
  * Shown when suspended is detected.
11
  */
11
  */
12
-class SuspendedFilmStripOnlyOverlay extends Component {
12
+class SuspendedFilmstripOnlyOverlay extends Component {
13
     /**
13
     /**
14
-     * SuspendedFilmStripOnlyOverlay component's property types.
14
+     * SuspendedFilmstripOnlyOverlay component's property types.
15
      *
15
      *
16
      * @static
16
      * @static
17
      */
17
      */
35
         const { t } = this.props;
35
         const { t } = this.props;
36
 
36
 
37
         return (
37
         return (
38
-            <FilmStripOnlyOverlayFrame isLightOverlay = { true }>
38
+            <FilmstripOnlyOverlayFrame isLightOverlay = { true }>
39
                 <div className = 'inlay-filmstrip-only__container'>
39
                 <div className = 'inlay-filmstrip-only__container'>
40
                     <div className = 'inlay-filmstrip-only__title'>
40
                     <div className = 'inlay-filmstrip-only__title'>
41
                         { t('suspendedoverlay.title') }
41
                         { t('suspendedoverlay.title') }
45
                     </div>
45
                     </div>
46
                 </div>
46
                 </div>
47
                 <ReloadButton textKey = 'suspendedoverlay.rejoinKeyTitle' />
47
                 <ReloadButton textKey = 'suspendedoverlay.rejoinKeyTitle' />
48
-            </FilmStripOnlyOverlayFrame>
48
+            </FilmstripOnlyOverlayFrame>
49
         );
49
         );
50
     }
50
     }
51
 }
51
 }
52
 
52
 
53
-export default translate(SuspendedFilmStripOnlyOverlay);
53
+export default translate(SuspendedFilmstripOnlyOverlay);

react/features/overlay/components/UserMediaPermissionsFilmStripOnlyOverlay.js → react/features/overlay/components/UserMediaPermissionsFilmstripOnlyOverlay.js View File

2
 
2
 
3
 import { translate, translateToHTML } from '../../base/i18n';
3
 import { translate, translateToHTML } from '../../base/i18n';
4
 
4
 
5
-import FilmStripOnlyOverlayFrame from './FilmStripOnlyOverlayFrame';
5
+import FilmstripOnlyOverlayFrame from './FilmstripOnlyOverlayFrame';
6
 
6
 
7
 /**
7
 /**
8
  * Implements a React Component for overlay with guidance how to proceed with
8
  * Implements a React Component for overlay with guidance how to proceed with
9
  * gUM prompt. This component will be displayed only for filmstrip only mode.
9
  * gUM prompt. This component will be displayed only for filmstrip only mode.
10
  */
10
  */
11
-class UserMediaPermissionsFilmStripOnlyOverlay extends Component {
11
+class UserMediaPermissionsFilmstripOnlyOverlay extends Component {
12
     /**
12
     /**
13
-     * UserMediaPermissionsFilmStripOnlyOverlay component's property types.
13
+     * UserMediaPermissionsFilmstripOnlyOverlay component's property types.
14
      *
14
      *
15
      * @static
15
      * @static
16
      */
16
      */
44
         const textKey = `userMedia.${this.props.browser}GrantPermissions`;
44
         const textKey = `userMedia.${this.props.browser}GrantPermissions`;
45
 
45
 
46
         return (
46
         return (
47
-            <FilmStripOnlyOverlayFrame
47
+            <FilmstripOnlyOverlayFrame
48
                 icon = 'icon-mic-camera-combined'
48
                 icon = 'icon-mic-camera-combined'
49
                 isLightOverlay = { true }>
49
                 isLightOverlay = { true }>
50
                 <div className = 'inlay-filmstrip-only__container'>
50
                 <div className = 'inlay-filmstrip-only__container'>
60
                         }
60
                         }
61
                     </div>
61
                     </div>
62
                 </div>
62
                 </div>
63
-            </FilmStripOnlyOverlayFrame>
63
+            </FilmstripOnlyOverlayFrame>
64
         );
64
         );
65
     }
65
     }
66
 }
66
 }
67
 
67
 
68
-export default translate(UserMediaPermissionsFilmStripOnlyOverlay);
68
+export default translate(UserMediaPermissionsFilmstripOnlyOverlay);

+ 11
- 11
service/UI/UIEvents.js View File

45
      */
45
      */
46
     TOGGLE_PROFILE: "UI.toggle_profile",
46
     TOGGLE_PROFILE: "UI.toggle_profile",
47
     /**
47
     /**
48
-     * Notifies that a command to toggle the film strip has been issued. The
48
+     * Notifies that a command to toggle the filmstrip has been issued. The
49
      * event may optionally specify a {Boolean} (primitive) value to assign to
49
      * event may optionally specify a {Boolean} (primitive) value to assign to
50
-     * the visibility of the film strip (i.e. the event may act as a setter).
51
-     * The very toggling of the film strip may or may not occurred at the time
50
+     * the visibility of the filmstrip (i.e. the event may act as a setter).
51
+     * The very toggling of the filmstrip may or may not occurred at the time
52
      * of the receipt of the event depending on the position of the receiving
52
      * of the receipt of the event depending on the position of the receiving
53
      * event listener in relation to the event listener which carries out the
53
      * event listener in relation to the event listener which carries out the
54
-     * command to toggle the film strip.
54
+     * command to toggle the filmstrip.
55
      *
55
      *
56
-     * @see {TOGGLED_FILM_STRIP}
56
+     * @see {TOGGLED_FILMSTRIP}
57
      */
57
      */
58
-    TOGGLE_FILM_STRIP: "UI.toggle_film_strip",
58
+    TOGGLE_FILMSTRIP: "UI.toggle_filmstrip",
59
     /**
59
     /**
60
-     * Notifies that the film strip was (actually) toggled. The event supplies
61
-     * a {Boolean} (primitive) value indicating the visibility of the film
62
-     * strip after the toggling (at the time of the event emission).
60
+     * Notifies that the filmstrip was (actually) toggled. The event supplies a
61
+     * {Boolean} (primitive) value indicating the visibility of the filmstrip
62
+     * after the toggling (at the time of the event emission).
63
      *
63
      *
64
-     * @see {TOGGLE_FILM_STRIP}
64
+     * @see {TOGGLE_FILMSTRIP}
65
      */
65
      */
66
-    TOGGLED_FILM_STRIP: "UI.toggled_film_strip",
66
+    TOGGLED_FILMSTRIP: "UI.toggled_filmstrip",
67
     TOGGLE_SCREENSHARING: "UI.toggle_screensharing",
67
     TOGGLE_SCREENSHARING: "UI.toggle_screensharing",
68
     TOGGLED_SHARED_DOCUMENT: "UI.toggled_shared_document",
68
     TOGGLED_SHARED_DOCUMENT: "UI.toggled_shared_document",
69
     CONTACT_CLICKED: "UI.contact_clicked",
69
     CONTACT_CLICKED: "UI.contact_clicked",

Loading…
Cancel
Save