Author: solomax
Date: Mon Nov 30 15:21:36 2015
New Revision: 1717275

URL: http://svn.apache.org/viewvc?rev=1717275&view=rev
Log:
[OPENMEETINGS-1279] draw image to WB is fixed

Modified:
    
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
    
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
    
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
    
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
    
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
    
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
    
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java

Modified: 
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
 Mon Nov 30 15:21:36 2015
@@ -422,8 +422,7 @@ public class WhiteBoardService implement
 
                        IConnection current = Red5.getConnectionLocal();
                        String streamid = current.getClient().getId();
-                       Client currentClient = this.sessionManager
-                                       .getClientByStreamId(streamid, null);
+                       Client currentClient = 
sessionManager.getClientByStreamId(streamid, null);
                        Long room_id = currentClient.getRoomId();
 
                        WhiteboardSyncLockObject wSyncLockObject = new 
WhiteboardSyncLockObject();
@@ -431,20 +430,15 @@ public class WhiteBoardService implement
                        
wSyncLockObject.setPublicSID(currentClient.getPublicSID());
                        wSyncLockObject.setInserted(new Date());
 
-                       Map<String, WhiteboardSyncLockObject> syncListImage = 
this.whiteBoardObjectListManager
-                                       
.getWhiteBoardObjectSyncListByRoomAndObjectId(room_id,
-                                                       object_id);
+                       Map<String, WhiteboardSyncLockObject> syncListImage = 
whiteBoardObjectListManager.getWhiteBoardObjectSyncListByRoomAndObjectId(room_id,
 object_id);
                        syncListImage.put(currentClient.getPublicSID(), 
wSyncLockObject);
-                       this.whiteBoardObjectListManager
-                                       
.setWhiteBoardImagesSyncListByRoomAndObjectId(room_id,
-                                                       object_id, 
syncListImage);
+                       
whiteBoardObjectListManager.setWhiteBoardImagesSyncListByRoomAndObjectId(room_id,
 object_id, syncListImage);
 
                        // Do only send the Token to show the Loading Splash 
for the
                        // initial-Request that starts the loading
                        if (isStarting) {
                                
scopeApplicationAdapter.sendMessageToCurrentScope("sendObjectSyncFlag", 
wSyncLockObject, true);
                        }
-
                } catch (Exception err) {
                        log.error("[startNewObjectSyncProcess]", err);
                }

Modified: 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
 Mon Nov 30 15:21:36 2015
@@ -923,18 +923,6 @@
                     
canBeDragged:boundingDoUpdateOnInit,canBeResized:boundingDoUpdateOnInit,
                     
ex:x,ey:y,ewidth:width,eheight:height,boundingDoUpdateOnInit:boundingDoUpdateOnInit});
                this.setAttribute('boundingIsActive',true);
-        
-            //if (!boundingDoUpdateOnInit) {
-            //    
this.boundingref._inner._inner.setAttribute('width',this.ObjectByName._swfView.width);
-            //    
this.boundingref._inner._inner.setAttribute('height',this.ObjectByName._swfView.height);
-            //    if ($debug) Debug.write("NEW WIDTH AND HEIGHT OF SWF 
",this.ObjectByName._swfView.width,this.ObjectByName._swfView.height);
-            //    this.boundingref._inner.setAttribute('visible',true);
-            //    parent.parent.changeMenu(2,true);
-            //    this.doUpdateDocumentToolBar();
-            //} else {
-            //    parent.parent.changeMenu(1,true);
-            //}
-             
        }
     ]]>
     </method>   
@@ -964,18 +952,6 @@
                                 boundingDoUpdateOnInit:false
                             });
             this.setAttribute('boundingIsActive',true);
-        
-            //if (!boundingDoUpdateOnInit) {
-            //    
this.boundingref._inner._inner.setAttribute('width',this.ObjectByName._swfView.width);
-            //    
this.boundingref._inner._inner.setAttribute('height',this.ObjectByName._swfView.height);
-            //    if ($debug) Debug.write("NEW WIDTH AND HEIGHT OF SWF 
",this.ObjectByName._swfView.width,this.ObjectByName._swfView.height);
-            //    this.boundingref._inner.setAttribute('visible',true);
-            //    parent.parent.changeMenu(2,true);
-            //    this.doUpdateDocumentToolBar();
-            //} else {
-            //    parent.parent.changeMenu(1,true);
-            //}
-             
         }
     ]]>
     </method>   
@@ -994,14 +970,6 @@
                if ($debug) Debug.write("getObjectInBounds 
this.baseactionobjectList1: ",x,y,this.baseactionobjectList);
                
                for (var eg=0;eg<this.baseactionobjectList.length;eg++){
-                       
-                       
-                       //if ($debug) Debug.write("c1 
",this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5],"<",x);
-            //if ($debug) Debug.write("c2 
",(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5]+this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-3]),">",x);
-            //if ($debug) Debug.write("c3 
",this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4],"<",y);
-            //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 
                                && ( 
(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 

Modified: 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
 Mon Nov 30 15:21:36 2015
@@ -65,16 +65,7 @@
         -->
        <method name="addImageToLayer" 
args="obj,nameing,urlname,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,uniqueObjectSyncName,isLocalSync">
         <![CDATA[
-                       //only show if it is not part of wml-file-object
-                       //do not show at all as this is handled via the remote 
Object
-                       //if (!this.isWmlLoaderImage) {
-                       //      this.loadimageDataWinRef = new 
lz.loadWhiteboardWindow(canvas.main_content._content.inner,{refObj:this});
-                       //      
this.loadimageDataWinRef.setMessage(canvas.getLabelName(this.imageLoadMessageId));
-                       //}
-                       
             if ($debug) Debug.write("addImageToLayer ",urlname);
-               //if ($debug) Debug.write("addImageToLayer 
",obj,nameing,urlname,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain);
-                       //if ($debug) Debug.write("addImageToLayer posx ",posx);
                
                        if ($debug) Debug.write("addImageToLayer urlname : ", 
canvas.getUrl() + 'DownloadHandler');
                        var src = canvas.getUrl() + 'DownloadHandler' + 
'?fileName=' + encodeURIComponent(fileName) + 
@@ -84,7 +75,6 @@
                                '&sid=' + canvas.sessionId;
        
                if ($debug) Debug.write("addImageToLayer -src- ",src);
-                     
                        if ($debug) Debug.write("alterModus: ",alterModus);
                        
                        this.currentlayer = new lz.imageForDrawView(obj,{
@@ -96,9 +86,6 @@
                                uniqueObjectSyncName:uniqueObjectSyncName,
                                isLocalSync:isLocalSync});      
                        
-                       
//this.parent.parent.isloadingImage.sendEvent(this.currentlayer);
-                       //this.parent._loading.setAttribute('visible',true);
-                       
                        //Add Layer to global Layer     
                    return this.currentlayer;
                ]]>

Modified: 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
 Mon Nov 30 15:21:36 2015
@@ -8,8 +8,8 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-      http://www.apache.org/licenses/LICENSE-2.0
-         
+         http://www.apache.org/licenses/LICENSE-2.0
+                 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,202 +21,187 @@
 <library>
 
 <class name="baseDrawObject" extends="baseDrawPointer">
-    
-    <!-- it uses some of the attribute's defined in baseDrawImage -->
-    <attribute name="newSlideNumber" value="1" type="number" />
-    
-    <attribute name="fullFit" value="true" type="boolean" />
-    
-    <attribute name="modernToolbar" value="false" type="boolean" />
+       <!-- it uses some of the attribute's defined in baseDrawImage -->
+       <attribute name="newSlideNumber" value="1" type="number" />
+       <attribute name="fullFit" value="true" type="boolean" />
 
-    <!-- 
-       Invoked by the Library directly
-       Loads a SWFPresenation to the whiteBoard
-     -->
-    <method name="loadSWFPresentationSynced" 
args="url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName">
+       <!-- 
+               Invoked by the Library directly
+               Loads a SWFPresenation to the whiteBoard
+        -->
+       <method name="loadSWFPresentationSynced" 
args="url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName">
                var now = new Date();
                //This invokes a Method which is in the remoteWhiteboard.lzx
                this.startNewObjectSyncProcess.isStarting = true;
                this.startNewObjectSyncProcess.uniqueObjectSyncName = fileName 
+ now.getTime();
                this.startNewObjectSyncProcess.doCall();
-        //if ($debug) 
Debug.write("loadSWFPresentationSynced",url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName);
-        
this.addPresentationToLayer(this,url,'swfpresentationobject'+this.getCounter(),
-               0,0,0,0,
-               true,
-               url,fileName,moduleName,parentPath,room,domain,slideNumber,
-               100,0,0,0,0,
-               this.startNewObjectSyncProcess.uniqueObjectSyncName,
-            standardFileName,this.fullFit);
-            
-        
-    </method>
-    
-    <method name="setCurrentScaleByFullFit" args="scaleFactor">
-       <![CDATA[
-       
-               var tScale = Math.round(scaleFactor*100);
-               
-               this.getDisplayObject().scaleX = scaleFactor;
-               this.getDisplayObject().scaleY = scaleFactor;
-               
-               this.setAttribute("x",0);
-               this.setAttribute("y",0);
-               
-               //Already send by x,y change
-               //this.onupdateScale.sendEvent(null);
-               if ($debug) Debug.write("setCurrentScaleByFullFit -1- ",tScale);
-               
-               parent.parent.zoombox.setCurrentScaleByFullFit(tScale);
-       
-       ]]>
-    </method>
-    
-    <method name="doUpdateFullFit" args="fullFit,zoom">
-       <![CDATA[
-       
-            if (canvas.ismoderator) {
-                       if ($debug) Debug.write("doUpdateFullFit 
",fullFit,zoom);
-               
-                       var actionObject = new Array();
-                       actionObject.push("whiteboardObj");
-                       actionObject.push(fullFit);
-                       
-                       this.doFullFit(fullFit);
-                       
-                       actionObject.push(this.getDisplayObject().scaleX * 100);
-                       
-                       if ($debug) Debug.write("doUpdateFullFit 
",fullFit,this.getDisplayObject().scaleX);
-                       this.onsharedMessage('whiteboardObj',actionObject);
-               }       
-       
-       ]]>
-    </method>
-    
-    <method name="doUpdateZoom" args="fullFit,zoom">
-       <![CDATA[
-       
-               if ($debug) Debug.write("doUpdateZoom ",this.fullFit,zoom);
-               
-               this.getDisplayObject().scaleX = zoom / 100;
-               this.getDisplayObject().scaleY = zoom / 100;
-               
-               if ($debug) Debug.write("doUpdateZoom is moderator ", 
canvas.ismoderator);
-            if (canvas.ismoderator) {
-                       var actionObject = new Array();
-                       actionObject.push("whiteboardObj");
-                       actionObject.push(fullFit);
-                       actionObject.push(zoom);
-               
-                       this.onupdateScale.sendEvent(null);
-                       this.onsharedMessage('whiteboardObj',actionObject);     
-            }
-       
-       ]]>
-    </method>
-    
-    <method name="doUpdateFullFitAndZoomRemote" args="actionObject">
-       <![CDATA[
-               
parent.parent.zoombox.setWhiteboardValues(actionObject[1],actionObject[2]);
-               if ($debug) Debug.write("doUpdateFullFitAndZoomRemote 
",actionObject[1],actionObject[2]);
+               //if ($debug) 
Debug.write("loadSWFPresentationSynced",url,fileName,moduleName,parentPath,room,domain,slideNumber,standardFileName);
+               
this.addPresentationToLayer(this,url,'swfpresentationobject'+this.getCounter(),
+                       0,0,0,0,
+                       true,
+                       
url,fileName,moduleName,parentPath,room,domain,slideNumber,
+                       100,0,0,0,0,
+                       this.startNewObjectSyncProcess.uniqueObjectSyncName,
+                       standardFileName,this.fullFit);
+       </method>
+       
+       <method name="setCurrentScaleByFullFit" args="scaleFactor">
+       <![CDATA[
+               var tScale = Math.round(scaleFactor*100);
+               
+               this.getDisplayObject().scaleX = scaleFactor;
+               this.getDisplayObject().scaleY = scaleFactor;
+               
+               this.setAttribute("x",0);
+               this.setAttribute("y",0);
+               
+               //Already send by x,y change
+               //this.onupdateScale.sendEvent(null);
+               if ($debug) Debug.write("setCurrentScaleByFullFit -1- ",tScale);
+               
+               parent.parent.zoombox.setCurrentScaleByFullFit(tScale);
+       ]]>
+       </method>
+       
+       <method name="doUpdateFullFit" args="fullFit,zoom">
+       <![CDATA[
+               if (canvas.ismoderator) {
+                       if ($debug) Debug.write("doUpdateFullFit 
",fullFit,zoom);
+               
+                       var actionObject = new Array();
+                       actionObject.push("whiteboardObj");
+                       actionObject.push(fullFit);
+                       
+                       this.doFullFit(fullFit);
+                       
+                       actionObject.push(this.getDisplayObject().scaleX * 100);
+                       
+                       if ($debug) Debug.write("doUpdateFullFit 
",fullFit,this.getDisplayObject().scaleX);
+                       this.onsharedMessage('whiteboardObj',actionObject);
+               }       
+       ]]>
+       </method>
+       
+       <method name="doUpdateZoom" args="fullFit,zoom">
+       <![CDATA[
+               if ($debug) Debug.write("doUpdateZoom ",this.fullFit,zoom);
+               
+               this.getDisplayObject().scaleX = zoom / 100;
+               this.getDisplayObject().scaleY = zoom / 100;
+               
+               if ($debug) Debug.write("doUpdateZoom is moderator ", 
canvas.ismoderator);
+               if (canvas.ismoderator) {
+                       var actionObject = new Array();
+                       actionObject.push("whiteboardObj");
+                       actionObject.push(fullFit);
+                       actionObject.push(zoom);
+               
+                       this.onupdateScale.sendEvent(null);
+                       this.onsharedMessage('whiteboardObj',actionObject);     
+               }
+       ]]>
+       </method>
+       
+       <method name="doUpdateFullFitAndZoomRemote" args="actionObject">
+       <![CDATA[
+               
parent.parent.zoombox.setWhiteboardValues(actionObject[1],actionObject[2]);
+               if ($debug) Debug.write("doUpdateFullFitAndZoomRemote 
",actionObject[1],actionObject[2]);
 
-               this.doFullFit(actionObject[1]);
-               
-               if (!actionObject[1]) {
-                       this.getDisplayObject().scaleX = actionObject[2] / 100;
-                       this.getDisplayObject().scaleY = actionObject[2] / 100;
-                       this.onupdateScale.sendEvent(null);
-               }
-       
-       ]]>
-    </method>
-    
-    <method name="doFullFit" args="v">
-        <![CDATA[
-               if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v);
-               if ($debug) Debug.write(this.ObjectByName);
-        
-               this.fullFit = v;
-               
-            if (this.ObjectByName && this.ObjectByName.typeOfObject=="swf") {  
  
-                if (v) {
-                    if ($debug) Debug.write("Do Full Fit !");
-                    this.ObjectByName._swfView.initialLoadFullFit();
-                }
-            }
-            
-        ]]>
-    </method>
-    
-    <method name="checkSWFPresentation" 
args="url,fileName,moduleName,parentPath,room,domain,slideNumber">
-        
//this.addPresentationToLayer(this,url,'swfpresentationobject'+this.getCounter(),0,0,0,0,true,url,fileName,moduleName,parentPath,room,domain,slideNumber);
-        <![CDATA[
-            for (var i=0;i<this.baseactionobjectList.length;i++){
-                if (fileName==this.baseactionobjectList[i][3]){
-                    var whiteBoardName = 
this.baseactionobjectList[i][this.baseactionobjectList[i].length-1];
-                    //Debug.write("Found File: 
",whiteBoardName,this.baseactionobjectList[i]);
-                    //this.baseactionobjectList[i].bringToFront();
-                    this.doShowObjectBounds(whiteBoardName);
-                    this.newSlideNumber = slideNumber;
-                    this.doDocumentAction('setSlideNumber');
-                    return true;
-                }
-            } 
-            return false;
-        ]]>
-    </method>
-    
+               this.doFullFit(actionObject[1]);
+               
+               if (!actionObject[1]) {
+                       this.getDisplayObject().scaleX = actionObject[2] / 100;
+                       this.getDisplayObject().scaleY = actionObject[2] / 100;
+                       this.onupdateScale.sendEvent(null);
+               }
+       ]]>
+       </method>
+       
+       <method name="doFullFit" args="v">
+       <![CDATA[
+               if ($debug) Debug.write("Do Full Fit ? doFullFit: ", v);
+               if ($debug) Debug.write(this.ObjectByName);
+       
+               this.fullFit = v;
+               
+               if (this.ObjectByName && this.ObjectByName.typeOfObject=="swf") 
{       
+                       if (v) {
+                               if ($debug) Debug.write("Do Full Fit !");
+                               this.ObjectByName._swfView.initialLoadFullFit();
+                       }
+               }
+       ]]>
+       </method>
+       
+       <method name="checkSWFPresentation" 
args="url,fileName,moduleName,parentPath,room,domain,slideNumber">
+       <![CDATA[
+               for (var i=0;i<this.baseactionobjectList.length;i++){
+                       if (fileName==this.baseactionobjectList[i][3]){
+                               var whiteBoardName = 
this.baseactionobjectList[i][this.baseactionobjectList[i].length-1];
+                               //Debug.write("Found File: 
",whiteBoardName,this.baseactionobjectList[i]);
+                               //this.baseactionobjectList[i].bringToFront();
+                               this.doShowObjectBounds(whiteBoardName);
+                               this.newSlideNumber = slideNumber;
+                               this.doDocumentAction('setSlideNumber');
+                               return true;
+                       }
+               } 
+               return false;
+       ]]>
+       </method>
+       
        <!--
                alterModus => this is added by the mod not remotely
                
                adds the SWF-Object to the Layer
         -->
        <method name="addPresentationToLayer" 
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery,uniqueObjectSyncName,standardFileName,fullFit">
-        <![CDATA[
-            if ($debug) Debug.write("addPresentationToLayer",standardFileName);
-            
-            var downloadurl = canvas.getUrl() + 'DownloadHandler?' +
-                    'fileName=' + encodeURIComponent(fileName) +
-                    '&moduleName=' + moduleName + 
-                    '&parentPath=' + encodeURIComponent(parentPath + '/') +
-                    '&room_id='+room + 
-                    '&sid='+canvas.sessionId;
-            
-            this.currentlayer = new 
lz.swfResourceView(obj,{refObj:this,name:nameing,
-               x:posx,y:posy,alterModus:alterModus,
-               
baseurl:baseurl,fileName:fileName,moduleName:moduleName,parentPath:parentPath,
-               room:room,domain:domain,slideNumber:slideNumber,
-               currentzoom:currentzoom,fullFit:fullFit,
-                standardFileName:standardFileName,
-               innerwidth:innerwidth,innerheight:innerheight,
-               innerx:innerx,innery:innery,
-               uniqueObjectSyncName:uniqueObjectSyncName});
+       <![CDATA[
+               if ($debug) 
Debug.write("addPresentationToLayer",standardFileName);
+               
+               var downloadurl = canvas.getUrl() + 'DownloadHandler?' +
+                               'fileName=' + encodeURIComponent(fileName) +
+                               '&moduleName=' + moduleName + 
+                               '&parentPath=' + encodeURIComponent(parentPath 
+ '/') +
+                               '&room_id='+room + 
+                               '&sid='+canvas.sessionId;
+               
+               this.currentlayer = new 
lz.swfResourceView(obj,{refObj:this,name:nameing,
+                       x:posx,y:posy,alterModus:alterModus,
+                       
baseurl:baseurl,fileName:fileName,moduleName:moduleName,parentPath:parentPath,
+                       room:room,domain:domain,slideNumber:slideNumber,
+                       currentzoom:currentzoom,fullFit:fullFit,
+                       standardFileName:standardFileName,
+                       innerwidth:innerwidth,innerheight:innerheight,
+                       innerx:innerx,innery:innery,
+                       uniqueObjectSyncName:uniqueObjectSyncName});
 
-            this.currentlayer._swfView.setSource(downloadurl);
-            
-            this.addItemToDocumentToolBar();
-            this.doUpdateDocumentToolBar();
-               ]]>
+               this.currentlayer._swfView.setSource(downloadurl);
+               
+               this.addItemToDocumentToolBar();
+               this.doUpdateDocumentToolBar();
+       ]]>
        </method>
        
-    <method name="addSWFToLayerHistory" args="actionObject,refObj,isWmlLoader">
-        this.isWmlLoaderImage = isWmlLoader;
-        this.baseactionobjectList.push(actionObject);   
-        
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
-            
actionObject[actionObject.length-5],actionObject[actionObject.length-4],actionObject[actionObject.length-3],
-            
actionObject[actionObject.length-2],false,actionObject[2],actionObject[3],actionObject[4],actionObject[5],
-            actionObject[6],actionObject[7],
-            
actionObject[8],actionObject[16],actionObject[11],actionObject[12],actionObject[9],actionObject[10],
-            actionObject[17],actionObject[18],actionObject[19]);
-    </method>
-    
-    <!-- 
-       Invoked by the remote Host, see sendWatchObject in baseDraw.lzx
-     -->
-    <method name="addSWFToLayerHistorySynced" args="actionObject,refObj">
-        this.baseactionobjectList.push(actionObject);  
+       <method name="addSWFToLayerHistory" 
args="actionObject,refObj,isWmlLoader">
+               this.isWmlLoaderImage = isWmlLoader;
+               this.baseactionobjectList.push(actionObject);   
+               
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
+                       
actionObject[actionObject.length-5],actionObject[actionObject.length-4],actionObject[actionObject.length-3],
+                       
actionObject[actionObject.length-2],false,actionObject[2],actionObject[3],actionObject[4],actionObject[5],
+                       actionObject[6],actionObject[7],
+                       
actionObject[8],actionObject[16],actionObject[11],actionObject[12],actionObject[9],actionObject[10],
+                       actionObject[17],actionObject[18],actionObject[19]);
+       </method>
+       
+       <!-- 
+               Invoked by the remote Host, see sendWatchObject in baseDraw.lzx
+        -->
+       <method name="addSWFToLayerHistorySynced" args="actionObject,refObj">
+               this.baseactionobjectList.push(actionObject);   
                this.startNewObjectSyncProcess.isStarting = false;
                this.startNewObjectSyncProcess.uniqueObjectSyncName = 
actionObject[17];
-               this.startNewObjectSyncProcess.doCall();        
+               this.startNewObjectSyncProcess.doCall();                
                
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
                        
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
                        
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
@@ -233,7 +218,7 @@
                addSWFToLayerHistoryToLocalLoaded
         -->
        <method name="addSWFToLayerHistoryToLocal" args="actionObject,refObj">
-        this.baseactionobjectList.push(actionObject);  
+               this.baseactionobjectList.push(actionObject);   
                
this.addPresentationToLayer(refObj,actionObject[1],actionObject[actionObject.length-1],
                        
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
                        
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
@@ -245,39 +230,39 @@
        
        <method name="registerNewSWF" 
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,innerx,innery,innerwidth,innerheight,zoomlevel,currentzoom,initwidth,initheight,uniquObjectSyncName,doUpdateMessage,standardFileName,fullFit,zIndex">
                var actionObject = new Array();
-           actionObject.push('swf');//0
-           actionObject.push(urlname);//1
+               actionObject.push('swf');//0
+               actionObject.push(urlname);//1
                actionObject.push(baseurl);//2
                actionObject.push(fileName);//3
                actionObject.push(moduleName);//4
                actionObject.push(parentPath);//5
                actionObject.push(room);//6
                actionObject.push(domain);//7
-        actionObject.push(slideNumber);//8
-        actionObject.push(innerx);//9
-        actionObject.push(innery);//10
-        actionObject.push(innerwidth);//11
-        actionObject.push(innerheight);//12
-        actionObject.push(zoomlevel);//13
-        actionObject.push(initwidth);//14
-        actionObject.push(initheight);//15
-        actionObject.push(currentzoom);//16
-        actionObject.push(uniquObjectSyncName);//17
-        actionObject.push(standardFileName);//18
-        actionObject.push(fullFit);//19
-        actionObject.push(zIndex);//-8
-        actionObject.push(null);//-7
+               actionObject.push(slideNumber);//8
+               actionObject.push(innerx);//9
+               actionObject.push(innery);//10
+               actionObject.push(innerwidth);//11
+               actionObject.push(innerheight);//12
+               actionObject.push(zoomlevel);//13
+               actionObject.push(initwidth);//14
+               actionObject.push(initheight);//15
+               actionObject.push(currentzoom);//16
+               actionObject.push(uniquObjectSyncName);//17
+               actionObject.push(standardFileName);//18
+               actionObject.push(fullFit);//19
+               actionObject.push(zIndex);//-8
+               actionObject.push(null);//-7
                actionObject.push(this.counter);//-6
-           actionObject.push(posx);//-5
-           actionObject.push(posy);//-4
-           actionObject.push(width);//-3
-           actionObject.push(height);//-2
-           actionObject.push(this.currentlayer.name);//-1
-           this.baseactionobjectList.push(actionObject);
-           this.checkStepLayers();
-           if (doUpdateMessage) this.onsharedMessage('draw',actionObject);     
-       </method>    
-    
+               actionObject.push(posx);//-5
+               actionObject.push(posy);//-4
+               actionObject.push(width);//-3
+               actionObject.push(height);//-2
+               actionObject.push(this.currentlayer.name);//-1
+               this.baseactionobjectList.push(actionObject);
+               this.checkStepLayers();
+               if (doUpdateMessage) this.onsharedMessage('draw',actionObject); 
+       </method>       
+       
        <!--
                Invoked by the swfResource, if the alterModus = true,
                throws an Update-Event to all connected Clients
@@ -287,7 +272,7 @@
                this.doRegisterNewSwf(true);
                this.sendCompletedObjectSyncEvent.uniqueObjectSyncName = 
this.syncImageRefObj.uniqueObjectSyncName;
                this.sendCompletedObjectSyncEvent.doCall();
-       </method>    
+       </method>       
        
        <!--
                Invoked by the swfResource, if the alterModus = false,
@@ -305,35 +290,33 @@
        -->
        <method name="storeTempValsAndLoadSyncListSWFRecording" args="objRef">
                this.syncImageRefObj = objRef;
-               //this.doRegisterNewSwf();
-               //this.sendCompleteSWFSync();
                //This invokes a Method which is in the remoteWhiteboard.lzx
                this.sendCompletedObjectSyncEvent.uniqueObjectSyncName = 
this.syncImageRefObj.uniqueObjectSyncName;
                this.sendCompletedObjectSyncEvent.doCall();
-       </method>    
-    
-    <method name="doRegisterNewSwf" args="doUpdateMessage">
+       </method>       
+       
+       <method name="doRegisterNewSwf" args="doUpdateMessage">
                //now send notifications to connected clients
                this.setAttribute('drawmodus','hand');
-        
+               
                
this.registerNewSWF(this.syncImageRefObj.baseurl,this.syncImageRefObj.x,
-                this.syncImageRefObj.y,this.syncImageRefObj._swfView.width,
-                
this.syncImageRefObj._swfView.height,this.syncImageRefObj.baseurl,
-                this.syncImageRefObj.fileName,this.syncImageRefObj.moduleName,
-                this.syncImageRefObj.parentPath,this.syncImageRefObj.room,
-                this.syncImageRefObj.domain,this.syncImageRefObj.slideNumber,
-                
this.syncImageRefObj._swfView.x,this.syncImageRefObj._swfView.y,
-                
this.syncImageRefObj._swfView.width,this.syncImageRefObj._swfView.height,
-                
this.syncImageRefObj.zoomlevel,this.syncImageRefObj.currentzoomFactor,
-                this.syncImageRefObj.initwidth,this.syncImageRefObj.initheight,
-                this.syncImageRefObj.uniqueObjectSyncName,doUpdateMessage,
-                this.syncImageRefObj.standardFileName,
-                this.syncImageRefObj.fullFit,
-                this.getZIndex());
-        
+                               
this.syncImageRefObj.y,this.syncImageRefObj._swfView.width,
+                               
this.syncImageRefObj._swfView.height,this.syncImageRefObj.baseurl,
+                               
this.syncImageRefObj.fileName,this.syncImageRefObj.moduleName,
+                               
this.syncImageRefObj.parentPath,this.syncImageRefObj.room,
+                               
this.syncImageRefObj.domain,this.syncImageRefObj.slideNumber,
+                               
this.syncImageRefObj._swfView.x,this.syncImageRefObj._swfView.y,
+                               
this.syncImageRefObj._swfView.width,this.syncImageRefObj._swfView.height,
+                               
this.syncImageRefObj.zoomlevel,this.syncImageRefObj.currentzoomFactor,
+                               
this.syncImageRefObj.initwidth,this.syncImageRefObj.initheight,
+                               
this.syncImageRefObj.uniqueObjectSyncName,doUpdateMessage,
+                               this.syncImageRefObj.standardFileName,
+                               this.syncImageRefObj.fullFit,
+                               this.getZIndex());
+               
                //set modus to hand so users can directly select that image
                this.setModus('swf');
-    </method>
+       </method>
        
        <method name="sendSyncNotificationSWF">
                this.imageLoadingCompleteMessage = new Array();
@@ -342,357 +325,318 @@
                this.sendMessageWithClientSWF.doCall();
        </method>       
 
-    <method name="doDocumentAction" args="action">
-        <![CDATA[
-            if ($debug) Debug.info("doDocumentAction :1: sendCurrentSWFObject 
",action);
-            if (this.ObjectByName.typeOfObject=="swf") {
-                if (action=="doc_first"){
-                    this.ObjectByName._swfView.setAttribute('frame',1);
-                } else if (action=="doc_pre"){
-                    if (this.ObjectByName._swfView.frame>1){
-                        
this.ObjectByName._swfView.setAttribute('frame',(this.ObjectByName._swfView.frame-1));
-                    }
-                } else if (action=="doc_next"){
-                    if 
(this.ObjectByName._swfView.frame<this.ObjectByName._swfView.totalframes){
-                        
this.ObjectByName._swfView.setAttribute('frame',(this.ObjectByName._swfView.frame+1));
-                    }
-                } else if (action=="doc_last"){
-                    
this.ObjectByName._swfView.setAttribute('frame',(this.ObjectByName._swfView.totalframes));
-                } else if (action=="doc_zoom_minus"){
-                       
-                       if ($debug) Debug.write("doc_zoom_minus ");
-                       return;
-                       
-                    
this.ObjectByName.currentzoomFactor-=this.ObjectByName.zoomlevel;       
-                    var newwidth = 
(this.ObjectByName.initwidth/100)*this.ObjectByName.currentzoomFactor;
-                    var newheight = 
(this.ObjectByName.initheight/100)*this.ObjectByName.currentzoomFactor;
-                    this.ObjectByName._swfView.setAttribute('width',newwidth);
-                    
this.ObjectByName._swfView.setAttribute('height',newheight);
-                    
this.boundingref.doSetInnerObjectsBounds(newwidth,newheight);
-                } else if (action=="doc_zoom_plus"){
-                       
-                       if ($debug) Debug.write("doc_zoom_plus ");
-                       return;
-                       
-                    
this.ObjectByName.currentzoomFactor+=this.ObjectByName.zoomlevel;       
-                    //Debug.write("doc_zoom_plus 
1",this.ObjectByName.currentzoomFactor,this.ObjectByName.zoomlevel);
-                    var newwidth = 
(this.ObjectByName.initwidth/100)*this.ObjectByName.currentzoomFactor;
-                    var newheight = 
(this.ObjectByName.initheight/100)*this.ObjectByName.currentzoomFactor;
-                    //Debug.write(this.ObjectByName);
-                    //Debug.write("doc_zoom_plus 2",newwidth,newwidth);
-                    this.ObjectByName._swfView.setAttribute('width',newwidth);
-                    
this.ObjectByName._swfView.setAttribute('height',newheight);
-                    
this.boundingref.doSetInnerObjectsBounds(newwidth,newheight);
-                } else if (action=="setSlideNumber"){
-                    if (this.newSlideNumber>0 && 
this.newSlideNumber<=this.ObjectByName._swfView.totalframes){
-                       if ($debug) Debug.warn("Slide New Number 
",this.newSlideNumber);
-                        
this.ObjectByName._swfView.setAttribute('frame',this.newSlideNumber);
-                    } else {
-                        if ($debug) Debug.warn("Slide Number out of range of 
that document TotalFrames: ",this.ObjectByName._swfView.totalframes);
-                    }
-                }
-                this.ObjectByName.slideNumber =  
this.ObjectByName._swfView.frame;
-                this.doUpdateDocumentToolBar();
-                
-                if ($debug) Debug.info("doDocumentAction :2: 
sendCurrentSWFObject");
-                
-                this.sendCurrentSWFObject(this.ObjectByName);
-                
-            }
-        ]]>
-    </method>
-    
-    <method name="addItemToDocumentToolBar">
-       var docToolbar = this.getDocumentToolBar();
-       docToolbar.addCurrentObject(this.currentlayer);
-    </method>
-    
-    <method name="setCurrentDocumentByToolBar" args="itemRefName">
-        if (this.boundingIsActive){
-               if (this.boundingref.objRef.name != itemRefName) {
-                       this.boundingref._innerDrag.onmouseup.sendEvent();
-               }
-        }
-        this.setCurrentDocument(null);
-    </method>
-    
-    <method name="setCurrentDocument" args="itemRefName">
-       var t = this.getObjectByName(itemRefName);
-       if (t==null) {
-               return;
-       }
-        this.ObjectByName = t;
-        this.doUpdateDocumentToolBar();
-        
-        if ($debug) Debug.write("setCurrentDocument 
",itemRefName,this.ObjectByName);
-        
-        //not needed anymore
-        //this.sendItemToFront(itemRefName);
-        //this.bringItemToFrontByName(itemRefName);
-    </method>
-    
-    <method name="sendItemToFront" args="itemRefName">
-        var actionObject = new Array();
-        actionObject[0] = 'item';
-        actionObject[1] = itemRefName;
-        this.onsharedMessage('sendItemToFront',actionObject);
-    </method>    
-    
-    <method name="bringItemToFrontByName" args="itemRefName">
-        this.ObjectByName = this.getObjectByName(itemRefName);
-        this.ObjectByName.bringToFront();
-    </method>
-    
-    <method name="doUpdateDocumentToolBarByParticipant" args="itemObjName">
-        this.ObjectByName = this.getObjectByName(itemObjName);
-        this.doUpdateDocumentToolBar();
-    </method>
-    
-    <method name="doUpdateDocumentToolBar">
-       <![CDATA[
-               if (this.modernToolbar) {
-                //@deprecated
-                //this code is not valdi for the latest dev anymore, only 
inside for 
-                //backward compatibility
-               
//this.parent.parent._documentmenu._currentSlideNo.setAttribute('text',this.ObjectByName._swfView.frame);
-               
//this.parent.parent._documentmenu._totalSlideNo.setAttribute('text',this.ObjectByName._swfView.totalframes);
-               
//this.parent.parent._documentmenu._zoom.setAttribute('text',this.ObjectByName.currentzoomFactor);
-               
-            } else {
-                
-                       var docToolbar = this.getDocumentToolBar();
-                       
-                if ($debug) Debug.write("doUpdateDocumentToolBar 
",docToolbar.parent.parent.ignoreUpdates);
-                docToolbar.parent.parent.ignoreUpdates = true;
-                
-                       if (this["ObjectByName"] && this.ObjectByName != null 
&& this.ObjectByName._swfView) {
-                    
-                    if ($debug) Debug.warn("doUpdateDocumentToolBar 
",this.ObjectByName.fullFit);
-                    
-                               
docToolbar._currentSlideNo.setAttribute('text',this.ObjectByName._swfView.frame);
-                    
docToolbar._totalSlideNo.setAttribute('text',this.ObjectByName._swfView.totalframes);
-                    
//docToolbar._zoom.setAttribute('text',this.ObjectByName.currentzoomFactor);
-                    
//docToolbar.parent._fullFit.setValue(this.ObjectByName.fullFit);
-                       } else {
-                               
docToolbar._currentSlideNo.setAttribute('text',"0");
-                    docToolbar._totalSlideNo.setAttribute('text',"0");
-                    //docToolbar._zoom.setAttribute('text',"100");
-                    //docToolbar.parent._fullFit.setValue(false);
-                       }
-                
-                docToolbar.parent.parent.ignoreUpdates = false;
-               
-               }
-       ]]>
-    </method>
-    
-    <method name="doDeleteFromDocumentsBar" args="itemRefName">
-       var docToolbar = this.getDocumentToolBar();
-       docToolbar.removeDocument(itemRefName);
-    </method>
-    
-    <method name="clearDocumentsBar">
-       var docToolbar = this.getDocumentToolBar();
-       docToolbar.clearDocumentsBar();
-    </method>
-    
-    <method name="sendCurrentSWFObject" args="objRef">
-               <![CDATA[
-            if ($debug) Debug.write("sendCurrentSWFObject :: 
",objRef,objRef.name);
-            var objName = objRef.name;
-            for (var eg=0;eg<this.baseactionobjectList.length;eg++){
-                if 
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==objName)
 {
-                    ////Debug.write("Found Object: 
",this.baseactionobjectList[eg]);
-                    var sendSlideObjectUpdate = false;
-                    if (this.baseactionobjectList[eg][8] != 
objRef.slideNumber) {
-                       sendSlideObjectUpdate = true;
-                    }
-                    this.baseactionobjectList[eg][8] = objRef.slideNumber;
-                    this.baseactionobjectList[eg][9] = objRef._swfView.x;
-                    this.baseactionobjectList[eg][10] = objRef._swfView.y;
-                    this.baseactionobjectList[eg][11] = objRef._swfView.width;
-                    this.baseactionobjectList[eg][12] = objRef._swfView.height;
-                    this.baseactionobjectList[eg][13] = objRef.zoomlevel;
-                    this.baseactionobjectList[eg][16] = 
objRef.currentzoomFactor;
-                    this.baseactionobjectList[eg][19] = objRef.fullFit;
-                    var newA = this.baseactionobjectList[eg];
-                    if (newA[0]=='paint') newA[1] = new Array();               
                
-                    this.onsharedMessage('swf',newA);  
-                    if (sendSlideObjectUpdate) {
-                        
this.updateObjectsToSlideNumber(this.baseactionobjectList[eg]);
-                    }
-                    break;
-                }
-            }  
-               ]]>
-       </method>
-    
-    <method name="remoteObjectUpdate" args="lastactionObject">
-        <![CDATA[
-        
-            var obj = 
this.getObjectByName(lastactionObject[lastactionObject.length-1]);
-            
-            if ($debug) Debug.write("remoteObjectUpdate :: ",obj.fullFit);
-            obj._swfView.doSendChangeValue = false;
-            var sendSlideObjectUpdate = false;
-            if (obj.slideNumber != lastactionObject[8]) {
-               sendSlideObjectUpdate = true;
-            }
-                       obj.slideNumber = lastactionObject[8];
-                       obj._swfView.setAttribute('x',lastactionObject[9]);
-                       obj._swfView.setAttribute('y',lastactionObject[10]);
-                       obj._swfView.setAttribute('width',lastactionObject[11]);
-            obj._swfView.setAttribute('height',lastactionObject[12]);
-            //obj.zoomlevel = lastactionObject[13];
-            //obj.currentzoomFactor = lastactionObject[16];
-            obj.fullFit = lastactionObject[19];
-            
-            if ($debug) Debug.write("DO initialLoadFullFit ?? ",obj.fullFit);
-            
-            if (obj.fullFit) {
-                if ($debug) Debug.write("DO initialLoadFullFit !! ");
-                obj._swfView.initialLoadFullFit();
-            }
-            
-            obj._swfView.setAttribute('frame',obj.slideNumber);
-            obj._swfView.doSendChangeValue = true;
-            
-            this.doUpdateDocumentToolBarByParticipant(obj.name);
-            
-            this.remoteUpdateBaseObjectList(lastactionObject);
-            
-            if (sendSlideObjectUpdate) {
-                this.updateObjectsToSlideNumber(lastactionObject);
-            }
-        ]]>
-    </method>
-    
-    <method name="remoteUpdateBaseObjectList" args="actionObject">
-               <![CDATA[
-            ////Debug.write("remoteUpdateBaseObjectList : ",actionObject);
-            for (var eg=0;eg<this.baseactionobjectList.length;eg++){
-                if 
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==actionObject[actionObject.length-1])
 {
-                    this.baseactionobjectList[eg] = actionObject;
-                    break;
-                }
-            }  
-               ]]>
-    </method>
-    
-    
-    
-    
-    
-    <method name="playVideoSynced" args="fileId,fileName,flv_width,flv_height">
-        <![CDATA[
-        
-            if ($debug) Debug.write("playVideoSynced : ", 
fileId,fileName,flv_width,flv_height);
-        
-            var tName = 'flv'+this.getCounter();
-            
-            this.currentlayer = new lz.whiteboardVideoPlayer(this,{
-                                            name:tName,
-                                            fileId: fileId,
-                                            title:fileName,
-                                            sendInit:true,
-                                            flv_width:flv_width,
-                                            flv_height:flv_height
-                                        });
-                                        
-            this.layers.push(this.currentlayer);  
-        ]]>
-    </method>
-    
-    <method name="sendNewVideoRemote" args="refObj">
-        <![CDATA[
-        
-            if ($debug) Debug.write("sendNewVideoRemote : 
",refObj.fileId,refObj.title);
-        
-            
this.flvregisterFinal(refObj.name,refObj.x,refObj.y,refObj.width,refObj.height,
-                                                refObj.fileId,refObj.title,
-                                                false, //isPlaying
-                                                refObj.flv_width,
-                                                refObj.flv_height,
-                                                this.getZIndex());
-                        
-            
-        ]]>
-    </method>
-    
-    <method name="flvregisterFinal" 
args="newName,x,y,width,height,fileId,fileName,isPlaying,flv_width,flv_height,zIndex">
-        var actionObject = new Array();
-        actionObject[0] = 'flv';
-        actionObject[1] = fileId;
-        actionObject[2] = fileName;
-        actionObject[3] = isPlaying;
-        actionObject[4] = flv_width; 
-        actionObject[5] = flv_height;   
-        actionObject[6] = zIndex;//-8
-        actionObject[7] = null;//-7
-        actionObject[8] = this.counter;//-6
-        actionObject[9] = x;//-5
-        actionObject[10] = y;//-4
-        actionObject[11] = width;//-3
-        actionObject[12] = height;//-2
-        actionObject[13] = newName;//-1
-        this.baseactionobjectList.push(actionObject);       
-        this.onsharedMessage('draw',actionObject);
-    </method>     
-    
-    <method name="drawFlvToHistory" args="lastActionObject,parentView">
-        <![CDATA[
-        
-            if ($debug) Debug.write("drawFlvToHistory PLAY :: 
",lastActionObject[3]);
-        
-            this.currentlayer = new lz.whiteboardVideoPlayer(this,{
-                                            
name:lastActionObject[lastActionObject.length-1],
-                                            fileId:lastActionObject[1],
-                                            title:lastActionObject[2],
-                                            flv_width:lastActionObject[4],
-                                            flv_height:lastActionObject[5]
-                                        });
-               
-            if (lastActionObject[3]) {
-                this.currentlayer.playRemote();
-            }
-                                        
-            this.layers.push(this.currentlayer);  
-            
-        ]]>
-    </method>
-    
-    <method name="playFLV" args="refObj,play">
-        <![CDATA[
-            
-            for (var eg=0;eg<this.baseactionobjectList.length;eg++){
-                if 
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==refObj.name)
 {
-                    ////Debug.write("Found Object: 
",this.baseactionobjectList[eg]);
-                    
-                    this.baseactionobjectList[eg][3] = play;
-                    
-                    if ($debug) Debug.write("playFLV :: 
",this.baseactionobjectList[eg]);
-                    this.onsharedMessage('flv',this.baseactionobjectList[eg]);
-                    
-                    break;
-                }
-            }
-            
-        ]]>
-    </method>
-    
-    <method name="playFLVRemote" args="actionObject">
-
-        var tObj = this.getObjectByName(actionObject[actionObject.length-1]);
-        
-        if (actionObject[3]) {
-            tObj.playRemote();
-        }
-        if (!actionObject[3]) {
-            tObj.stopRemote();
-        }
-
-    </method>
-
+       <method name="doDocumentAction" args="action">
+       <![CDATA[
+               if ($debug) Debug.info("doDocumentAction :1: 
sendCurrentSWFObject ",action);
+               if (this.ObjectByName.typeOfObject=="swf") {
+                       if (action=="doc_first"){
+                               
this.ObjectByName._swfView.setAttribute('frame',1);
+                       } else if (action=="doc_pre"){
+                               if (this.ObjectByName._swfView.frame>1){
+                                       
this.ObjectByName._swfView.setAttribute('frame',(this.ObjectByName._swfView.frame-1));
+                               }
+                       } else if (action=="doc_next"){
+                               if 
(this.ObjectByName._swfView.frame<this.ObjectByName._swfView.totalframes){
+                                       
this.ObjectByName._swfView.setAttribute('frame',(this.ObjectByName._swfView.frame+1));
+                               }
+                       } else if (action=="doc_last"){
+                               
this.ObjectByName._swfView.setAttribute('frame',(this.ObjectByName._swfView.totalframes));
+                       } else if (action=="doc_zoom_minus"){
+                               
+                               if ($debug) Debug.write("doc_zoom_minus ");
+                               return;
+                               
+                               
this.ObjectByName.currentzoomFactor-=this.ObjectByName.zoomlevel;          
+                               var newwidth = 
(this.ObjectByName.initwidth/100)*this.ObjectByName.currentzoomFactor;
+                               var newheight = 
(this.ObjectByName.initheight/100)*this.ObjectByName.currentzoomFactor;
+                               
this.ObjectByName._swfView.setAttribute('width',newwidth);
+                               
this.ObjectByName._swfView.setAttribute('height',newheight);
+                               
this.boundingref.doSetInnerObjectsBounds(newwidth,newheight);
+                       } else if (action=="doc_zoom_plus"){
+                               
+                               if ($debug) Debug.write("doc_zoom_plus ");
+                               return;
+                               
+                               
this.ObjectByName.currentzoomFactor+=this.ObjectByName.zoomlevel;          
+                               //Debug.write("doc_zoom_plus 
1",this.ObjectByName.currentzoomFactor,this.ObjectByName.zoomlevel);
+                               var newwidth = 
(this.ObjectByName.initwidth/100)*this.ObjectByName.currentzoomFactor;
+                               var newheight = 
(this.ObjectByName.initheight/100)*this.ObjectByName.currentzoomFactor;
+                               //Debug.write(this.ObjectByName);
+                               //Debug.write("doc_zoom_plus 
2",newwidth,newwidth);
+                               
this.ObjectByName._swfView.setAttribute('width',newwidth);
+                               
this.ObjectByName._swfView.setAttribute('height',newheight);
+                               
this.boundingref.doSetInnerObjectsBounds(newwidth,newheight);
+                       } else if (action=="setSlideNumber"){
+                               if (this.newSlideNumber>0 && 
this.newSlideNumber<=this.ObjectByName._swfView.totalframes){
+                                       if ($debug) Debug.warn("Slide New 
Number ",this.newSlideNumber);
+                                       
this.ObjectByName._swfView.setAttribute('frame',this.newSlideNumber);
+                               } else {
+                                       if ($debug) Debug.warn("Slide Number 
out of range of that document TotalFrames: 
",this.ObjectByName._swfView.totalframes);
+                               }
+                       }
+                       this.ObjectByName.slideNumber =  
this.ObjectByName._swfView.frame;
+                       this.doUpdateDocumentToolBar();
+                       
+                       if ($debug) Debug.info("doDocumentAction :2: 
sendCurrentSWFObject");
+                       
+                       this.sendCurrentSWFObject(this.ObjectByName);
+               }
+       ]]>
+       </method>
+       
+       <method name="addItemToDocumentToolBar">
+               var docToolbar = this.getDocumentToolBar();
+               docToolbar.addCurrentObject(this.currentlayer);
+       </method>
+       
+       <method name="setCurrentDocumentByToolBar" args="itemRefName">
+               if (this.boundingIsActive){
+                       if (this.boundingref.objRef.name != itemRefName) {
+                               
this.boundingref._innerDrag.onmouseup.sendEvent();
+                       }
+               }
+               this.setCurrentDocument(null);
+       </method>
+       
+       <method name="setCurrentDocument" args="itemRefName">
+               var t = this.getObjectByName(itemRefName);
+               if (t==null) {
+                       return;
+               }
+               this.ObjectByName = t;
+               this.doUpdateDocumentToolBar();
+               
+               if ($debug) Debug.write("setCurrentDocument 
",itemRefName,this.ObjectByName);
+       </method>
+       
+       <method name="sendItemToFront" args="itemRefName">
+               var actionObject = new Array();
+               actionObject[0] = 'item';
+               actionObject[1] = itemRefName;
+               this.onsharedMessage('sendItemToFront',actionObject);
+       </method>       
+       
+       <method name="bringItemToFrontByName" args="itemRefName">
+               this.ObjectByName = this.getObjectByName(itemRefName);
+               this.ObjectByName.bringToFront();
+       </method>
+       
+       <method name="doUpdateDocumentToolBarByParticipant" args="itemObjName">
+               this.ObjectByName = this.getObjectByName(itemObjName);
+               this.doUpdateDocumentToolBar();
+       </method>
+       
+       <method name="doUpdateDocumentToolBar">
+       <![CDATA[
+               var docToolbar = this.getDocumentToolBar();
+               
+               if ($debug) Debug.write("doUpdateDocumentToolBar 
",docToolbar.parent.parent.ignoreUpdates);
+               docToolbar.parent.parent.ignoreUpdates = true;
+               
+               if (this["ObjectByName"] && this.ObjectByName != null && 
this.ObjectByName._swfView) {
+                       
+                       if ($debug) Debug.warn("doUpdateDocumentToolBar 
",this.ObjectByName.fullFit);
+                       
+                       
docToolbar._currentSlideNo.setAttribute('text',this.ObjectByName._swfView.frame);
+                       
docToolbar._totalSlideNo.setAttribute('text',this.ObjectByName._swfView.totalframes);
+                       
//docToolbar._zoom.setAttribute('text',this.ObjectByName.currentzoomFactor);
+                       
//docToolbar.parent._fullFit.setValue(this.ObjectByName.fullFit);
+               } else {
+                       docToolbar._currentSlideNo.setAttribute('text',"0");
+                       docToolbar._totalSlideNo.setAttribute('text',"0");
+                       //docToolbar._zoom.setAttribute('text',"100");
+                       //docToolbar.parent._fullFit.setValue(false);
+               }
+               
+               docToolbar.parent.parent.ignoreUpdates = false;
+       ]]>
+       </method>
+       
+       <method name="doDeleteFromDocumentsBar" args="itemRefName">
+               var docToolbar = this.getDocumentToolBar();
+               docToolbar.removeDocument(itemRefName);
+       </method>
+       
+       <method name="clearDocumentsBar">
+               var docToolbar = this.getDocumentToolBar();
+               docToolbar.clearDocumentsBar();
+       </method>
+       
+       <method name="sendCurrentSWFObject" args="objRef">
+       <![CDATA[
+               if ($debug) Debug.write("sendCurrentSWFObject :: 
",objRef,objRef.name);
+               var objName = objRef.name;
+               for (var eg=0;eg<this.baseactionobjectList.length;eg++){
+                       if 
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==objName)
 {
+                               ////Debug.write("Found Object: 
",this.baseactionobjectList[eg]);
+                               var sendSlideObjectUpdate = false;
+                               if (this.baseactionobjectList[eg][8] != 
objRef.slideNumber) {
+                                       sendSlideObjectUpdate = true;
+                               }
+                               this.baseactionobjectList[eg][8] = 
objRef.slideNumber;
+                               this.baseactionobjectList[eg][9] = 
objRef._swfView.x;
+                               this.baseactionobjectList[eg][10] = 
objRef._swfView.y;
+                               this.baseactionobjectList[eg][11] = 
objRef._swfView.width;
+                               this.baseactionobjectList[eg][12] = 
objRef._swfView.height;
+                               this.baseactionobjectList[eg][13] = 
objRef.zoomlevel;
+                               this.baseactionobjectList[eg][16] = 
objRef.currentzoomFactor;
+                               this.baseactionobjectList[eg][19] = 
objRef.fullFit;
+                               var newA = this.baseactionobjectList[eg];
+                               if (newA[0]=='paint') newA[1] = new Array();    
                        
+                               this.onsharedMessage('swf',newA);       
+                               if (sendSlideObjectUpdate) {
+                                       
this.updateObjectsToSlideNumber(this.baseactionobjectList[eg]);
+                               }
+                               break;
+                       }
+               }       
+       ]]>
+       </method>
+       
+       <method name="remoteObjectUpdate" args="lastactionObject">
+       <![CDATA[
+               var obj = 
this.getObjectByName(lastactionObject[lastactionObject.length-1]);
+               
+               if ($debug) Debug.write("remoteObjectUpdate :: ",obj.fullFit);
+               obj._swfView.doSendChangeValue = false;
+               var sendSlideObjectUpdate = false;
+               if (obj.slideNumber != lastactionObject[8]) {
+                       sendSlideObjectUpdate = true;
+               }
+               obj.slideNumber = lastactionObject[8];
+               obj._swfView.setAttribute('x',lastactionObject[9]);
+               obj._swfView.setAttribute('y',lastactionObject[10]);
+               obj._swfView.setAttribute('width',lastactionObject[11]);
+               obj._swfView.setAttribute('height',lastactionObject[12]);
+               //obj.zoomlevel = lastactionObject[13];
+               //obj.currentzoomFactor = lastactionObject[16];
+               obj.fullFit = lastactionObject[19];
+               
+               if ($debug) Debug.write("DO initialLoadFullFit ?? 
",obj.fullFit);
+               
+               if (obj.fullFit) {
+                       if ($debug) Debug.write("DO initialLoadFullFit !! ");
+                       obj._swfView.initialLoadFullFit();
+               }
+               
+               obj._swfView.setAttribute('frame',obj.slideNumber);
+               obj._swfView.doSendChangeValue = true;
+               
+               this.doUpdateDocumentToolBarByParticipant(obj.name);
+               
+               this.remoteUpdateBaseObjectList(lastactionObject);
+               
+               if (sendSlideObjectUpdate) {
+                       this.updateObjectsToSlideNumber(lastactionObject);
+               }
+       ]]>
+       </method>
+       
+       <method name="remoteUpdateBaseObjectList" args="actionObject">
+       <![CDATA[
+               ////Debug.write("remoteUpdateBaseObjectList : ",actionObject);
+               for (var eg=0;eg<this.baseactionobjectList.length;eg++){
+                       if 
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==actionObject[actionObject.length-1])
 {
+                               this.baseactionobjectList[eg] = actionObject;
+                               break;
+                       }
+               }       
+       ]]>
+       </method>
+       
+       <method name="playVideoSynced" 
args="fileId,fileName,flv_width,flv_height">
+       <![CDATA[
+               if ($debug) Debug.write("playVideoSynced : ", 
fileId,fileName,flv_width,flv_height);
+       
+               var tName = 'flv'+this.getCounter();
+               this.currentlayer = new lz.whiteboardVideoPlayer(this,{
+                                                                               
name:tName,
+                                                                               
fileId: fileId,
+                                                                               
title:fileName,
+                                                                               
sendInit:true,
+                                                                               
flv_width:flv_width,
+                                                                               
flv_height:flv_height
+                                                                       });
+               this.layers.push(this.currentlayer);  
+       ]]>
+       </method>
+       
+       <method name="sendNewVideoRemote" args="refObj">
+       <![CDATA[
+               if ($debug) Debug.write("sendNewVideoRemote : 
",refObj.fileId,refObj.title);
+       
+               
this.flvregisterFinal(refObj.name,refObj.x,refObj.y,refObj.width,refObj.height,
+                                                                               
        refObj.fileId,refObj.title,
+                                                                               
        false, //isPlaying
+                                                                               
        refObj.flv_width,
+                                                                               
        refObj.flv_height,
+                                                                               
        this.getZIndex());
+       ]]>
+       </method>
+       
+       <method name="flvregisterFinal" 
args="newName,x,y,width,height,fileId,fileName,isPlaying,flv_width,flv_height,zIndex">
+               var actionObject = new Array();
+               actionObject[0] = 'flv';
+               actionObject[1] = fileId;
+               actionObject[2] = fileName;
+               actionObject[3] = isPlaying;
+               actionObject[4] = flv_width; 
+               actionObject[5] = flv_height;   
+               actionObject[6] = zIndex;//-8
+               actionObject[7] = null;//-7
+               actionObject[8] = this.counter;//-6
+               actionObject[9] = x;//-5
+               actionObject[10] = y;//-4
+               actionObject[11] = width;//-3
+               actionObject[12] = height;//-2
+               actionObject[13] = newName;//-1
+               this.baseactionobjectList.push(actionObject);      
+               this.onsharedMessage('draw',actionObject);
+       </method>        
+       
+       <method name="drawFlvToHistory" args="lastActionObject,parentView">
+       <![CDATA[
+               if ($debug) Debug.write("drawFlvToHistory PLAY :: 
",lastActionObject[3]);
+       
+               this.currentlayer = new lz.whiteboardVideoPlayer(this,{
+                                                                               
name:lastActionObject[lastActionObject.length-1],
+                                                                               
fileId:lastActionObject[1],
+                                                                               
title:lastActionObject[2],
+                                                                               
flv_width:lastActionObject[4],
+                                                                               
flv_height:lastActionObject[5]
+                                                                       });
+               if (lastActionObject[3]) {
+                       this.currentlayer.playRemote();
+               }
+               this.layers.push(this.currentlayer);  
+       ]]>
+       </method>
+       
+       <method name="playFLV" args="refObj,play">
+       <![CDATA[
+               for (var eg=0;eg<this.baseactionobjectList.length;eg++){
+                       if 
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==refObj.name)
 {
+                               this.baseactionobjectList[eg][3] = play;
+                               
+                               if ($debug) Debug.write("playFLV :: 
",this.baseactionobjectList[eg]);
+                               
this.onsharedMessage('flv',this.baseactionobjectList[eg]);
+                               
+                               break;
+                       }
+               }
+       ]]>
+       </method>
+       
+       <method name="playFLVRemote" args="actionObject">
+               var tObj = 
this.getObjectByName(actionObject[actionObject.length-1]);
+               
+               if (actionObject[3]) {
+                       tObj.playRemote();
+               }
+               if (!actionObject[3]) {
+                       tObj.stopRemote();
+               }
+       </method>
 </class>
 
 </library>

Modified: 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
 Mon Nov 30 15:21:36 2015
@@ -20,8 +20,7 @@
 -->
 <library>
 
-<class name="imageForDrawView" extends="image" stretches="both">
-       
+<class name="imageForDrawView" extends="omImage" stretches="both">
        <event name="prepareForDelete" />
        
        <attribute name="downloadurl" value="" type="string" />
@@ -45,150 +44,108 @@
        
        <!-- holds the reference_id to the SyncProcess -->
        <attribute name="uniqueObjectSyncName" value="" type="string" />
+       <attribute name="refObj" value="null" />
+
+       <method name="completeCallback" args="event">
+               if ($debug) Debug.info("imageForDrawView::OVERRIDEN 
completeCallback");
+       </method>
        
-               <!--
+       <handler name="onload">
+       <![CDATA[
+               if ($debug) Debug.info("imageForDrawView::onload image loaded");
+               //this.refObj.parent._loading.setAttribute('visible',false);
+               
+               if (this.remotewidth != 0 && this.remoteheight != 0){
+                       this.setAttribute('width',this.remotewidth);
+                       this.setAttribute('height',this.remoteheight);
+               } else {
+                       
                        if (this.width>this.refObj.width){
                                var height = 
this.height/(this.width/this.refObj.width)
                                this.setAttribute('width',this.refObj.width);
                                this.setAttribute('height',height);
                                this.setAttribute('x',0);
                        }
+                       
                        if (this.height>this.refObj.height){
                                var width = 
this.width/(this.height/this.refObj.height)
                                this.setAttribute('height',this.refObj.height);
                                this.setAttribute('width',width);
                                this.setAttribute('y',0);
                        }
+                       
                        if(this.y+this.height>this.refObj.height){
                                this.setAttribute('y',0);
                        }
+                       
                        if(this.x+this.width>this.refObj.width){
                                this.setAttribute('x',0);
-                       }                       
-         -->            
-       <attribute name="refObj" value="null" />
-       <handler name="onload">
-               <![CDATA[
-                       //Debug.write("image loaded");
-                       
//this.refObj.parent._loading.setAttribute('visible',false);
-                       
-                       if (this.remotewidth != 0 && this.remoteheight != 0){
-                               this.setAttribute('width',this.remotewidth);
-                               this.setAttribute('height',this.remoteheight);
-                       } else {
-                               
-                               if (this.width>this.refObj.width){
-                                       var height = 
this.height/(this.width/this.refObj.width)
-                                       
this.setAttribute('width',this.refObj.width);
-                                       this.setAttribute('height',height);
-                                       this.setAttribute('x',0);
-                               }
-                               
-                               if (this.height>this.refObj.height){
-                                       var width = 
this.width/(this.height/this.refObj.height)
-                                       
this.setAttribute('height',this.refObj.height);
-                                       this.setAttribute('width',width);
-                                       this.setAttribute('y',0);
-                               }
-                               
-                               if(this.y+this.height>this.refObj.height){
-                                       this.setAttribute('y',0);
-                               }
-                               
-                               if(this.x+this.width>this.refObj.width){
-                                       this.setAttribute('x',0);
-                               }
-                               
                        }
-       
-                       //only send syncCommand if alterModus is true (meaning 
that this is the Moderator)
-                       //otherwise just send a notification to moderator that 
this image has been loaded
-                       //if this is just a recordContent-modi 
(recordingsViewer) then there should be no syncing
-                       if (this.recorderModus) {
-                               
this.refObj.storeTempValsAndLoadSyncListRecording(this);
-                       } else if (this.alterModus){
-                               this.refObj.storeTempValsAndLoadSyncList(this);
-                       } else if (this.isLocalSync){
-                               
this.refObj.addImageToLayerHistoryToLocalLoaded.sendEvent(this);
-                       } else {
-                               this.refObj.sendLoadNotificationImage(this);
-                       }
-                       this.refObj.layers.push(this);                  
-                       
-                       this.oninit.sendEvent();
-                       
-                       //This is not needed anymore as it sync's against the 
server sid, swagner, 11.06.2008
-                       
//this.refObj.parent.parent.isloadedImage.sendEvent(this);
                        
-                       //send notification to wml-loader
-                       //this is send later then in normal objects cause it 
needs to be send after the image
-                       //has been loaded completely
-                       //if (this.refObj.isWmlLoaderImage){
-                       //      this.refObj.isWmlLoaderImage=false;
-            //    //Debug.write("1 onwmlLoaderSend.sendEvent( image )");
-                       //      if (this.refObj.onwmlLoaderSend) 
this.refObj.onwmlLoaderSend.sendEvent('image');
-                       //}
-               ]]>
+               }
+
+               //only send syncCommand if alterModus is true (meaning that 
this is the Moderator)
+               //otherwise just send a notification to moderator that this 
image has been loaded
+               //if this is just a recordContent-modi (recordingsViewer) then 
there should be no syncing
+               if (this.recorderModus) {
+                       this.refObj.storeTempValsAndLoadSyncListRecording(this);
+               } else if (this.alterModus){
+                       this.refObj.storeTempValsAndLoadSyncList(this);
+               } else if (this.isLocalSync){
+                       
this.refObj.addImageToLayerHistoryToLocalLoaded.sendEvent(this);
+               } else {
+                       this.refObj.sendLoadNotificationImage(this);
+               }
+               this.refObj.layers.push(this);                  
+               
+               //this.oninit.sendEvent();
+       ]]>
        </handler>
+       
        <handler name="onerror" args="error">
-               <![CDATA[
-               //Debug.write("onerror "+error);
-                       //only send syncCommand if alterModus is true (meaning 
that this is the Moderator)
-                       //otherwise just send a notification to moderator that 
this iamge has been loaded
-                       if (this.recorderModus) {
-                               
this.refObj.storeTempValsAndLoadSyncListRecording(this);
-                       } else if (this.alterModus){
-                               this.refObj.storeTempValsAndLoadSyncList(this);
-                       } else if (this.isLocalSync){
-                               
this.refObj.addImageToLayerHistoryToLocalLoaded.sendEvent(this);
-                       } else {
-                               this.refObj.sendLoadNotificationImage(this);
-                       }
-                       this.refObj.layers.push(this);                  
-                       
-                       this.oninit.sendEvent();
-                       
-                       //This is not needed anymore as it sync's against the 
server sid, swagner, 11.06.2008
-                       this.refObj.parent.parent.isloadedImage.sendEvent(this);
-                       
-                       //send notification to wml-loader
-                       //this is send later then in normal objects cause it 
needs to be send after the image
-                       //has been loaded completely
-                       //if (this.refObj.isWmlLoaderImage){
-                       //      this.refObj.isWmlLoaderImage=false;
-                       //      if (this.refObj.onwmlLoaderSend) 
this.refObj.onwmlLoaderSend.sendEvent('image');
-                       //}
-               ]]>
+       <![CDATA[
+               if ($debug) Debug.write("imageForDrawView::onerror "+error);
+               //only send syncCommand if alterModus is true (meaning that 
this is the Moderator)
+               //otherwise just send a notification to moderator that this 
iamge has been loaded
+               if (this.recorderModus) {
+                       this.refObj.storeTempValsAndLoadSyncListRecording(this);
+               } else if (this.alterModus){
+                       this.refObj.storeTempValsAndLoadSyncList(this);
+               } else if (this.isLocalSync){
+                       
this.refObj.addImageToLayerHistoryToLocalLoaded.sendEvent(this);
+               } else {
+                       this.refObj.sendLoadNotificationImage(this);
+               }
+               this.refObj.layers.push(this);                  
+               
+               this.oninit.sendEvent();
+               
+               //This is not needed anymore as it sync's against the server 
sid, swagner, 11.06.2008
+               this.refObj.parent.parent.isloadedImage.sendEvent(this);
+       ]]>
        </handler>
+       
        <handler name="ontimeout" args="error">
-               <![CDATA[
-               //Debug.write("ontimeout "+error);
-                       //only send syncCommand if alterModus is true (meaning 
that this is the Moderator)
-                       //otherwise just send a notification to moderator that 
this iamge has been loaded
-                       if (this.recorderModus) {
-                               
this.refObj.storeTempValsAndLoadSyncListRecording(this);
-                       } else if (this.alterModus){
-                               this.refObj.storeTempValsAndLoadSyncList(this);
-                       } else if (this.isLocalSync){
-                               
this.refObj.addImageToLayerHistoryToLocalLoaded.sendEvent(this);
-                       } else {
-                               this.refObj.sendLoadNotificationImage(this);
-                       }
-                       this.refObj.layers.push(this);                  
-                       
-                       this.oninit.sendEvent();
-                       
-                       //This is not needed anymore as it sync's against the 
server sid, swagner, 11.06.2008
-                       this.refObj.parent.parent.isloadedImage.sendEvent(this);
-                       
-                       //send notification to wml-loader
-                       //this is send later then in normal objects cause it 
needs to be send after the image
-                       //has been loaded completely
-                       //if (this.refObj.isWmlLoaderImage){
-                       //      this.refObj.isWmlLoaderImage=false;
-                       //      if (this.refObj.onwmlLoaderSend) 
this.refObj.onwmlLoaderSend.sendEvent('image');
-                       //}
-               ]]>
+       <![CDATA[
+       //Debug.write("ontimeout "+error);
+               //only send syncCommand if alterModus is true (meaning that 
this is the Moderator)
+               //otherwise just send a notification to moderator that this 
iamge has been loaded
+               if (this.recorderModus) {
+                       this.refObj.storeTempValsAndLoadSyncListRecording(this);
+               } else if (this.alterModus){
+                       this.refObj.storeTempValsAndLoadSyncList(this);
+               } else if (this.isLocalSync){
+                       
this.refObj.addImageToLayerHistoryToLocalLoaded.sendEvent(this);
+               } else {
+                       this.refObj.sendLoadNotificationImage(this);
+               }
+               this.refObj.layers.push(this);                  
+               
+               this.oninit.sendEvent();
+               
+               //This is not needed anymore as it sync's against the server 
sid, swagner, 11.06.2008
+               this.refObj.parent.parent.isloadedImage.sendEvent(this);
+       ]]>
        </handler>      
 </class>
 

Modified: 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
 Mon Nov 30 15:21:36 2015
@@ -8,8 +8,8 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-      http://www.apache.org/licenses/LICENSE-2.0
-         
+         http://www.apache.org/licenses/LICENSE-2.0
+                 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,287 +19,204 @@
   
 -->
 <library>
-    
+       
 <class name="swfResourceView" extends="view" >
        
        <event name="prepareForDelete" />
-    
-    <attribute name="refObj" value="null" />
+       
+       <attribute name="refObj" value="null" />
        <attribute name="alterModus" value="true" type="boolean" />
-    
-    <attribute name="standardFileName" value="" type="string"/>
+       
+       <attribute name="standardFileName" value="" type="string"/>
        
        <attribute name="recorderModus" value="false" type="boolean" />
-    
-    <attribute name="fullFit" value="true" type="boolean" />
+       
+       <attribute name="fullFit" value="true" type="boolean" />
        
        <attribute name="baseurl" value="" type="string" />
        <attribute name="fileName" value="" type="string" />
        <attribute name="moduleName" value="" type="string" />
        <attribute name="parentPath" value="" type="string" />
        <attribute name="room" value="" type="string" />
-       <attribute name="domain" value="" type="string" />    
-    <attribute name="slideNumber" value="1" type="number" /> 
-    
-    <attribute name="currentzoomFactor" value="100" type="number" />
-    <attribute name="zoomlevel" value="20" type="number" />
-    <attribute name="initwidth" value="0" type="number" />
-    <attribute name="initheight" value="0" type="number" />
-    
-    <!-- for wml-loaded SWF's
-        attribute only set on init
-     -->
-    <attribute name="innerwidth" value="0" type="number" />
-    <attribute name="innerheight" value="0" type="number" />
-    <attribute name="innerx" value="0" type="number" />
-    <attribute name="innery" value="0" type="number" />
-    <attribute name="currentzoom" value="0" type="number" />
-    
-    <attribute name="typeOfObject" value="swf" type="string" />
-    
+       <attribute name="domain" value="" type="string" />      
+       <attribute name="slideNumber" value="1" type="number" /> 
+       
+       <attribute name="currentzoomFactor" value="100" type="number" />
+       <attribute name="zoomlevel" value="20" type="number" />
+       <attribute name="initwidth" value="0" type="number" />
+       <attribute name="initheight" value="0" type="number" />
+       
+       <!-- for wml-loaded SWF's
+               attribute only set on init
+        -->
+       <attribute name="innerwidth" value="0" type="number" />
+       <attribute name="innerheight" value="0" type="number" />
+       <attribute name="innerx" value="0" type="number" />
+       <attribute name="innery" value="0" type="number" />
+       <attribute name="currentzoom" value="0" type="number" />
+       
+       <attribute name="typeOfObject" value="swf" type="string" />
+       
        <!-- holds the reference_id to the SyncProcess -->
-       <attribute name="uniqueObjectSyncName" value="" type="string" />    
-    
-    <view name="_swfView" play="false">
-       
-       <!--
-       <attribute name="timeisInited" value="false" type="boolean" />
-        <attribute name="sendObjectDel" value="null" />
-         -->
-        
-        <!-- Do not send update events in case 
-            this is sync event broadcasted by another user -->
-        <attribute name="doSendChangeValue" value="false" type="boolean" />
-        
-        <handler name="onframe" args="i">
-            ////Debug.write("onframe",i);
-        </handler>
-        
-        <handler name="onplay" args="i">
-            ////Debug.write("onplay",i);
-        </handler>
-        
-        <handler name="onstop" args="i">
-            ////Debug.write("onstop",i);
-        </handler>
-        
-        <!--
-        <handler name="oninit">
-            this.sendObjectDel = new LzDelegate( this, "sendObject" );
-        </handler>
-        
-        <handler name="onx" args="x">
-               if (!this.doSendChangeValue) {
-                       return;
-               }
-               
-            if (!this.timeisInited){
-                this.timeisInited=true;
-                lz.Timer.addTimer( this.sendObjectDel, 250 );
-            } else {
-                lz.Timer.resetTimer( this.sendObjectDel, 250 );
-            }
-        </handler>
-        <handler name="ony" args="y">
-               if (!this.doSendChangeValue) {
-                return;
-            }
-            
-            if (!this.timeisInited){
-                this.timeisInited=true;
-                lz.Timer.addTimer( this.sendObjectDel, 250 );
-            } else {
-                lz.Timer.resetTimer( this.sendObjectDel, 250 );
-            }
-        </handler>        
-        
-        <method name="sendObject" args="itemRef">
-            if ($debug) Debug.info("sendObject :: sendCurrentSWFObject");
-            this.parent.parent.sendCurrentSWFObject(this.parent);
-            this.timeisInited=false;
-        </method>
-         -->
-        
-        <method name="initialLoadFullFit">
-            <![CDATA[
-            
-               if ($debug) Debug.write(" -- fullFit -- 
",parent.parent.fullFit);
-            
-                if (parent.parent.fullFit) {
-                    
-                    if ($debug) Debug.write(" -- fullFit -2- 
",this.width,this.height);
-                    if ($debug) Debug.write(" -- fullFit -3- 
",parent.parent.width,parent.parent.height);
-                    
-                    //Scale to container width/height
-                    var xScale = (parent.parent.parent.width-16)/this.width;
-                    var yScale = (parent.parent.parent.height-16)/this.height;
-                    
-                    if ($debug) Debug.write(" -- fullFit -4- ",xScale,yScale);
-                    
-                    if (xScale < yScale) {
-                       parent.parent.setCurrentScaleByFullFit(xScale);
-                    } else {
-                       parent.parent.setCurrentScaleByFullFit(yScale);
-                    }
-                    
-                }
-            
-            ]]>
-        </method>
-        
-        <handler name="onload">
-            <![CDATA[
-                if ($debug) Debug.info("onload: ",this.width,this,height);
-                
-                ////Debug.write("onload: ",this.stop);
-                this.stop();
-                this.setAttribute('play',false);             
-                
-                this.parent.initwidth = this.width;
-                this.parent.initheight = this.height;
-                
-                this.setAttribute('frame',parent.slideNumber);
-                
-                //only send syncCommand if alterModus is true (meaning that 
this is the Moderator)
-                //otherwise just send a notification to moderator that this 
iamge has been loaded
-                if (this.parent.recorderModus) {
+       <attribute name="uniqueObjectSyncName" value="" type="string" />        
+       
+       <view name="_swfView" play="false">
+                <!-- Do not send update events in case 
+                       this is sync event broadcasted by another user -->
+               <attribute name="doSendChangeValue" value="false" 
type="boolean" />
+               
+               <handler name="onframe" args="i">
+                       ////Debug.write("onframe",i);
+               </handler>
+               
+               <handler name="onplay" args="i">
+                       ////Debug.write("onplay",i);
+               </handler>
+               
+               <handler name="onstop" args="i">
+                       ////Debug.write("onstop",i);
+               </handler>
+               
+               <method name="initialLoadFullFit">
+                       <![CDATA[
+                       
+                               if ($debug) Debug.write(" -- fullFit -- 
",parent.parent.fullFit);
+                       
+                               if (parent.parent.fullFit) {
+                                       
+                                       if ($debug) Debug.write(" -- fullFit 
-2- ",this.width,this.height);
+                                       if ($debug) Debug.write(" -- fullFit 
-3- ",parent.parent.width,parent.parent.height);
+                                       
+                                       //Scale to container width/height
+                                       var xScale = 
(parent.parent.parent.width-16)/this.width;
+                                       var yScale = 
(parent.parent.parent.height-16)/this.height;
+                                       
+                                       if ($debug) Debug.write(" -- fullFit 
-4- ",xScale,yScale);
+                                       
+                                       if (xScale < yScale) {
+                                               
parent.parent.setCurrentScaleByFullFit(xScale);
+                                       } else {
+                                               
parent.parent.setCurrentScaleByFullFit(yScale);
+                                       }
+                                       
+                               }
+                       
+                       ]]>
+               </method>
+               
+               <handler name="onload">
+                       <![CDATA[
+                               if ($debug) Debug.info("onload: 
",this.width,this,height);
+                               
+                               this.stop();
+                               this.setAttribute('play',false);                
         
+                               
+                               this.parent.initwidth = this.width;
+                               this.parent.initheight = this.height;
+                               
+                               this.setAttribute('frame',parent.slideNumber);
+                               
+                               //only send syncCommand if alterModus is true 
(meaning that this is the Moderator)
+                               //otherwise just send a notification to 
moderator that this iamge has been loaded
+                               if (this.parent.recorderModus) {
                                        
this.parent.refObj.storeTempValsAndLoadSyncListSWFRecording(this.parent);
                                } else if (this.parent.alterModus){
-                    
-                    //this code is invoked when the Moderator loads the 
Document
-                    
-                    
this.parent.refObj.storeTempValsAndLoadSyncListSWF(this.parent);
-                    if ($debug) Debug.write("==> doShowObjectBounds MOD ");
-                    
-                    this.initialLoadFullFit();
-                    
-                    this.parent.refObj.doShowObjectBounds(this.parent.name);
-                    this.parent.refObj.doUpdateDocumentToolBar();
-                } else {
-                    
-                    //this code is invoked when any participants syncronizes 
and loads the document
-                    //because a Moderator has loaded it
-                    
-                    if ($debug) Debug.write("==> doShowObjectBounds 
Participant ");
-                    
-                    this.initialLoadFullFit();
-                    
-                    this.parent.refObj.sendLoadNotificationSWF(this.parent);
-                    
-                    
this.parent.refObj.doUpdateDocumentToolBarByParticipant(this.parent.name);
-                    
-                }
-                
-                if ($debug) Debug.write("swf loaded -2- 
",this.parent.refObj.isWmlLoaderImage);
-                if (this.parent.refObj.isWmlLoaderImage){
-                    if ($debug) Debug.write("swf loaded 
",this.parent.innerwidth,this.parent.innerheight);
-                       if (this.parent.innerwidth != 0 && 
this.parent.innerheight != 0) {
-                           this.setAttribute('width',this.parent.innerwidth);
-                           this.setAttribute('height',this.parent.innerheight);
-                           this.setAttribute('x',this.parent.innerx);
-                           this.setAttribute('y',this.parent.innery);
-                       }
-                    this.parent.currentzoomFactor = this.parent.currentzoom;
-                }
+                                       
+                                       //this code is invoked when the 
Moderator loads the Document
+                                       
+                                       
this.parent.refObj.storeTempValsAndLoadSyncListSWF(this.parent);
+                                       if ($debug) Debug.write("==> 
doShowObjectBounds MOD ");
+                                       
+                                       this.initialLoadFullFit();
+                                       
+                                       
this.parent.refObj.doShowObjectBounds(this.parent.name);
+                                       
this.parent.refObj.doUpdateDocumentToolBar();
+                               } else {
+                                       
+                                       //this code is invoked when any 
participants syncronizes and loads the document
+                                       //because a Moderator has loaded it
+                                       
+                                       if ($debug) Debug.write("==> 
doShowObjectBounds Participant ");
+                                       
+                                       this.initialLoadFullFit();
+                                       
+                                       
this.parent.refObj.sendLoadNotificationSWF(this.parent);
+                                       
+                                       
this.parent.refObj.doUpdateDocumentToolBarByParticipant(this.parent.name);
+                                       
+                               }
+                               
+                               if ($debug) Debug.write("swf loaded -2- 
",this.parent.refObj.isWmlLoaderImage);
+                               if (this.parent.refObj.isWmlLoaderImage){
+                                       if ($debug) Debug.write("swf loaded 
",this.parent.innerwidth,this.parent.innerheight);
+                                       if (this.parent.innerwidth != 0 && 
this.parent.innerheight != 0) {
+                                               
this.setAttribute('width',this.parent.innerwidth);
+                                               
this.setAttribute('height',this.parent.innerheight);
+                                               
this.setAttribute('x',this.parent.innerx);
+                                               
this.setAttribute('y',this.parent.innery);
+                                       }
+                                       this.parent.currentzoomFactor = 
this.parent.currentzoom;
+                               }
 
-                this.parent.refObj.layers.push(this.parent);                   
-                
-                this.doSendChangeValue = true;
-                
-                this.oninit.sendEvent();
-                
//this.parent.refObj.parent.parent.isloadedImage.sendEvent(this);
-                
-                //send notification to wml-loader
-                //this is send later then in normal objects cause it needs to 
be send after the image
-                //has been loaded completely
-                //if (this.parent.refObj.isWmlLoaderImage){
-                //    this.parent.refObj.isWmlLoaderImage=false;
-                //    if (this.parent.refObj.onwmlLoaderSend) 
this.parent.refObj.onwmlLoaderSend.sendEvent('swf');
-                //}
-            ]]>
-        </handler>
-        <handler name="onerror" args="error">
-            <![CDATA[
-            ////Debug.write("onerror "+error);
-            
-            
-                new lz.errorPopup(canvas,{error:"onerror SWF!! "+error});
-                
-                this.parent.initwidth = this.width;
-                this.parent.initheight = this.height;
-                                
-                //only send syncCommand if alterModus is true (meaning that 
this is the Moderator)
-                //otherwise just send a notification to moderator that this 
iamge has been loaded
-                if (this.parent.recorderModus) {
+                               this.parent.refObj.layers.push(this.parent);    
                
+                               
+                               this.doSendChangeValue = true;
+                               
+                               this.oninit.sendEvent();
+                       ]]>
+               </handler>
+               <handler name="onerror" args="error">
+                       <![CDATA[
+                               new lz.errorPopup(canvas,{error:"onerror SWF!! 
"+error});
+                               
+                               this.parent.initwidth = this.width;
+                               this.parent.initheight = this.height;
+                                                               
+                               //only send syncCommand if alterModus is true 
(meaning that this is the Moderator)
+                               //otherwise just send a notification to 
moderator that this iamge has been loaded
+                               if (this.parent.recorderModus) {
                                        
this.parent.refObj.storeTempValsAndLoadSyncListSWFRecording(this.parent);
                                } else if (this.parent.alterModus){
-                    
this.parent.refObj.storeTempValsAndLoadSyncListSWF(this.parent);
-                } else {
-                    this.parent.refObj.sendLoadNotificationSWF(this.parent);
-                }
-                this.parent.refObj.layers.push(this.parent);                   
-                
-                this.oninit.sendEvent();
-                
//this.parent.refObj.parent.parent.isloadedImage.sendEvent(this.parent);
-                
-                //send notification to wml-loader
-                //this is send later then in normal objects cause it needs to 
be send after the image
-                //has been loaded completely
-                //if (this.parent.refObj.isWmlLoaderImage){
-                //    this.parent.refObj.isWmlLoaderImage=false;
-                //    if (this.parent.refObj.onwmlLoaderSend) 
this.parent.refObj.onwmlLoaderSend.sendEvent('swf');
-                //}
-            ]]>
-        </handler>
-        <handler name="ontimeout" args="error">
-            <![CDATA[
-            ////Debug.write("ontimeout "+error);
-            
-                new lz.errorPopup(canvas,{error:"ontimeout SWF!! "+error});
-                
-                this.parent.initwidth = this.width;
-                this.parent.initheight = this.height;
-                                
-                //only send syncCommand if alterModus is true (meaning that 
this is the Moderator)
-                //otherwise just send a notification to moderator that this 
iamge has been loaded
-                if (this.parent.recorderModus) {
+                                       
this.parent.refObj.storeTempValsAndLoadSyncListSWF(this.parent);
+                               } else {
+                                       
this.parent.refObj.sendLoadNotificationSWF(this.parent);
+                               }
+                               this.parent.refObj.layers.push(this.parent);    
                
+                               
+                               this.oninit.sendEvent();
+                       ]]>
+               </handler>
+               <handler name="ontimeout" args="error">
+                       <![CDATA[
+                               new lz.errorPopup(canvas,{error:"ontimeout 
SWF!! "+error});
+                               
+                               this.parent.initwidth = this.width;
+                               this.parent.initheight = this.height;
+                                                               
+                               //only send syncCommand if alterModus is true 
(meaning that this is the Moderator)
+                               //otherwise just send a notification to 
moderator that this iamge has been loaded
+                               if (this.parent.recorderModus) {
                                        
this.parent.refObj.storeTempValsAndLoadSyncListSWFRecording(this.parent);
                                } else if (this.parent.alterModus){
-                    
this.parent.refObj.storeTempValsAndLoadSyncListSWF(this.parent);
-                } else {
-                    this.parent.refObj.sendLoadNotificationSWF(this.parent);
-                }
-                this.parent.refObj.layers.push(this.parent);                   
-                
-                this.oninit.sendEvent();
-                
//this.parent.refObj.parent.parent.isloadedImage.sendEvent(this.parent);
-                
-                //send notification to wml-loader
-                //this is send later then in normal objects cause it needs to 
be send after the image
-                //has been loaded completely
-                //if (this.parent.refObj.isWmlLoaderImage){
-                //    this.parent.refObj.isWmlLoaderImage=false;
-                //    if (this.parent.refObj.onwmlLoaderSend) 
this.parent.refObj.onwmlLoaderSend.sendEvent('swf');
-                //}
-            ]]>
-        </handler> 
-        
-        <handler name="onwidth" args="w">
-            if ($debug) Debug.write("onwidth ",w);
-        </handler>
-        
-        <handler name="onheight" args="h">
-            if ($debug) Debug.write("onheight ",h);
-        </handler>
-        
-    </view>    
-    
-    <!--
-    <om_vscrollbar name="_scrollstv"
-                visible="${ ((canvas.ismoderator) ? true : 
((canvas.isAllowedToDraw) ? true : false )) }" /> 
-    <om_hscrollbar name="_scrollsth"
-                visible="${ ((canvas.ismoderator) ? true : 
((canvas.isAllowedToDraw) ? true : false )) }" />
-     -->   
+                                       
this.parent.refObj.storeTempValsAndLoadSyncListSWF(this.parent);
+                               } else {
+                                       
this.parent.refObj.sendLoadNotificationSWF(this.parent);
+                               }
+                               this.parent.refObj.layers.push(this.parent);    
                
+                               
+                               this.oninit.sendEvent();
+                       ]]>
+               </handler> 
+               
+               <handler name="onwidth" args="w">
+                       if ($debug) Debug.write("onwidth ",w);
+               </handler>
+               
+               <handler name="onheight" args="h">
+                       if ($debug) Debug.write("onheight ",h);
+               </handler>
+               
+       </view>
 </class>
 
 </library>


Reply via email to