Author: solomax
Date: Mon Dec 19 15:32:06 2016
New Revision: 1775125
URL: http://svn.apache.org/viewvc?rev=1775125&view=rev
Log:
[OPENMEETINGS-1030] drag'n'drop to WB is fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1775125&r1=1775124&r2=1775125&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Mon Dec 19 15:32:06 2016
@@ -128,6 +128,7 @@
btnName: wbName
});
canvas._wbBar.currentBtn = tWhiteboardBtn;
+ canvas._wbBar.setWhiteboardId(whiteboardId);
tWhiteboardBtn.onmouseout.sendEvent(null);
canvas.whiteboardCount++;
return whiteboard;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1775125&r1=1775124&r2=1775125&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
Mon Dec 19 15:32:06 2016
@@ -43,7 +43,9 @@
var removeCurrent = this.currentBtn == _btn;
_btn.objRef.destroy();
_btn.destroy();
- if (this.subviews.length != 0 && removeCurrent) {
+ if (this.subviews.length == 0) {
+ setWhiteboardId(-1);//no WB
+ } else if (removeCurrent) {
sendActiveWindowSynced(this.subviews[this.subviews.length - 1]);
canvas._drawarea =
currentBtn.objRef._drawareaMask._drawarea;
}
@@ -70,6 +72,7 @@
currentBtn.setActive(true);
currentBtn.objRef.setAttribute("visible", true);
currentBtn.objRef.bringToFront();
+ setWhiteboardId(currentBtn.objRef.whiteboardId);
]]>
</method>
</class>
