From 3f383a8b402f303d0967ceb79c83a63206c5e316 Mon Sep 17 00:00:00 2001 From: Pedro Beschorner Marin Date: Fri, 18 Aug 2017 16:06:02 +0000 Subject: [PATCH 1/4] Making role bindable so binding utils will be triggered when it changes --- .../src/org/bigbluebutton/core/model/users/User2x.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/model/users/User2x.as b/bigbluebutton-client/src/org/bigbluebutton/core/model/users/User2x.as index 48a6954c69..8ec22f03af 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/core/model/users/User2x.as +++ b/bigbluebutton-client/src/org/bigbluebutton/core/model/users/User2x.as @@ -6,7 +6,7 @@ package org.bigbluebutton.core.model.users public var intId: String; public var extId: String; public var name: String; - public var role: String; + [Bindable] public var role: String; public var guest: Boolean; public var authed: Boolean; public var waitingForAcceptance: Boolean; From da32a11771c256b178fc71f7f88f954e14b87136 Mon Sep 17 00:00:00 2001 From: Pedro Beschorner Marin Date: Fri, 18 Aug 2017 19:43:35 +0000 Subject: [PATCH 2/4] Moving the close button event listener instantiation to the end of the additional shared note window creation --- .../modules/sharednotes/views/AdditionalSharedNotesWindow.as | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/AdditionalSharedNotesWindow.as b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/AdditionalSharedNotesWindow.as index 9a67921594..76ed4cc897 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/AdditionalSharedNotesWindow.as +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/AdditionalSharedNotesWindow.as @@ -28,8 +28,6 @@ package org.bigbluebutton.modules.sharednotes.views showCloseButton = UsersUtil.amIModerator(); width = 240; height = 240; - - closeBtn.addEventListener(MouseEvent.CLICK, onCloseBtnClick); } public function get windowName():String { @@ -46,6 +44,7 @@ package org.bigbluebutton.modules.sharednotes.views LOGGER.debug("AdditionalSharedNotesWindow: [2] in-constructor additional notes " + noteId); btnNew.visible = btnNew.includeInLayout = false; + closeBtn.addEventListener(MouseEvent.CLICK, onCloseBtnClick); } private function onCloseBtnClick(e:MouseEvent):void { From 06d937958fb802a5e0b6a018aca9aa8789aeb717 Mon Sep 17 00:00:00 2001 From: Pedro Beschorner Marin Date: Mon, 21 Aug 2017 18:23:33 +0000 Subject: [PATCH 3/4] Setting maximum size to shared notes and pastes --- .../locale/en_US/bbbResources.properties | 1 + .../resources/config.xml.template | 2 ++ .../modules/sharednotes/SharedNotesOptions.as | 6 ++++++ .../sharednotes/views/SharedNotesWindow.mxml | 10 ++++++++++ .../components/SharedNotesRichTextEditor.mxml | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index d79383a91f..461abab44c 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -530,6 +530,7 @@ bbb.sharedNotes.redo.toolTip = Redo modification bbb.sharedNotes.toolbar.toolTip = Text formatting toolbar bbb.sharedNotes.additionalNotes.closeWarning.title = Closing shared notes bbb.sharedNotes.additionalNotes.closeWarning.message = This action will destroy the notes on this window for everyone, and there's no way to undo. Are you sure you want to close these notes? +bbb.sharedNotes.pastewarning.title = Shared Notes Paste Warning bbb.settings.deskshare.instructions = Choose Allow on the prompt that pops up to check that desktop sharing is working properly for you bbb.settings.deskshare.start = Check Desktop Sharing bbb.settings.voice.volume = Microphone Activity diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template index 3bc2b70838..5fc76d2fd7 100755 --- a/bigbluebutton-client/resources/config.xml.template +++ b/bigbluebutton-client/resources/config.xml.template @@ -130,6 +130,8 @@ toolbarVisibleByDefault="false" showToolbarButton="true" fontSize="12" + maxPasteLength="1024" + maxNoteLenght="5120" />