You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/07/31 07:06:56 UTC
openmeetings git commit: no jira: minor flash error is fixed
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x ca5595649 -> 49ca5ed0c
no jira: minor flash error is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/49ca5ed0
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/49ca5ed0
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/49ca5ed0
Branch: refs/heads/3.3.x
Commit: 49ca5ed0c9f5550496a5da76bc1609857903c52c
Parents: ca55956
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 31 14:06:47 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Jul 31 14:06:47 2017 +0700
----------------------------------------------------------------------
.../main/swf/modules/conference/whiteboard/base/baseDraw.lzx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/49ca5ed0/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
index 0265907..30ec270 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
@@ -887,10 +887,11 @@
var item = this.baseactionobjectList[eg];
var px = item[item.length - 5], py = item[item.length - 4], pwidth = item[item.length - 3], pheight = item[item.length - 2];
//FIXME TODO rotation is not taken into account
- if (px <= x && px + pwidth >=x && py <= y && py + pheight >=y) {
+ if (px <= x && px + pwidth >=x && py <= y && py + pheight >= y) {
if (item[0] != "mindMapNode" && item[0] != "mindMapCenter") {
var swfObject = item[item.length - 7];
- if (swfObject == null) {
+ if ($debug) Debug.info("!!!!!!! swfObject ", typeof(swfObject), swfObject);
+ if (typeof(swfObject) != 'object' || swfObject == null) {
tempList.push(item);
} else {
if ($debug) Debug.write("getObjectInBounds :: swfObject ", swfObject.isVisible);