BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into filter-delayed-messages

Browse Source
This commit is contained in:
Richard Alam 2017-11-22 10:46:29 -08:00
commit dde04b69be
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
View File

@ -105,7 +105,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var lastTime:String = "";
[Bindable]
private var chatMessages: ChatConversation;
private var _chatMessages: ChatConversation;
private var lastCount:Number = 0;
private var scrollTimer:Timer;
@ -129,9 +129,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private var shiftPressed:Boolean = false;
private var ctrlPressed:Boolean = false;
private function onCreationComplete():void {
chatMessages = new ChatConversation(chatId);
private function get chatMessages():ChatConversation {
if (!_chatMessages) {
_chatMessages = new ChatConversation(chatId);
}
return _chatMessages;
}
private function onCreationComplete():void {
chatOptions = Options.getOptions(ChatOptions) as ChatOptions;
bindToHeightToDetermineHeightOfMessageList();

2
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
View File

@ -183,7 +183,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function handlePublicChatMessageEvent(event:PublicChatMessageEvent):void {
if (event.chatId == mainChatId) {
if (event.chatId == mainChatId || mainChatId == ChatModel.MAIN_PUBLIC_CHAT) {
notifyUserOfNewMessage(event.chatId);
if (!UsersUtil.isMe(event.msg.fromUserId)) {
publicNotification();

7
bigbluebutton-config/web/index_html5_vs_flash.html
View File

@ -85,12 +85,12 @@
<div >
<h2>BigBlueButton HTML5 client test server</h2>
<p> <a href="http://bigbluebutton.org/" target="_blank">BigBlueButton</a> is an open source web conferencing system for on-line learning. This is a public test server for the BigBlueButton <a href="http://docs.bigbluebutton.org/html/html5-overview.html">HTML5 client</a> currently under development.</p>
<p> Our goal for the upcoming release of the HTML5 client is to implement all the <a href="https://youtu.be/oh0bEk3YSwI">viewer capabilities</a> of the Flash client. Students join online classes as a viewer. The HTML5 client will give remote students the ability to join from their Android mobile devices. Users using the Flash and HTML5 clients can join the same meeting (hence the two choices above). We built the HTML5 client using web real-time communication (WebRTC), <a href="https://facebook.github.io/react/">React</a>, and <a href="https://www.mongodb.com/">MongoDB</a>.</p>
<p> The HTML5 works well with desktop and Android devices (phone and tablets) as they all support WebRTC. Apple does not (yet) support WebRTC in Safari for iOS devices, but don't worry -- we are working in parallel on app for iOS devices. What can this developer build of the HTML5 client do right now? Pretty much everything the Flash client can do for viewers except (a) view a desktop sharing stream from the presenter and (b) send/receive webcam streams. We're working on (a) and (b). For now, we are really happy to share with you our progress and get <a href="https://docs.google.com/forms/d/1gFz5JdN3vD6jxhlVskFYgtEKEcexdDnUzpkwUXwQ4OY/viewform?usp=send_for">your feedback</a> on what has been implemeted so far. Enjoy!</p>
<p> Our goal for the upcoming release of the HTML5 client is to implement all the <a href="https://youtu.be/oh0bEk3YSwI">viewer capabilities</a> of the Flash client. Students join online classes as a viewer. The HTML5 client will give remote students the ability to join from their Android and Apple (iOS 11+) devices. Users using the Flash and HTML5 clients can join the same meeting (hence the two choices above). We built the HTML5 client using web real-time communication (WebRTC), <a href="https://facebook.github.io/react/">React</a>, and <a href="https://www.mongodb.com/">MongoDB</a>.</p>
<p> What can this developer build of the HTML5 client do right now? Pretty much everything the Flash client can do for viewers except (a) view a desktop sharing stream from the presenter and (b) send/receive webcam streams. We're working on (a) and (b). For now, we are really happy to share with you our progress and get <a href="https://docs.google.com/forms/d/1gFz5JdN3vD6jxhlVskFYgtEKEcexdDnUzpkwUXwQ4OY/viewform?usp=send_for">your feedback</a> on what has been implemeted so far. Enjoy!</p>
<h4>For Developers</h4>
<p> The BigBlueButton project is <a href="http://bigbluebutton.org/support">supported</a> by a community of developers that care about good design and a streamlined user experience. </p>
<p>See <a href="/demo/demo1.jsp" target="_blank">API examples </a> for how to integrate BigBlueButton with your project.</p>
<p>See <a href="http://docs.bigblubutton.org" target="_blank">Documentation</a> for more information on how you can integrate BigBlueButton with your project.</p>
</div>
<div class="span one"></div>
@ -98,6 +98,7 @@
<hr class="featurette-divider">
<!-- BigBlueButton Features -->