Author: vdegtyarev
Date: Wed Jan 15 03:28:48 2014
New Revision: 1558282
URL: http://svn.apache.org/r1558282
Log:
OPENMEETINGS-852 is fixed. Whiteboard Objects are clickable when width/high of
the object is too low.
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx?rev=1558282&r1=1558281&r2=1558282&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
Wed Jan 15 03:28:48 2014
@@ -984,10 +984,10 @@
//if ($debug) Debug.write("c4 ",(
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4]+this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-2]
),">",y);
- if ( (
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5]<x
+ if ( (
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5]<=x
&& (
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5]+this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-3])
>=x ) )
- && (
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4]<y
- && (
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4]+this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-2]
)>y ) ) {
+ && (
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4]<=y
+ && (
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4]+this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-2]
)>=y ) ) {
if (this.baseactionobjectList[eg][0] !=
"mindMapNode"
&& this.baseactionobjectList[eg][0] !=
"mindMapCenter") {
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx?rev=1558282&r1=1558281&r2=1558282&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawSelect.lzx
Wed Jan 15 03:28:48 2014
@@ -263,8 +263,8 @@
//}
if (
-
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5] > x &&
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4] > y) &&
-
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5] <
x+width &&
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4] <
y+height)
+
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5] >= x &&
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4] >= y) &&
+
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5] <=
x+width &&
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4] <=
y+height)
) {
//return this.baseactionobjectList[eg];
//this.baseactionobjectList[eg][6] = 0.2;
