diff --git a/bigbluebutton-html5/imports/startup/client/intl.jsx b/bigbluebutton-html5/imports/startup/client/intl.jsx index b63ff2356c1600f99492193d3a97ae83229d06ac..235671f0811ed347073756a4adf2670526845bae 100644 --- a/bigbluebutton-html5/imports/startup/client/intl.jsx +++ b/bigbluebutton-html5/imports/startup/client/intl.jsx @@ -6,7 +6,6 @@ import Settings from '/imports/ui/services/settings'; import LoadingScreen from '/imports/ui/components/loading-screen/component'; import getFromUserSettings from '/imports/ui/services/users-settings'; import _ from 'lodash'; -import { Session } from 'meteor/session'; const propTypes = { locale: PropTypes.string, @@ -16,7 +15,6 @@ const propTypes = { const DEFAULT_LANGUAGE = Meteor.settings.public.app.defaultSettings.application.fallbackLocale; const RTL_LANGUAGES = ['ar', 'he', 'fa']; -const LARGE_FONT_LANGUAGES = ['te', 'km']; const defaultProps = { locale: DEFAULT_LANGUAGE, @@ -32,8 +30,6 @@ class IntlStartup extends Component { document.body.parentNode.setAttribute('dir', 'ltr'); Settings.application.isRTL = false; } - Session.set('isLargeFont', LARGE_FONT_LANGUAGES.includes(localeName.substring(0, 2))); - window.dispatchEvent(new Event('localeChanged')); Settings.save(); } @@ -153,9 +149,9 @@ class IntlStartup extends Component { {normalizedLocale && ( - <IntlProvider locale={normalizedLocale} messages={messages}> - {children} - </IntlProvider> + <IntlProvider locale={normalizedLocale} messages={messages}> + {children} + </IntlProvider> ) } </> diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx index f611f69831aa7c99b7d087d88746c4d995afcd6e..5414528214023822ce3954354a17917235117319 100755 --- a/bigbluebutton-html5/imports/ui/components/app/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx @@ -28,7 +28,7 @@ import { withDraggableContext } from '../media/webcam-draggable-overlay/context' import { styles } from './styles'; import { makeCall } from '/imports/ui/services/api'; import ConnectionStatusService from '/imports/ui/components/connection-status/service'; -import { NAVBAR_HEIGHT, LARGE_NAVBAR_HEIGHT } from '/imports/ui/components/layout/layout-manager/component'; +import { NAVBAR_HEIGHT } from '/imports/ui/components/layout/layout-manager/component'; const MOBILE_MEDIA = 'only screen and (max-width: 40em)'; const APP_CONFIG = Meteor.settings.public.app; @@ -267,16 +267,15 @@ class App extends Component { } renderNavBar() { - const { navbar, isLargeFont } = this.props; - if (!navbar) return null; + const { navbar } = this.props; - const realNavbarHeight = isLargeFont ? LARGE_NAVBAR_HEIGHT : NAVBAR_HEIGHT; + if (!navbar) return null; return ( <header className={styles.navbar} style={{ - height: realNavbarHeight, + height: NAVBAR_HEIGHT, }} > {navbar} diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx index 204a6c26e7377ebde7ca09103c740b7ef6b28e28..ede6446121d5b2a8df8c8eb5727c8ed6a2255aa3 100755 --- a/bigbluebutton-html5/imports/ui/components/app/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx @@ -124,7 +124,6 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls }) randomlySelectedUser, currentUserId: currentUser.userId, isPresenter: currentUser.presenter, - isLargeFont: Session.get('isLargeFont') }; })(AppContainer))); diff --git a/bigbluebutton-html5/imports/ui/components/layout/layout-manager/component.jsx b/bigbluebutton-html5/imports/ui/components/layout/layout-manager/component.jsx index ebec2655b7cc727ed6984307915b32617b4d4222..0a446b2df64cf74553df59def92dc246626a2b88 100644 --- a/bigbluebutton-html5/imports/ui/components/layout/layout-manager/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/layout/layout-manager/component.jsx @@ -24,8 +24,7 @@ const NOTE_MIN_WIDTH = 340; const NOTE_MAX_WIDTH = 800; const WAITING_MIN_WIDTH = 340; const WAITING_MAX_WIDTH = 800; -const LARGE_NAVBAR_HEIGHT = 170; -const NAVBAR_HEIGHT = 112; +const NAVBAR_HEIGHT = 170; const ACTIONSBAR_HEIGHT = isMobile ? 50 : 42; const BREAKOUT_MIN_WIDTH = 320; const BREAKOUT_MAX_WIDTH = 400; @@ -106,14 +105,10 @@ class LayoutManagerComponent extends Component { window.addEventListener('webcamPlacementChange', () => { this.setLayoutSizes(false, false, true); }); - + window.addEventListener('fullscreenchange', () => { setTimeout(() => this.setLayoutSizes(), 200); }); - - window.addEventListener('localeChanged', () => { - this.setLayoutSizes(); - }); } componentDidUpdate(prevProps) { @@ -768,15 +763,12 @@ class LayoutManagerComponent extends Component { secondPanel = newBreakoutRoomSize; } - const isLargeFont = Session.get('isLargeFont'); - const realNavbarHeight = isLargeFont ? LARGE_NAVBAR_HEIGHT : NAVBAR_HEIGHT; - - const mediaAreaHeight = windowHeight() - (realNavbarHeight + ACTIONSBAR_HEIGHT) - 10; + const mediaAreaHeight = windowHeight() - (NAVBAR_HEIGHT + ACTIONSBAR_HEIGHT) - 10; const mediaAreaWidth = windowWidth() - (firstPanel.width + secondPanel.width); const newMediaBounds = { width: mediaAreaWidth, height: mediaAreaHeight, - top: realNavbarHeight, + top: NAVBAR_HEIGHT, left: firstPanel.width + secondPanel.width, }; @@ -846,7 +838,6 @@ export { WAITING_MIN_WIDTH, WAITING_MAX_WIDTH, NAVBAR_HEIGHT, - LARGE_NAVBAR_HEIGHT, ACTIONSBAR_HEIGHT, WEBCAMSAREA_MIN_PERCENT, WEBCAMSAREA_MAX_PERCENT,