Author: a_horuzhenko
Date: Fri Apr 19 08:11:53 2013
New Revision: 1469735
URL: http://svn.apache.org/r1469735
Log:
First name and last name are displaying instead of login while setting
whiteboard pointer.
Modified:
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
Modified:
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx?rev=1469735&r1=1469734&r2=1469735&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
Fri Apr 19 08:11:53 2013
@@ -41,9 +41,21 @@
</method>
<method name="drawPointerWhiteBoardFinal" args="newName,x,y,width,height" >
+ var displayedName = canvas.currentuser;
+ if (canvas.firstName.length() > 0) {
+ displayedName = canvas.firstName;
+ }
+ if (canvas.lastName.length > 0) {
+ if (canvas.firstName.length > 0) {
+ displayedName += " " + canvas.lastName;
+ } else {
+ displayedName = canvas.lastName;
+ }
+ }
+
var actionObject = new Array();
actionObject[0] = 'pointerWhiteBoard';
- actionObject[1] = canvas.currentuser;
+ actionObject[1] = displayedName;
actionObject[2] = this.counter;//-6
actionObject[3] = x;//-5
actionObject[4] = y;//-4
