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

Fixed visibility of the create a new note option in all shared notes windows

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2017-09-01 17:49:51 +00:00
parent 438bcdbf24
commit 74de057a1d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-client/src/org/bigbluebutton/core/model/SharedNotes.as
View File

@ -10,7 +10,9 @@ package org.bigbluebutton.core.model
public var numAdditionalSharedNotes:Number = 0;
[Bindable]
public var mainNoteVisible:Boolean = false;
[Bindable]
public var isMaxNumOfNotes:Boolean = true;
private var activeNotesIds:ArrayCollection = new ArrayCollection();
public function SharedNotes() {

13
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
View File

@ -86,7 +86,6 @@
private var lastAuthors:Object = new Object();
[Bindable] protected var options:SharedNotesOptions;
[Bindable] private var _isNotesLimit:Boolean = true;
[Bindable] private var usersTyping:String = "";
private var sendUpdateTimer:Timer;
@ -215,13 +214,13 @@
return _noteId;
}
public function addRemoteDocument(notes:Object, isNotesLimit:Boolean):void{
public function addRemoteDocument(notes:Object, isMaxNumOfNotes:Boolean):void{
var note:Object = notes[noteId];
_document = note["document"];
_noteName = note["name"];
_lastPatch = note["patchCounter"];
richTextEditor.htmlText = _document;
_isNotesLimit = isNotesLimit;
LiveMeeting.inst().sharedNotes.isMaxNumOfNotes = isMaxNumOfNotes;
if (!this.enabled) this.enabled = true;
updateTitle();
updateUndoRedoButtons(note["undo"], note["redo"]);
@ -302,11 +301,11 @@
}
private function handleNoteCreated(e:SharedNotesEvent):void {
_isNotesLimit = e.payload.isNotesLimit;
LiveMeeting.inst().sharedNotes.isMaxNumOfNotes = e.payload.isNotesLimit;
}
private function handleNoteDestroyed(e:SharedNotesEvent):void {
_isNotesLimit = e.payload.isNotesLimit;
LiveMeeting.inst().sharedNotes.isMaxNumOfNotes = e.payload.isNotesLimit;
}
private function updateUndoRedoButtons(undo:Boolean, redo:Boolean):void {
@ -418,10 +417,10 @@
protected function btnSettings_clickHandler(event:MouseEvent):void {
var menuData:Array = [];
menuData.push({
label: _isNotesLimit ?
label: LiveMeeting.inst().sharedNotes.isMaxNumOfNotes ?
ResourceUtil.getInstance().getString('bbb.sharedNotes.limit.label') :
ResourceUtil.getInstance().getString('bbb.sharedNotes.new.label'),
enabled: !_isNotesLimit,
enabled: !LiveMeeting.inst().sharedNotes.isMaxNumOfNotes,
handler: function():void {
newNoteHandler();
}