You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by a_...@apache.org on 2013/04/19 09:27:57 UTC
svn commit: r1469720 -
/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
Author: a_horuzhenko
Date: Fri Apr 19 07:27:56 2013
New Revision: 1469720
URL: http://svn.apache.org/r1469720
Log:
First name and last name are displaying instead of login while setting whiteboard pointer.
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx?rev=1469720&r1=1469719&r2=1469720&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx Fri Apr 19 07:27:56 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
Re: svn commit: r1469720 - /openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
Posted by Artyom Horuzhenko <ak...@gmail.com>.
Hello Maxim,
First and last names are emty strings by default. See
WebContent/src/base/mainAttributes.lzx lines 280 and 283 for details
2013/4/19 Maxim Solodovnik <so...@gmail.com>
> Hello Artyom,
> Is it possible first/last name is null?
> On Apr 19, 2013 2:28 PM, <a_...@apache.org> wrote:
>
> > Author: a_horuzhenko
> > Date: Fri Apr 19 07:27:56 2013
> > New Revision: 1469720
> >
> > URL: http://svn.apache.org/r1469720
> > Log:
> > First name and last name are displaying instead of login while setting
> > whiteboard pointer.
> >
> > Modified:
> >
> >
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> >
> > Modified:
> >
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> > URL:
> >
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx?rev=1469720&r1=1469719&r2=1469720&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> > (original)
> > +++
> >
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> > Fri Apr 19 07:27:56 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
> >
> >
> >
>
Re: svn commit: r1469720 - /openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
Posted by Maxim Solodovnik <so...@gmail.com>.
Hello Artyom,
Is it possible first/last name is null?
On Apr 19, 2013 2:28 PM, <a_...@apache.org> wrote:
> Author: a_horuzhenko
> Date: Fri Apr 19 07:27:56 2013
> New Revision: 1469720
>
> URL: http://svn.apache.org/r1469720
> Log:
> First name and last name are displaying instead of login while setting
> whiteboard pointer.
>
> Modified:
>
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
>
> Modified:
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> URL:
> http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx?rev=1469720&r1=1469719&r2=1469720&view=diff
>
> ==============================================================================
> ---
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> (original)
> +++
> openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawPointer.lzx
> Fri Apr 19 07:27:56 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
>
>
>