Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1773334&r1=1773333&r2=1773334&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Fri Dec 9 08:26:19 2016 @@ -19,90 +19,81 @@ --> <library> - <!-- ############################ - Class newWhiteBoard - - - @keywords deprecated - + Class newWhiteBoard + + + @keywords deprecated + --> +<class name="fixedFileExplorerWhiteBoard" extends="view" showhandcursor="false"> + <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="downloadurl" value="" type="string" /> + <attribute name="iamgex" value="" type="string" /> + <attribute name="imagey" value="" type="string" /> + <attribute name="restricted" value="false" type="boolean" /> + <attribute name="sendObject" value="null" /> + <attribute name="sendObjectToClientID" value="0" type="number" /> + <attribute name="confirmdialog" value="null" /> + <attribute name="documentmenuIsInited" value="false" type="boolean" /> + <event name="onsharedMessage" /> + <event name="isloadingImage" /> + <event name="isloadedImage" /> -<class name="fixedFileExplorerWhiteBoard" extends="view" showhandcursor="false"> - - <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="downloadurl" value="" type="string" /> - <attribute name="iamgex" value="" type="string" /> - <attribute name="imagey" value="" type="string" /> - - <attribute name="restricted" value="false" type="boolean" /> - - <event name="onsharedMessage" /> - - <attribute name="sendObject" value="null" /> - <attribute name="sendObjectToClientID" value="0" type="number" /> - - <attribute name="confirmdialog" value="null" /> - - <attribute name="documentmenuIsInited" value="false" type="boolean" /> - - <handler name="oninit"> - if ($debug) Debug.info("Init Whiteboard ",this.restricted); - </handler> + <handler name="oninit"> + if ($debug) Debug.info("Init Whiteboard ",this.restricted); + </handler> - <handler name="ondestroy"> + <handler name="ondestroy"> //if ($debug) Debug.write("############## fixedFileExplorerWhiteBoard::ondestroy : ", this); this._drawareaMask._drawarea.clearRemote(); - </handler> + </handler> + + <method name="sendConfirmation" args="yesno,askagain" > + ////Debug.write("clear yesno,askagain: ",yesno,askagain); + var g = canvas.getUserData(); + if (g["image"]==null) g["image"]=new Array(); + g["image"]["clearField"]=yesno; + g["image"]["askagainclear"]=!askagain; + canvas.setUserData(g); + + if (yesno){ + ////Debug.write("clear field!!"); + canvas._drawarea.setModus('plain'); + canvas._drawarea.addNewSyncImage(this.downloadurl,this.iamgex,this.imagey,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain); + } else { + ////Debug.write("don't clear field!!"); + canvas._drawarea.addNewSyncImage(this.downloadurl,this.iamgex,this.imagey,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain); + } + this.confirmdialog.close(); + </method> + + <method name="getconfirmationscode"> + var g = canvas.getUserData(); + if (g["image"]==null) { + g["image"]=new Array(); + g["image"]["clearField"]=false; + g["image"]["askagainclear"]=true; + canvas.setUserData(g); + } + return g["image"]; + </method> - <method name="sendConfirmation" args="yesno,askagain" > - - ////Debug.write("clear yesno,askagain: ",yesno,askagain); - - var g = canvas.getUserData(); - if (g["image"]==null) g["image"]=new Array(); - g["image"]["clearField"]=yesno; - g["image"]["askagainclear"]=!askagain; - canvas.setUserData(g); - - if (yesno){ - ////Debug.write("clear field!!"); - canvas._drawarea.setModus('plain'); - canvas._drawarea.addNewSyncImage(this.downloadurl,this.iamgex,this.imagey,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain); - } else { - ////Debug.write("don't clear field!!"); - canvas._drawarea.addNewSyncImage(this.downloadurl,this.iamgex,this.imagey,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain); - } - this.confirmdialog.close(); - </method> - - <method name="getconfirmationscode"> - var g = canvas.getUserData(); - if (g["image"]==null) { - g["image"]=new Array(); - g["image"]["clearField"]=false; - g["image"]["askagainclear"]=true; - canvas.setUserData(g); - } - return g["image"]; - </method> - - <method name="resetDefaultConfirmations"> - var g = canvas.getUserData(); - if (g["image"]==null) g["image"]=new Array(); - g["image"]["clearField"]=false; - g["image"]["askagainclear"]=true; - canvas.setUserData(g); - </method> + <method name="resetDefaultConfirmations"> + var g = canvas.getUserData(); + if (g["image"]==null) g["image"]=new Array(); + g["image"]["clearField"]=false; + g["image"]["askagainclear"]=true; + canvas.setUserData(g); + </method> <method name="clearAreaAndAddImage" args="downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain"> <![CDATA[ @@ -134,455 +125,430 @@ ]]> </method> - <event name="isloadingImage" /> - <event name="isloadedImage" /> - - <text fontsize="11" x="10" y="2" name="_sharingClientName" fontstyle="bold" /> - - <!-- - The Content Area - --> - <view width="${ parent.parent.width-2 }" - height="${ (canvas.ismoderator) ? (parent.parent.height-42-parent._propertyPanel.height) : ((canvas.isAllowedToDraw) ? (parent.parent.height-42-parent._propertyPanel.height) : (parent.parent.height-42)) }" - y="0" name="_drawareaMask" clip="true" bgcolor="0xFFFFFF" > - - <handler name="oninit"> - if ($debug) Debug.info("lz.Track.register ",canvas.currentImagesListdraw.currentTrackGroupName); - lz.Track.register(this, canvas.currentImagesListdraw.currentTrackGroupName); - </handler> - - <handler name="onmousedown"> - this._drawarea.onmousedownMethod(); - </handler> - - <handler name="onmouseup"> - this._drawarea.onmouseupMethod(); - </handler> - - <handler name="onmouseover"> - lz.Cursor.restoreCursor(); - lz.Cursor.showHandCursor(false); - this._drawarea.onmouseoverMethod(); - </handler> - - <handler name="onmouseout"> - lz.Cursor.showHandCursor(true); - lz.Cursor.unlock(); - this._drawarea.onmouseoutMethod(); - </handler> - - <handler name="onmousetrackover"> - if ($debug) Debug.write("onmousetrackover"); - canvas.currentImagesListdraw.currentDragItem.sendOverItem(this); - this.setAttribute("bgcolor",0x93FE92); - </handler> - - <handler name="onmousetrackout"> - if ($debug) Debug.write("onmousetrackout"); - canvas.currentImagesListdraw.currentDragItem.sendOutItem(this); - this.setAttribute("bgcolor",0xFFFFFF); - </handler> - - <handler name="onmousetrackup"> - if ($debug) Debug.write("onmousetrackup"); - this.setAttribute("bgcolor",0xFFFFFF); - </handler> - - <remoteWhiteboard y="0" name="_drawarea" isRemoteOID="true" height="${parent.height}" width="${parent.height}" - restricted="$once{ parent.parent.restricted }" > - - <attribute name="sendUpdate" value="true" type="boolean"/> - - <handler name="onx" args="x"><![CDATA[ - if (this.sendUpdate) { - if ($debug) Debug.write("# x",x); + <text fontsize="11" x="10" y="2" name="_sharingClientName" fontstyle="bold" /> + + <!-- + The Content Area + --> + <view width="${ parent.parent.width-2 }" + height="${ (canvas.ismoderator) ? (parent.parent.height-42-parent._propertyPanel.height) : ((canvas.isAllowedToDraw) ? (parent.parent.height-42-parent._propertyPanel.height) : (parent.parent.height-42)) }" + y="0" name="_drawareaMask" clip="true" bgcolor="0xFFFFFF" > + + <handler name="oninit"> + if ($debug) Debug.info("lz.Track.register ",canvas.currentImagesListdraw.currentTrackGroupName); + lz.Track.register(this, canvas.currentImagesListdraw.currentTrackGroupName); + </handler> + + <handler name="onmousedown"> + this._drawarea.onmousedownMethod(); + </handler> + + <handler name="onmouseup"> + this._drawarea.onmouseupMethod(); + </handler> + + <handler name="onmouseover"> + lz.Cursor.restoreCursor(); + lz.Cursor.showHandCursor(false); + this._drawarea.onmouseoverMethod(); + </handler> + + <handler name="onmouseout"> + lz.Cursor.showHandCursor(true); + lz.Cursor.unlock(); + this._drawarea.onmouseoutMethod(); + </handler> + + <handler name="onmousetrackover"> + if ($debug) Debug.write("onmousetrackover"); + canvas.currentImagesListdraw.currentDragItem.sendOverItem(this); + this.setAttribute("bgcolor",0x93FE92); + </handler> + + <handler name="onmousetrackout"> + if ($debug) Debug.write("onmousetrackout"); + canvas.currentImagesListdraw.currentDragItem.sendOutItem(this); + this.setAttribute("bgcolor",0xFFFFFF); + </handler> + + <handler name="onmousetrackup"> + if ($debug) Debug.write("onmousetrackup"); + this.setAttribute("bgcolor",0xFFFFFF); + </handler> + + <remoteWhiteboard y="0" name="_drawarea" isRemoteOID="true" height="${parent.height}" width="${parent.height}" + restricted="$once{ parent.parent.restricted }" > + <attribute name="sendUpdate" value="true" type="boolean"/> + <attribute name="_propPanel" type="object"/> + + <handler name="onx" args="x"><![CDATA[ + if (this.sendUpdate) { + if ($debug) Debug.write("# x",x); if (parent.parent && parent.parent.scrollContainer) { - parent.parent.scrollContainer.calcScrollContent(); + parent.parent.scrollContainer.calcScrollContent(); } - } - ]]></handler> - - <handler name="ony" args="y"><![CDATA[ - if (this.sendUpdate) { - if ($debug) Debug.write("# y", y); + } + ]]></handler> + + <handler name="ony" args="y"><![CDATA[ + if (this.sendUpdate) { + if ($debug) Debug.write("# y", y); if (parent.parent && parent.parent.scrollContainer) { - parent.parent.scrollContainer.calcScrollContent(); + parent.parent.scrollContainer.calcScrollContent(); } - } - ]]></handler> - - <handler name="onheight" args="h"><![CDATA[ - if ($debug) Debug.write("# height",h); - //this.dragger.drag_min_x = parent.width - w; + } + ]]></handler> + + <handler name="onheight" args="h"><![CDATA[ + if ($debug) Debug.write("# height",h); + //this.dragger.drag_min_x = parent.width - w; if (parent.parent && parent.parent.scrollContainer) { - parent.parent.scrollContainer.calcScrollContent(); + parent.parent.scrollContainer.calcScrollContent(); } - parent.parent.zoombox.sendUpdate(null); - ]]></handler> - - <handler name="onwidth" args="w"><![CDATA[ - if ($debug) Debug.write("# width",w); - //this.dragger.drag_min_y = parent.height - h; + parent.parent.zoombox.sendUpdate(null); + ]]></handler> + + <handler name="onwidth" args="w"><![CDATA[ + if ($debug) Debug.write("# width",w); + //this.dragger.drag_min_y = parent.height - h; if (parent.parent && parent.parent.scrollContainer) { - parent.parent.scrollContainer.calcScrollContent(); + parent.parent.scrollContainer.calcScrollContent(); } - ]]></handler> - - <handler name="onupdateScale" args="tRef"><![CDATA[ - if ($debug) Debug.write("# updateScale",this.getDisplayObject().scaleX); + ]]></handler> + + <handler name="onupdateScale" args="tRef"><![CDATA[ + if ($debug) Debug.write("# updateScale",this.getDisplayObject().scaleX); if (parent.parent && parent.parent.scrollContainer) { - parent.parent.scrollContainer.calcScrollContent(); + parent.parent.scrollContainer.calcScrollContent(); + } + ]]></handler> + + <handler name="oninit"> + canvas._drawarea = this; + _propPanel = parent.parent._propertyPanel; + </handler> + + <handler name="onprogress" args="perc"> + //Debug.write("onprogress: ",perc); + this.parent.parent._progress.setProgress(perc); + </handler> + + <handler name="ondrawmodus" args="d"> + this.drawmodus = d; + //change Enabled Status of Toolbar Menu Button + _propPanel.loadPanelByModus(this); + </handler> + + <handler name="setNewScreenUserName" args="value"> + this.parent.parent._sharingClientName.setAttribute('text',value); + </handler> + + <!-- @overwrite --> + <method name="onsharedMessage" args="action,obj"> + if ($debug) Debug.write("###### onsharedMessage",action,obj); + + var tempSendArray = new Array (); + tempSendArray[0] = 'whiteboard'; + tempSendArray[1] = new Date(); + tempSendArray[2] = action; + tempSendArray[3] = obj; + + parent.parent.onsharedMessage.sendEvent(tempSendArray); + </method> + + <handler name="onopenWhiteBoard" > + </handler> + + <!-- clientid = streamid of the user --> + <method name="oninitUser" args="clientid,objectList"> + this.parent.parent.sendObjectToClientID = clientid; + this.parent.parent.sendObject = objectList; + this.parent.parent.sendMessageWithClientById.doCall(); + </method> + + <handler name="onboundingIsActive" args="b"> + if ($debug) Debug.write("boundingIsActive: ",b); + if (b){ + var boundingDoUpdateOnInit = true; + if (this.ObjectByName instanceof lz.swfResourceView){ + //Debug.write("is swf Presentation"); + boundingDoUpdateOnInit=false; + } + if (!boundingDoUpdateOnInit) { + _propPanel.setObjectBounds( + this.ObjectByName.x,this.ObjectByName.y, + this.ObjectByName._swfView.width,this.ObjectByName._swfView.height); + } else { + _propPanel.setObjectBounds( + this.ObjectByName.x,this.ObjectByName.y, + this.ObjectByName.width,this.ObjectByName.height); + } + } + </handler> + + <!-- bounding Box (selection Box) --> + <handler name="onBoundingBox" args="boundingBoxRef"> + var boundingDoUpdateOnInit = true; + if (boundingBoxRef.objRef instanceof lz.swfResourceView){ + //if ($debug) Debug.write("is swf Presentation"); + boundingDoUpdateOnInit=false; + } + if (!boundingDoUpdateOnInit) { + _propPanel.setObjectBounds( + boundingBoxRef.objRef.x,boundingBoxRef.objRef.y, + boundingBoxRef.objRef._swfView.width,boundingBoxRef.objRef._swfView.height); + } else { + _propPanel.setObjectBounds( + boundingBoxRef.objRef.x,boundingBoxRef.objRef.y, + boundingBoxRef.objRef.width,boundingBoxRef.objRef.height); } - ]]></handler> - - <handler name="oninit"> - canvas._drawarea = this; - </handler> - - <handler name="onprogress" args="perc"> - //Debug.write("onprogress: ",perc); - this.parent.parent._progress.setProgress(perc); - </handler> - <!-- - <handler name="onmousedown" > - //Debug.write("onprogress: ",perc); - </handler> - --> - <handler name="ondrawmodus" args="d"> - this.drawmodus = d; - //change Enabled Status of Toolbar Menu Button - parent.parent._propertyPanel.loadPanelByModus(this); - </handler> - <handler name="setNewScreenUserName" args="value"> - this.parent.parent._sharingClientName.setAttribute('text',value); - </handler> - <!-- @overwrite --> - <method name="onsharedMessage" args="action,obj"> - - if ($debug) Debug.write("###### onsharedMessage",action,obj); - - var tempSendArray = new Array (); - tempSendArray[0] = 'whiteboard'; - tempSendArray[1] = new Date(); - tempSendArray[2] = action; - tempSendArray[3] = obj; - - parent.parent.onsharedMessage.sendEvent(tempSendArray); - </method> - - <handler name="onopenWhiteBoard" > - //parent.parent.getRoomItems.doCall(); - </handler> - - <!-- clientid = streamid of the user --> - <method name="oninitUser" args="clientid,objectList"> - this.parent.parent.sendObjectToClientID = clientid; - this.parent.parent.sendObject = objectList; - this.parent.parent.sendMessageWithClientById.doCall(); - </method> - - <handler name="onboundingIsActive" args="b"> - if ($debug) Debug.write("boundingIsActive: ",b); - if (b){ - var boundingDoUpdateOnInit = true; - if (this.ObjectByName instanceof lz.swfResourceView){ - //Debug.write("is swf Presentation"); - boundingDoUpdateOnInit=false; - } - if (!boundingDoUpdateOnInit) { - parent.parent._propertyPanel.setObjectBounds( - this.ObjectByName.x,this.ObjectByName.y, - this.ObjectByName._swfView.width,this.ObjectByName._swfView.height); - } else { - parent.parent._propertyPanel.setObjectBounds( - this.ObjectByName.x,this.ObjectByName.y, - this.ObjectByName.width,this.ObjectByName.height); - } - } - </handler> - - <!-- bounding Box (selection Box) --> - <handler name="onBoundingBox" args="boundingBoxRef"> - var boundingDoUpdateOnInit = true; - if (boundingBoxRef.objRef instanceof lz.swfResourceView){ - //Debug.write("is swf Presentation"); - boundingDoUpdateOnInit=false; - } - if (!boundingDoUpdateOnInit) { - parent.parent._propertyPanel.setObjectBounds( - boundingBoxRef.objRef.x,boundingBoxRef.objRef.y, - boundingBoxRef.objRef._swfView.width,boundingBoxRef.objRef._swfView.height); - } else { - parent.parent._propertyPanel.setObjectBounds( - boundingBoxRef.objRef.x,boundingBoxRef.objRef.y, - boundingBoxRef.objRef.width,boundingBoxRef.objRef.height); - } - </handler> - - <method name="getDocumentToolBar"> - return parent.parent.panelArea.getDocumentsToolbar(); - </method> - - <method name="getPaintToolBar"> - return parent.parent.panelArea._mainToolsPanel; - </method> - - <view name="_grid" x="-2" y="-2" height="${parent.height}" width="${parent.height}" - visibility="${ (parent.showGrid) ? 'visible' : 'hidden'}"/> - </remoteWhiteboard> - - </view> - - - <view name="scrollContainer" width="${ parent.parent.width-2 }" - visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }" - height="${ (canvas.ismoderator) ? (parent.parent.height-42-parent._propertyPanel.height) : ((canvas.isAllowedToDraw) ? (parent.parent.height-33-parent._propertyPanel.height) : (parent.parent.height-33)) }" > - - <attribute name="sendUpdate" value="true" type="boolean"/> - - <method name="calcScrollContent"> - var rHeight = Math.round(parent._drawareaMask._drawarea.height * parent._drawareaMask._drawarea.getDisplayObject().scaleX); - var rWidth = Math.round(parent._drawareaMask._drawarea.width * parent._drawareaMask._drawarea.getDisplayObject().scaleY); - if ($debug) Debug.write("# calcScrollContent:: ", rHeight, rWidth); - this.sendUpdate = false; - this.scrollview.setAttribute("x", parent._drawareaMask._drawarea.x); - this.scrollview.setAttribute("y", parent._drawareaMask._drawarea.y); - this.scrollview.setAttribute("height", Math.max(rHeight, parent._drawareaMask._drawarea.getDisplayObject().height)); - this.scrollview.setAttribute("width", Math.max(rWidth, parent._drawareaMask._drawarea.getDisplayObject().width)); - this.sendUpdate = true; - </method> - - <view name="scrollview"> - - <attribute name="timeisInited" value="false" type="boolean" /> - <attribute name="sendObjectDel" value="null" /> - - <handler name="oninit"> - this.sendObjectDel = new LzDelegate( this, "sendObject" ); - </handler> - - <handler name="onx" args="x"> - if (parent.sendUpdate) { - if ($debug) Debug.write("# scrollview x",x); - parent.parent._drawareaMask._drawarea.setAttribute("x",x); - - 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 (parent.sendUpdate) { - if ($debug) Debug.write("# scrollview y",y); - parent.parent._drawareaMask._drawarea.setAttribute("y",y); - - 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 :: scrollview"); - - var tArray = new Array(); - tArray[0] = "moveMap"; - tArray[1] = Math.round(this.x); - tArray[2] = Math.round(this.y); - - this.parent.parent._drawareaMask._drawarea.onsharedMessage('moveMap',tArray); - this.timeisInited=false; - </method> - </view> - - <om_vscrollbar name="_scrollstv"/> - <om_hscrollbar name="_scrollsth" /> - - </view> - - - <netRemoteCallHib name="sendMessageWithClientById" funcname="sendMessageWithClientById" - remotecontext="$once{ canvas.thishib }" > - <netparam><method name="getValue">return parent.parent.sendObject;</method></netparam> - <netparam><method name="getValue">return parent.parent.sendObjectToClientID;</method></netparam> - <handler name="ondata" args="value"> - <![CDATA[ - //The onResult-Handler will be called be the rtmpconnection - //Debug.write("sendMessageWithClientById : ",value); - ]]> - </handler> - </netRemoteCallHib> - - <view name="panelArea" width="${ parent.parent.width }" - height="${ parent.parent.height-42-parent._propertyPanel.height }"> - - <attribute name="objectRef" value="null" /> - - <!--- @deprecated --> - <method name="_setSelection" args="obj"> - parent._drawareaMask._drawarea.removeObjectBounds(); - if (obj.setSelectionToItem){ - if (this.objectRef!=null){ - this.objectRef._isselected = false; - this.objectRef._area.setAttribute('bgcolor',0xFFFFFF); - } - this.objectRef = obj; - this.objectRef._isselected = true; - this.objectRef._area.setAttribute('bgcolor',canvas.getThemeColor('basebgcolorizer')); - parent._drawareaMask._drawarea.setModus(this.objectRef.modi); - } - </method> - - <method name="setSelection" args="obj"> - if ($debug) Debug.write("setSelection ",obj); - parent._drawareaMask._drawarea.removeObjectBounds(); - if (obj.setSelectionToItem){ - if (this.objectRef!=null){ - this.objectRef._isselected = false; - this.objectRef.setAttribute('enabled',true); - } - this.objectRef = obj; - this.objectRef._isselected = true; - this.objectRef.setAttribute('enabled',false); - } - if (obj.modi=="saveobj"){ - parent._drawareaMask._drawarea.doAction(obj.modi); - } else { - parent._drawareaMask._drawarea.setModus(obj.modi); - } - </method> - - <method name="setSelectionWithoutEvent" args="obj"> - if (obj.setSelectionToItem){ - if (this.objectRef!=null){ - this.objectRef._isselected = false; - this.objectRef.setAttribute('enabled',true); - } - this.objectRef = obj; - this.objectRef._isselected = true; - this.objectRef.setAttribute('enabled',false); - } - </method> - - <!-- - - --> - - <method name="sendNewPropertyHeight" args="objRef"> - <![CDATA[ - for (var i=0;i<this.subviews.length;i++) { - if (this.subviews[i].y != 0) { - if (this.subviews[i] instanceof lz.mainToolsTopPanel) { - if (objRef.height<=22){ - if (this.subviews[i].y+this.subviews[i].height+5>=parent.parent.height-objRef.initheight-21){ - if ($debug) Debug.write("mainToolsTopPanel"); - this.subviews[i].setAttribute('y',objRef.y-this.subviews[i].height); - } - } else { - if (this.subviews[i].y+this.subviews[i].height+5>=objRef.y){ - if ($debug) Debug.write("mainToolsTopPanel"); - this.subviews[i].setAttribute('y',objRef.y-this.subviews[i].height); - } - } - } - } - } - ]]> - </method> - - <method name="getDocumentsToolbar"> - return parent._propertyPanel._content._documentsPanel; - </method> - - <mainToolsTopPanel x="100" y="0" name="_mainToolsPanel" - visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"/> - - <mainToolsLeftPanelPointer y="20" name="_mainToolsLeftPanelPointer" - visible="${ (parent.parent.restricted) ? false : (((canvas.ismoderator) ? false : ((canvas.isAllowedToDraw) ? false : true ))) }"/> - </view> - - <view name="zoombox" y="0" x="${ parent.parent.width-this.width-14 }" layout="axis:x;spacing:2"> - - <attribute name="ignoreUpdates" value="false" type="boolean" /> - - <handler name="onx" args="x"> - if (this._fullFit.getValue()) { - if ($debug) Debug.write("on x sendUpdate ",x); - lz.Timer.addTimer( new LzDelegate( this, "sendUpdate" ), 100 ); - } - </handler> - - <method name="sendUpdate" args="refObj"> - if ($debug) Debug.write("fixedFileExplorer sendUpdate ",refObj); - parent._drawareaMask._drawarea.doFullFit(true); - </method> - - <method name="setWhiteboardValues" args="fullFit,zoom"> - if ($debug) Debug.write("setWhiteboardValues -1- ",fullFit,zoom); - this.ignoreUpdates = true; + </handler> + + <method name="getDocumentToolBar"> + return _propPanel._content._documentsPanel; + </method> + + <method name="getPaintToolBar"> + return parent.parent.panelArea._mainToolsPanel; + </method> + + <view name="_grid" x="-2" y="-2" height="${parent.height}" width="${parent.height}" + visibility="${ (parent.showGrid) ? 'visible' : 'hidden'}"/> + </remoteWhiteboard> + </view> + + <view name="scrollContainer" width="${ parent.parent.width-2 }" + visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }" + height="${ (canvas.ismoderator) ? (parent.parent.height-42-parent._propertyPanel.height) : ((canvas.isAllowedToDraw) ? (parent.parent.height-33-parent._propertyPanel.height) : (parent.parent.height-33)) }" > + <attribute name="sendUpdate" value="true" type="boolean"/> + + <method name="calcScrollContent"> + var rHeight = Math.round(parent._drawareaMask._drawarea.height * parent._drawareaMask._drawarea.getDisplayObject().scaleX); + var rWidth = Math.round(parent._drawareaMask._drawarea.width * parent._drawareaMask._drawarea.getDisplayObject().scaleY); + if ($debug) Debug.write("# calcScrollContent:: ", rHeight, rWidth); + this.sendUpdate = false; + this.scrollview.setAttribute("x", parent._drawareaMask._drawarea.x); + this.scrollview.setAttribute("y", parent._drawareaMask._drawarea.y); + this.scrollview.setAttribute("height", Math.max(rHeight, parent._drawareaMask._drawarea.getDisplayObject().height)); + this.scrollview.setAttribute("width", Math.max(rWidth, parent._drawareaMask._drawarea.getDisplayObject().width)); + this.sendUpdate = true; + </method> + + <view name="scrollview"> + <attribute name="timeisInited" value="false" type="boolean" /> + <attribute name="sendObjectDel" value="null" /> + + <handler name="oninit"> + this.sendObjectDel = new LzDelegate( this, "sendObject" ); + </handler> + + <handler name="onx" args="x"> + if (parent.sendUpdate) { + if ($debug) Debug.write("# scrollview x",x); + parent.parent._drawareaMask._drawarea.setAttribute("x",x); + + 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 (parent.sendUpdate) { + if ($debug) Debug.write("# scrollview y",y); + parent.parent._drawareaMask._drawarea.setAttribute("y",y); + + 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 :: scrollview"); + + var tArray = new Array(); + tArray[0] = "moveMap"; + tArray[1] = Math.round(this.x); + tArray[2] = Math.round(this.y); + + this.parent.parent._drawareaMask._drawarea.onsharedMessage('moveMap',tArray); + this.timeisInited=false; + </method> + </view> + + <om_vscrollbar name="_scrollstv"/> + <om_hscrollbar name="_scrollsth" /> + </view> + + <netRemoteCallHib name="sendMessageWithClientById" funcname="sendMessageWithClientById" + remotecontext="$once{ canvas.thishib }" > + <netparam><method name="getValue">return parent.parent.sendObject;</method></netparam> + <netparam><method name="getValue">return parent.parent.sendObjectToClientID;</method></netparam> + <handler name="ondata" args="value"> + <![CDATA[ + //The onResult-Handler will be called be the rtmpconnection + //Debug.write("sendMessageWithClientById : ",value); + ]]> + </handler> + </netRemoteCallHib> + + <view name="panelArea" width="${ parent.parent.width }" + height="${ parent.parent.height-42-parent._propertyPanel.height }"> + <attribute name="objectRef" value="null" /> + + <!--- @deprecated --> + <method name="_setSelection" args="obj"> + parent._drawareaMask._drawarea.removeObjectBounds(); + if (obj.setSelectionToItem){ + if (this.objectRef!=null){ + this.objectRef._isselected = false; + this.objectRef._area.setAttribute('bgcolor',0xFFFFFF); + } + this.objectRef = obj; + this.objectRef._isselected = true; + this.objectRef._area.setAttribute('bgcolor',canvas.getThemeColor('basebgcolorizer')); + parent._drawareaMask._drawarea.setModus(this.objectRef.modi); + } + </method> + + <method name="setSelection" args="obj"> + if ($debug) Debug.write("setSelection ",obj); + parent._drawareaMask._drawarea.removeObjectBounds(); + if (obj.setSelectionToItem){ + if (this.objectRef!=null){ + this.objectRef._isselected = false; + this.objectRef.setAttribute('enabled',true); + } + this.objectRef = obj; + this.objectRef._isselected = true; + this.objectRef.setAttribute('enabled',false); + } + if (obj.modi=="saveobj"){ + parent._drawareaMask._drawarea.doAction(obj.modi); + } else { + parent._drawareaMask._drawarea.setModus(obj.modi); + } + </method> + + <method name="setSelectionWithoutEvent" args="obj"> + if (obj.setSelectionToItem){ + if (this.objectRef!=null){ + this.objectRef._isselected = false; + this.objectRef.setAttribute('enabled',true); + } + this.objectRef = obj; + this.objectRef._isselected = true; + this.objectRef.setAttribute('enabled',false); + } + </method> + + <method name="sendNewPropertyHeight" args="objRef"> + <![CDATA[ + for (var i=0;i<this.subviews.length;i++) { + if (this.subviews[i].y != 0) { + if (this.subviews[i] instanceof lz.mainToolsTopPanel) { + if (objRef.height<=22){ + if (this.subviews[i].y+this.subviews[i].height+5>=parent.parent.height-objRef.initheight-21){ + if ($debug) Debug.write("mainToolsTopPanel"); + this.subviews[i].setAttribute('y',objRef.y-this.subviews[i].height); + } + } else { + if (this.subviews[i].y+this.subviews[i].height+5>=objRef.y){ + if ($debug) Debug.write("mainToolsTopPanel"); + this.subviews[i].setAttribute('y',objRef.y-this.subviews[i].height); + } + } + } + } + } + ]]> + </method> + + <mainToolsTopPanel x="100" y="0" name="_mainToolsPanel" + visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"/> + + <mainToolsLeftPanelPointer y="20" name="_mainToolsLeftPanelPointer" + visible="${ (parent.parent.restricted) ? false : (((canvas.ismoderator) ? false : ((canvas.isAllowedToDraw) ? false : true ))) }"/> + </view> + + <view name="zoombox" y="0" x="${ parent.parent.width-this.width-14 }" layout="axis:x;spacing:2"> + <attribute name="ignoreUpdates" value="false" type="boolean" /> + + <handler name="onx" args="x"> + if (this._fullFit.getValue()) { + if ($debug) Debug.write("on x sendUpdate ",x); + lz.Timer.addTimer( new LzDelegate( this, "sendUpdate" ), 100 ); + } + </handler> + + <method name="sendUpdate" args="refObj"> + if ($debug) Debug.write("fixedFileExplorer sendUpdate ",refObj); + parent._drawareaMask._drawarea.doFullFit(true); + </method> + + <method name="setWhiteboardValues" args="fullFit,zoom"> + if ($debug) Debug.write("setWhiteboardValues -1- ",fullFit,zoom); + this.ignoreUpdates = true; if ('_zoom' in this) { - this._zoom.setSliderValue(zoom); + this._zoom.setSliderValue(zoom); } - this._fullFit.setValue(fullFit); - this.ignoreUpdates = false; - </method> - - <method name="setCurrentScaleByFullFit" args="tScale"> - if ($debug) Debug.write("setCurrentScaleByFullFit -2- ",tScale); - this.ignoreUpdates = true; + this._fullFit.setValue(fullFit); + this.ignoreUpdates = false; + </method> + + <method name="setCurrentScaleByFullFit" args="tScale"> + if ($debug) Debug.write("setCurrentScaleByFullFit -2- ",tScale); + this.ignoreUpdates = true; if ('_zoom' in this) { - this._zoom.setSliderValue(tScale); + this._zoom.setSliderValue(tScale); } - this.ignoreUpdates = false; - </method> - - <labelCheckbox x="344" name="_fullFit" labelid="847" y="4" fontstyle="bold" bgcolor="0xFFFFFF" - visible="${ ((canvas.becomemoderator) ? true : false ) }"> - <handler name="onvalue" args="v"><![CDATA[ - if (parent.ignoreUpdates) { - return; - } - if ($debug) Debug.warn("onvalue Full Fit ",v); - + this.ignoreUpdates = false; + </method> + + <labelCheckbox x="344" name="_fullFit" labelid="847" y="4" fontstyle="bold" bgcolor="0xFFFFFF" + visible="${ ((canvas.becomemoderator) ? true : false ) }"> + <handler name="onvalue" args="v"><![CDATA[ + if (parent.ignoreUpdates) { + return; + } + if ($debug) Debug.warn("onvalue Full Fit ",v); + if ('_zoom' in parent && parent._zoom) { - parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber); + parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber); + } + ]]></handler> + <labelTooltip labelid="1212" multiline="true" /> + </labelCheckbox> + + <changeWidthSlider name="_zoom" initialNumberInit="50" labelid="1328" + boxPosition="down" initialNumber="50" maximum="200"> + <handler name="oninitialNumber" args="i"> + if (parent.ignoreUpdates) { + return; } - ]]></handler> - <labelTooltip labelid="1212" multiline="true" /> - </labelCheckbox> - - <changeWidthSlider name="_zoom" initialNumberInit="50" labelid="1328" - boxPosition="down" initialNumber="50" maximum="200"> - <handler name="oninitialNumber" args="i"> - if (parent.ignoreUpdates) { - return; - } - - if ($debug) Debug.warn("onvalue Zoom Fit ",this.initialNumber); - - parent._fullFit.setValue(false); + if ($debug) Debug.warn("onvalue Zoom Fit ",this.initialNumber); + parent._fullFit.setValue(false); parent.parent._drawareaMask._drawarea.doUpdateZoom(parent._fullFit.getValue(),this.initialNumber); - </handler> - </changeWidthSlider> - - <view width="2" /> - - </view> - - <propertyPanel name="_propertyPanel" x="0" y="${ parent.parent.height-this.height-42 }" - visible="${ canvas.ismoderator || canvas.isAllowedToDraw }"> - <handler name="onheight" args="h"> - this.height = h; - if ($debug) Debug.write("onheight: ",h); - parent.panelArea.sendNewPropertyHeight(this); - </handler> - </propertyPanel> -</class> + </handler> + </changeWidthSlider> + + <view width="2" /> + </view> + <propertyPanel name="_propertyPanel" x="0" y="${ parent.parent.height-this.height-42 }" + visible="${ canvas.ismoderator || canvas.isAllowedToDraw }"> + <handler name="onheight" args="h"> + this.height = h; + if ($debug) Debug.write("onheight: ",h); + parent.panelArea.sendNewPropertyHeight(this); + </handler> + </propertyPanel> +</class> </library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1773334&r1=1773333&r2=1773334&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Fri Dec 9 08:26:19 2016 @@ -21,11 +21,10 @@ <library> <class name="multiWhiteboardPanel" extends="fixedFileExplorerWhiteBoard" y="42" x="1"> - <attribute name="whiteboardId" value="0" type="number" /> <attribute name="objWhiteboard" value="null" /> <attribute name="objMessage" value="null" /> - + <handler name="onsharedMessage" args="obj"> this.objWhiteboard = obj; if (this.sendVarsByWhiteboardId != null){ @@ -33,7 +32,7 @@ this.sendVarsByWhiteboardId.doCall(); } </handler> - + <netRemoteCallHib name="sendVarsByWhiteboardId" funcname="sendVarsByWhiteboardId" showLoading="false" remotecontext="$once{ canvas.thishib }" > <netparam><method name="getValue">return parent.parent.objWhiteboard;</method></netparam> @@ -45,7 +44,7 @@ ]]> </handler> </netRemoteCallHib> - + <handler name="onvisible" args="v"> <![CDATA[ if ($debug) Debug.write("onvisible :: ",v); @@ -122,6 +121,7 @@ whiteboardId:whiteboardId }); var tWhiteboardBtn = new lz.whiteboardMiniButton(canvas._wbBar,{ + name: "bar" + whiteboardId, objRef: whiteboard, width: canvas._wbBar.staticwidth, isactive: true, Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx?rev=1773334&r1=1773333&r2=1773334&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx Fri Dec 9 08:26:19 2016 @@ -9,7 +9,7 @@ with the License. You may obtain a copy of the License at 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,15 +19,14 @@ --> <library> - <include href="utils/states/resizestatemin.lzx"/> <!-- - The order of views is important in this class - otherwise the scrollbar of the swfPresentation would be not visible or partly overlayed - - - this is the selection Box for all Whiteboard Objects + The order of views is important in this class + otherwise the scrollbar of the swfPresentation would be not visible or partly overlayed + + + this is the selection Box for all Whiteboard Objects --> <class name="boundingBoxAllRotationMarger" extends="view" @@ -36,44 +35,44 @@ <attribute name="dragStarted" value="false" type="boolean"/> <handler name="onmouseover"> - lz.Cursor.setCursorGlobal("arrow_rotate_panel_cursor"); - </handler> - <handler name="onmouseout"> - lz.Cursor.unlock(); - </handler> - - <handler name="onx" args="x"> - this.doMoveDragPoint(); - </handler> - <handler name="ony" args="y"> - this.doMoveDragPoint(); - </handler> - - <method name="doMoveDragPoint"> - if (!this.dragStarted) { - return; - } - parent.doMoveDragPoint(this.x+12,this.y+12); - </method> - - <handler name="onmousedown"> - this.dragStarted = true; - parent.doStartDragPoint(); - this.dragger.apply(); - </handler> - <handler name="onmouseup"> - this.dragStarted = false; - this.dragger.remove(); - parent.endDrawClipArtDrag(); - lz.Cursor.unlock(); - </handler> - - <dragstate name="dragger" /> - + lz.Cursor.setCursorGlobal("arrow_rotate_panel_cursor"); + </handler> + <handler name="onmouseout"> + lz.Cursor.unlock(); + </handler> + + <handler name="onx" args="x"> + this.doMoveDragPoint(); + </handler> + <handler name="ony" args="y"> + this.doMoveDragPoint(); + </handler> + + <method name="doMoveDragPoint"> + if (!this.dragStarted) { + return; + } + parent.doMoveDragPoint(this.x+12,this.y+12); + </method> + + <handler name="onmousedown"> + this.dragStarted = true; + parent.doStartDragPoint(); + this.dragger.apply(); + </handler> + <handler name="onmouseup"> + this.dragStarted = false; + this.dragger.remove(); + parent.endDrawClipArtDrag(); + lz.Cursor.unlock(); + </handler> + + <dragstate name="dragger" /> + </class> - + <class name="boundingBoxAll" extends="view" focusable="true"> - + <!-- <method name="removeIt"> canvas._drawarea.setAttribute('boundingIsActive',true); @@ -102,18 +101,18 @@ <attribute name="objRef" value="null" /> <attribute name="whiteboardRef" value="null" /> <attribute name="doHandlerUpdates" value="false" type="boolean" /> - <attribute name="boundingDoUpdateOnInit" value="true" type="boolean" /> - - <attribute name="canBeDragged" value="true" type="boolean" /> - <attribute name="canBeResized" value="true" type="boolean" /> - - <!--- Minimum width for the windowy, default: 60. - @keywords final --> - <attribute name="minwidth" value="2"/> - - <!--- Minimum height for the window, default: 50. - @keywords final --> - <attribute name="minheight" value="2"/> + <attribute name="boundingDoUpdateOnInit" value="true" type="boolean" /> + + <attribute name="canBeDragged" value="true" type="boolean" /> + <attribute name="canBeResized" value="true" type="boolean" /> + + <!--- Minimum width for the windowy, default: 60. + @keywords final --> + <attribute name="minwidth" value="2"/> + + <!--- Minimum height for the window, default: 50. + @keywords final --> + <attribute name="minheight" value="2"/> <method name="__LZRemoveItem" args="itemRef"> this.whiteboardRef.deleteItemByName(this.objRef.name); @@ -122,15 +121,15 @@ <handler name="oninit"> <![CDATA[ - if (!this.boundingDoUpdateOnInit) { - if ($debug) Debug.write("DESTROY the clickable view"); - //this._innerDrag.destroy(); - } - - if (!this.canBeResized) { - this._gripperNoResize.setAttribute("visibility","visible"); - this._gripperResize.setAttribute("visibility","hidden"); - } + if (!this.boundingDoUpdateOnInit) { + if ($debug) Debug.write("DESTROY the clickable view"); + //this._innerDrag.destroy(); + } + + if (!this.canBeResized) { + this._gripperNoResize.setAttribute("visibility","visible"); + this._gripperResize.setAttribute("visibility","hidden"); + } this.setAttribute('x',this.ex); this.setAttribute('y',this.ey); @@ -145,8 +144,8 @@ this._editText.setAttribute("visibility","visible"); } - //FIXME - Add Ellipse, Line and Free Draw Tool to it - if (this.objRef.name.indexOf('rectangle') >= 0){ + //FIXME - Add Ellipse, Line and Free Draw Tool to it + if (this.objRef.name.indexOf('rectangle') >= 0){ if ($debug) Debug.write("this.objRef._innerRect ",this.objRef._innerRect); if ($debug) Debug.write("strokeStyle: ",this.objRef._innerRect.strokeStyle); @@ -171,22 +170,22 @@ this.whiteboardRef.currentrectangleineWidth = this.objRef._innerRect.lineWidth; } else if (this.objRef.name.indexOf('swf') >= 0) { - this.setAttribute("innerInsetScrollbars",16); - } else if (this.objRef.name.indexOf('clipart') >= 0) { - this.canBeResized = false; - this._gripperNoResize.setAttribute("visibility","visible"); - this._gripperResize.setAttribute("visibility","hidden"); - - new lz.boundingBoxAllRotationMarger(this,{ - x:this.objRef.clipart.clipArtEndx-12, - y:this.objRef.clipart.clipArtEndy-12 - }); - - } - - - this.whiteboardRef.parent.parent._propertyPanel.loadPanelByBoundingBox(this.whiteboardRef,this.objRef); - + this.setAttribute("innerInsetScrollbars",16); + } else if (this.objRef.name.indexOf('clipart') >= 0) { + this.canBeResized = false; + this._gripperNoResize.setAttribute("visibility","visible"); + this._gripperResize.setAttribute("visibility","hidden"); + + new lz.boundingBoxAllRotationMarger(this,{ + x:this.objRef.clipart.clipArtEndx-12, + y:this.objRef.clipart.clipArtEndy-12 + }); + + } + + + this.whiteboardRef._propPanel.loadPanelByBoundingBox(this.whiteboardRef,this.objRef); + this.doUpdateAction(); ]]> </handler> @@ -200,27 +199,22 @@ </method> <method name="endDrawClipArtDrag"> - this.whiteboardRef.endDrawClipArtDrag(this.objRef); - this.whiteboardRef.reselectShowObjectBounds(this.objRef.name); - </method> - + this.whiteboardRef.endDrawClipArtDrag(this.objRef); + this.whiteboardRef.reselectShowObjectBounds(this.objRef.name); + </method> + <!-- Do update the Selection-Box, in case another Moderator or User has moved the Object while you have it in focus --> - <method name="sendRemoteUpdate" args="obj"> - <![CDATA[ - - if (this.objRef.name == obj.name) { - - this.resetValues(); - - } - - ]]> - </method> - - + <method name="sendRemoteUpdate" args="obj"> + <![CDATA[ + if (this.objRef.name == obj.name) { + this.resetValues(); + } + ]]> + </method> + <method name="resetValues"> this.ex = this.objRef.x; this.ey = this.objRef.y; @@ -233,115 +227,115 @@ this.setStartValues(); </method> - <method name="doUpdateAction" > - this.setAttribute('doHandlerUpdates',true); - if (this.boundingDoUpdateOnInit) { - this._innerDrag.onmousedown.sendEvent(); - } - </method> - - <handler name="onheight"> - if(this.doHandlerUpdates){ - this.objRef.setAttribute('height',this.height); - } - </handler> - - <handler name="onwidth"> - if(this.doHandlerUpdates){ - this.objRef.setAttribute('width',this.width); - } - </handler> - - <handler name="onx"> - if(this.doHandlerUpdates){ - - var tx = this.getAttributeRelative('x',objRef); - - if(this.objRef.parent.isSnapToGrid){ - tx = Math.round(tx/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth; - this.setAttribute("x",Math.round(this.x/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth) - } - - this.objRef.setAttribute('x',tx); - } - </handler> - - <handler name="ony"> - if(this.doHandlerUpdates){ - - var ty = this.getAttributeRelative('y',objRef); - - if(this.objRef.parent.isSnapToGrid){ - ty = Math.round(ty/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth; - this.setAttribute("y",Math.round(this.y/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth) - } - - this.objRef.setAttribute('y',ty); - } - </handler> - - <handler name="onkeydown" args="key"> - if ($debug) Debug.write("onkeydown ",key); - - //this.objRef.parent.UpdateByObject(this.objRef); - - if (key == 46) { - this.__LZRemoveItem(this.objRef); - } else if (key == 40) { - var shiftPressed = lz.Keys.isKeyDown("shift"); - if ($debug) Debug.write("shiftPressed ",shiftPressed); - this.doHandlerUpdates = true; - this.setAttribute("y",this.y+(shiftPressed ? 20 : 2)); - this.doHandlerUpdates = false; - this.objRef.parent.UpdateByObject(this.objRef); + <method name="doUpdateAction" > + this.setAttribute('doHandlerUpdates',true); + if (this.boundingDoUpdateOnInit) { + this._innerDrag.onmousedown.sendEvent(); + } + </method> + + <handler name="onheight"> + if(this.doHandlerUpdates){ + this.objRef.setAttribute('height',this.height); + } + </handler> + + <handler name="onwidth"> + if(this.doHandlerUpdates){ + this.objRef.setAttribute('width',this.width); + } + </handler> + + <handler name="onx"> + if(this.doHandlerUpdates){ + + var tx = this.getAttributeRelative('x',objRef); + + if(this.objRef.parent.isSnapToGrid){ + tx = Math.round(tx/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth; + this.setAttribute("x",Math.round(this.x/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth) + } + + this.objRef.setAttribute('x',tx); + } + </handler> + + <handler name="ony"> + if(this.doHandlerUpdates){ + + var ty = this.getAttributeRelative('y',objRef); + + if(this.objRef.parent.isSnapToGrid){ + ty = Math.round(ty/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth; + this.setAttribute("y",Math.round(this.y/this.objRef.parent.gridWidth)*this.objRef.parent.gridWidth) + } + + this.objRef.setAttribute('y',ty); + } + </handler> + + <handler name="onkeydown" args="key"> + if ($debug) Debug.write("onkeydown ",key); + + //this.objRef.parent.UpdateByObject(this.objRef); + + if (key == 46) { + this.__LZRemoveItem(this.objRef); + } else if (key == 40) { + var shiftPressed = lz.Keys.isKeyDown("shift"); + if ($debug) Debug.write("shiftPressed ",shiftPressed); + this.doHandlerUpdates = true; + this.setAttribute("y",this.y+(shiftPressed ? 20 : 2)); + this.doHandlerUpdates = false; + this.objRef.parent.UpdateByObject(this.objRef); this.setStartValues(); - } else if (key == 38) { - var shiftPressed = lz.Keys.isKeyDown("shift"); - this.doHandlerUpdates = true; - this.setAttribute("y",this.y-(shiftPressed ? 20 : 2)); - this.doHandlerUpdates = false; - this.objRef.parent.UpdateByObject(this.objRef); + } else if (key == 38) { + var shiftPressed = lz.Keys.isKeyDown("shift"); + this.doHandlerUpdates = true; + this.setAttribute("y",this.y-(shiftPressed ? 20 : 2)); + this.doHandlerUpdates = false; + this.objRef.parent.UpdateByObject(this.objRef); this.setStartValues(); - } else if (key == 39) { - var shiftPressed = lz.Keys.isKeyDown("shift"); - this.doHandlerUpdates = true; - this.setAttribute("x",this.x+(shiftPressed ? 20 : 2)); - this.doHandlerUpdates = false; - this.objRef.parent.UpdateByObject(this.objRef); + } else if (key == 39) { + var shiftPressed = lz.Keys.isKeyDown("shift"); + this.doHandlerUpdates = true; + this.setAttribute("x",this.x+(shiftPressed ? 20 : 2)); + this.doHandlerUpdates = false; + this.objRef.parent.UpdateByObject(this.objRef); this.setStartValues(); - } else if (key == 37) { - var shiftPressed = lz.Keys.isKeyDown("shift"); - this.doHandlerUpdates = true; - this.setAttribute("x",this.x-(shiftPressed ? 20 : 2)); - this.doHandlerUpdates = false; - this.objRef.parent.UpdateByObject(this.objRef); + } else if (key == 37) { + var shiftPressed = lz.Keys.isKeyDown("shift"); + this.doHandlerUpdates = true; + this.setAttribute("x",this.x-(shiftPressed ? 20 : 2)); + this.doHandlerUpdates = false; + this.objRef.parent.UpdateByObject(this.objRef); this.setStartValues(); - } - </handler> - + } + </handler> + <method name="setStartValues"> this.startdragX = this.x; this.startdragY = this.y; this.startdragWidth = this.width; - this.startdragHeight = this.height; + this.startdragHeight = this.height; </method> - <method name="_applyResizestateFromThis"> - lz.Focus.setFocus(this, true); - if ($debug) Debug.write("Apply resize State"); - if (!this.canBeResized) { - return; - } - this.setStartValues(); + <method name="_applyResizestateFromThis"> + lz.Focus.setFocus(this, true); + if ($debug) Debug.write("Apply resize State"); + if (!this.canBeResized) { + return; + } + this.setStartValues(); this.rs.apply() </method> - - <method name="_removeResizestateFromThis"> - <![CDATA[ + + <method name="_removeResizestateFromThis"> + <![CDATA[ if (!this.canBeResized) { - return; - } - this.rs.remove(); + return; + } + this.rs.remove(); if (this.startdragX != this.x || this.startdragY != this.y || this.startdragWidth != this.width || this.startdragHeight != this.height){ //Debug.write("value changed 1"); @@ -349,10 +343,9 @@ this.setStartValues(); } if (parent.onBoundingBox) parent.onBoundingBox.sendEvent(this); - - ]]> - </method> - + ]]> + </method> + <method name="_applyDragstateFromThis"> lz.Focus.setFocus(this, true); if (!this.canBeDragged) { @@ -360,73 +353,71 @@ } this.setStartValues(); this.dragger.apply() - </method> - - <method name="_removeDragstateFromThis"> - <![CDATA[ + </method> + + <method name="_removeDragstateFromThis"> + <![CDATA[ if (!this.canBeDragged) { - return; - } - this.dragger.remove(); + return; + } + this.dragger.remove(); - if (this.startdragX != this.x || this.startdragY != this.y || this.startdragWidth != this.width || this.startdragHeight != this.height){ + if (this.startdragX != this.x || this.startdragY != this.y || this.startdragWidth != this.width || this.startdragHeight != this.height){ //Debug.write("value changed 2"); this.objRef.parent.UpdateByObject(this.objRef); this.setStartValues(); } if (parent.onBoundingBox) parent.onBoundingBox.sendEvent(this); - - ]]> - </method> + ]]> + </method> + + <method name="doSetInnerObjectsBounds" args="w,h"> + this._inner._inner.setAttribute('width',w); + this._inner._inner.setAttribute('height',h); + </method> - <method name="doSetInnerObjectsBounds" args="w,h"> - this._inner._inner.setAttribute('width',w); - this._inner._inner.setAttribute('height',h); - </method> - - <method name="applyScrollbarToObject"> - <![CDATA[ - //if ($debug) Debug.write("-- applyScrollbarToObject --",this.objRef.typeOfObject); - if (this.objRef.typeOfObject == 'swf'){ - if (canvas.ismoderator || canvas.isAllowedToDraw) { - //if ($debug) Debug.write("-- setCurrentMouseWheelObject --",this.objRef._scrollstv); - //setCurrentMouseWheelObject(this.objRef._scrollstv); - } - } - ]]> - </method> - - <method name="removeScrollbarToObject"> - if (this.objRef.typeOfObject == 'swf'){ - //Well disable, you can always disable without any problem - //and in case you do exactly switch the moderation now - //it will remove it in any case - disableCurrentMouseWheelObject(); - } - </method> - - <resizestatemin name="rs"> - <text x="2" y="2" text="${ 'w: '+parent.width+' h: '+parent.height }" bgcolor="white"/> - </resizestatemin> - - <dragstate name="dragger"> + <method name="applyScrollbarToObject"> + <![CDATA[ + //if ($debug) Debug.write("-- applyScrollbarToObject --",this.objRef.typeOfObject); + if (this.objRef.typeOfObject == 'swf'){ + if (canvas.ismoderator || canvas.isAllowedToDraw) { + //if ($debug) Debug.write("-- setCurrentMouseWheelObject --",this.objRef._scrollstv); + //setCurrentMouseWheelObject(this.objRef._scrollstv); + } + } + ]]> + </method> + + <method name="removeScrollbarToObject"> + if (this.objRef.typeOfObject == 'swf'){ + //Well disable, you can always disable without any problem + //and in case you do exactly switch the moderation now + //it will remove it in any case + disableCurrentMouseWheelObject(); + } + </method> + + <resizestatemin name="rs"> + <text x="2" y="2" text="${ 'w: '+parent.width+' h: '+parent.height }" bgcolor="white"/> + </resizestatemin> + + <dragstate name="dragger"> <text x="2" y="2" text="${ 'x: '+parent.getAttributeRelative('x',parent.objRef)+' y: '+parent.getAttributeRelative('y',parent.objRef) }" bgcolor="white"/> - </dragstate> - + </dragstate> + <view name="_innerDrag" width="${ parent.width-parent.innerInsetScrollbars }" - height="${ parent.height-parent.innerInsetScrollbars }" - onmouseover="parent.applyScrollbarToObject()" - onmouseout="parent.removeScrollbarToObject()" - onmousedown="parent._applyDragstateFromThis()" - onmouseup="parent._removeDragstateFromThis()"> - - <contextmenu> - <contextmenuitem caption="$once{ canvas.getLabelName(80) }" - onselect="parent.parent.parent.__LZRemoveItem()" /> - </contextmenu> - - <handler name="ondblclick"> + height="${ parent.height-parent.innerInsetScrollbars }" + onmouseover="parent.applyScrollbarToObject()" + onmouseout="parent.removeScrollbarToObject()" + onmousedown="parent._applyDragstateFromThis()" + onmouseup="parent._removeDragstateFromThis()"> + + <contextmenu> + <contextmenuitem caption="$once{ canvas.getLabelName(80) }" + onselect="parent.parent.parent.__LZRemoveItem()" /> + </contextmenu> + <handler name="ondblclick"> //Debug.write("ondblclick: ",this.parent.objRef.typeOfObject); if (this.parent.objRef.typeOfObject == "text") { var x = this.parent.objRef.x; //this.parent.objRef.getAttributeRelative('x', canvas); @@ -440,22 +431,20 @@ this.parent.objRef.height); } </handler> - + <handler name="onmouseover"> if (this.parent.objRef.typeOfObject != "swf") { - lz.Cursor.setCursorGlobal("arrow_draw_panel_cursor"); + lz.Cursor.setCursorGlobal("arrow_draw_panel_cursor"); } </handler> - + <handler name="onmouseout"> lz.Cursor.unlock(); </handler> - - </view> - + <omImage src="$once{ canvas.getThemeImage('bounding_box_textedit_item_rsc') }" y="2" width="16" height="16" stretches="both" - name="_editText" visibility="hidden" x="${ parent.width-this.width-parent.innerInsetScrollbars-18 }" > + name="_editText" visibility="hidden" x="${ parent.width-this.width-parent.innerInsetScrollbars-18 }" > <handler name="onclick"> this.parent.whiteboardRef .editTextByValues(this.parent.objRef, @@ -467,53 +456,51 @@ this.parent.objRef.height); </handler> <handler name="onmouseover"> - lz.Cursor.restoreCursor(); - lz.Cursor.showHandCursor(true); - </handler> - <handler name="onmouseout"> - lz.Cursor.showHandCursor(false); - lz.Cursor.unlock(); - </handler> - + lz.Cursor.restoreCursor(); + lz.Cursor.showHandCursor(true); + </handler> + <handler name="onmouseout"> + lz.Cursor.showHandCursor(false); + lz.Cursor.unlock(); + </handler> + <labelTooltip labelid="1463" /> - </omImage> - + </omImage> + <omImage src="$once{ canvas.getThemeImage('bounding_box_delete_item_rsc') }" y="2" width="16" height="16" - x="${ parent.width-this.width-parent.innerInsetScrollbars-2 }" stretches="both"> + x="${ parent.width-this.width-parent.innerInsetScrollbars-2 }" stretches="both"> <handler name="onclick"> //Debug.write("this.parent.objRef.name: ",this.parent.objRef.name); //this.parent.whiteboardRef.deleteItemByName(this.parent.objRef.name); parent.__LZRemoveItem(this.parent.objRef); </handler> <handler name="onmouseover"> - lz.Cursor.restoreCursor(); - lz.Cursor.showHandCursor(true); - </handler> - <handler name="onmouseout"> - lz.Cursor.showHandCursor(false); - lz.Cursor.unlock(); - </handler> - + lz.Cursor.restoreCursor(); + lz.Cursor.showHandCursor(true); + </handler> + <handler name="onmouseout"> + lz.Cursor.showHandCursor(false); + lz.Cursor.unlock(); + </handler> + <labelTooltip labelid="80" /> - </omImage> - - <view resource="_boundingBoxPointerTL" x="0" y="0" /> - <view resource="_boundingBoxPointerTR" x="${ parent.width-this.width }" y="0" /> - <view name="_gripperResize" visibility="visible" - resource="_boundingBoxPointerUR" x="${ parent.width-this.width }" y="${ parent.height-this.height }" - onmousedown="parent._applyResizestateFromThis()" onmouseup="parent._removeResizestateFromThis()" > - <handler name="onmouseover"> - lz.Cursor.setCursorGlobal("arrow_resize_panel_cursor"); - </handler> - <handler name="onmouseout"> - lz.Cursor.unlock(); - </handler> - <labelTooltip labelid="252" /> - </view> - <view name="_gripperNoResize" visibility="hidden" - resource="_boundingBoxPointerURNoGripper" x="${ parent.width-this.width }" y="${ parent.height-this.height }" /> - <view resource="_boundingBoxPointerUL" x="0" y="${ parent.height-this.height }" /> + </omImage> + <view resource="_boundingBoxPointerTL" x="0" y="0" /> + <view resource="_boundingBoxPointerTR" x="${ parent.width-this.width }" y="0" /> + <view name="_gripperResize" visibility="visible" + resource="_boundingBoxPointerUR" x="${ parent.width-this.width }" y="${ parent.height-this.height }" + onmousedown="parent._applyResizestateFromThis()" onmouseup="parent._removeResizestateFromThis()" > + <handler name="onmouseover"> + lz.Cursor.setCursorGlobal("arrow_resize_panel_cursor"); + </handler> + <handler name="onmouseout"> + lz.Cursor.unlock(); + </handler> + <labelTooltip labelid="252" /> + </view> + <view name="_gripperNoResize" visibility="hidden" + resource="_boundingBoxPointerURNoGripper" x="${ parent.width-this.width }" y="${ parent.height-this.height }" /> + <view resource="_boundingBoxPointerUL" x="0" y="${ parent.height-this.height }" /> </class> - </library> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1773334&r1=1773333&r2=1773334&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Fri Dec 9 08:26:19 2016 @@ -259,18 +259,18 @@ </handler> <method name="addCurrentObject" args="itemObj"> - //if ($debug) Debug.write("addCurrentObject ",itemObj.fileName,itemObj.name); var docName = itemObj.standardFileName; + //if ($debug) Debug.write("addCurrentObject ", docName, itemObj.fileName, itemObj.name); if (docName.length == 0) { docName = itemObj.fileName; } - parent.currentDocument.addItem(docName,itemObj.name); + parent.currentDocument.addItem(docName, itemObj.name); parent.currentDocument.sendSelection = false; parent.currentDocument.selectItem(itemObj.name); parent.currentDocument.sendSelection = true; - parent._clickLayer.setAttribute("visibility","hidden"); + parent._clickLayer.setAttribute("visible", false); </method> <method name="removeDocument" args="refItemName"> Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1773334&r1=1773333&r2=1773334&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx (original) +++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx Fri Dec 9 08:26:19 2016 @@ -39,19 +39,19 @@ <method name="removeObjectSynced" args="btn"> <![CDATA[ - var removeCurrent = this.currentBtn == btn; - btn.objRef.destroy(); - btn.destroy(); - if (this.subviews.length == 0) { - setWhiteboardId(-1);//no WB - } else if (removeCurrent) { - this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]); + var _btn = this[btn.name]; + var removeCurrent = this.currentBtn == _btn; + _btn.objRef.destroy(); + _btn.destroy(); + if (this.subviews.length != 0 && removeCurrent) { + sendActiveWindowSynced(this.subviews[this.subviews.length-1]); + canvas._drawarea = currentBtn.objRef._drawareaMask._drawarea; } ]]> </method> <method name="sendActiveWindow" args="btn,win"> - if ($debug) Debug.write("sendActiveWindow: ",btn,win); + //if ($debug) Debug.write("sendActiveWindow: ", btn, win); this.sendActiveWindowSynced(btn); this.currentBtn.objRef.sendActiveWindow(); </method> @@ -62,13 +62,14 @@ <method name="sendActiveWindowSynced" args="btn"> <![CDATA[ - if (this.currentBtn != null){ - this.currentBtn.setActive(false); + if (!!currentBtn && !!currentBtn.objRef) { + currentBtn.setActive(false); + currentBtn.objRef.setAttribute("visible", false); } - this.currentBtn = btn; - this.currentBtn.objRef.setAttribute("visibility","visible"); - this.currentBtn.objRef.bringToFront(); - this.currentBtn.setActive(true); + currentBtn = this[btn.name]; + currentBtn.setActive(true); + currentBtn.objRef.setAttribute("visible", true); + currentBtn.objRef.bringToFront(); ]]> </method> </class>
