Revision: 4216
Author: seba.wagner
Date: Fri Sep 9 12:26:53 2011
Log: Fixes issue 1484
http://code.google.com/p/openmeetings/source/detail?r=4216
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawLetter.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawLetter.lzx
Sun Jun 19 01:03:45 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDrawLetter.lzx
Fri Sep 9 12:26:53 2011
@@ -101,25 +101,27 @@
<method name="editTextByValues" args="obj,txtName,txt,x,y,width,height">
<![CDATA[
if (!this.letterObjectIsActive){
- //Debug.write("editTextByValues",height);
+ //Debug.write("editTextByValues",height);
this.edittextLetterObject = obj;
- this.currentletterObj = new
lz.baseDrawWords(canvas,{refObj:this,x:x,y:y,
+ this.currentletterObj = new
lz.baseDrawWords(this,{refObj:this,x:x,y:y,
initTextName:txtName,inittext:txt,width:width,height:height});
this.edittextLetter = true;
}
]]>
</method>
- <method name="drawTextField" args="textforfield,width,height,x,y" >
- //Debug.write("drawTextField: ",textforfield,width,x,y);
- var tempO =
this.newTextField(this,'letter'+this.getCounter(),textforfield,width,height,x,y,this.currentlayersize,this.currentlayerletter,this.currentlayerstyle);
- this.layers.push(tempO);
- this.drawTextFieldregister(textforfield,width,x,y,
- this.currentlayersize,this.currentlayerletter,
- this.currentlayerstyle,tempO.height,
- this.getSWFDocumentStatus(),
- this.getZIndex());
- </method>
+ <method name="drawTextField" args="textforfield,width,height,x,y"
>
+
+ //Debug.write("drawTextField: ",textforfield,width,x,y);
+ var tempO = this.newTextField(this, 'letter' +
this.getCounter(),
+ textforfield, width, height, x, y,
this.currentlayersize,
+ this.currentlayerletter,
this.currentlayerstyle);
+ this.layers.push(tempO);
+ this.drawTextFieldregister(textforfield, width, x, y,
+ this.currentlayersize,
this.currentlayerletter,
+ this.currentlayerstyle, tempO.height,
this
+
.getSWFDocumentStatus(), this.getZIndex());
+ </method>
<!-- editModus -->
<method name="setTextFieldByName"
args="txtName,textforfield,width,x,y,height" >
@@ -163,35 +165,40 @@
]]>
</method>
- <method name="endLetter">
- <![CDATA[
- if ($debug) Debug.write("endLetter:
",this.currentlayer);
- this.currentlayer.destroy();
- var xProp = this.getAttributeRelative('x',canvas);
- var yProp = this.getAttributeRelative('y',canvas);
- if (this.startx <= this.endx){
- var stx = this.startx;
- } else {
- var stx = this.endx;
- }
- if (this.starty <= this.endy){
- var sty = this.starty;
- } else {
- var sty = this.endy;
- }
- var width = Math.abs(this.startx-this.endx);
- var height = Math.abs(this.starty-this.endy);
- if (width < 20 && height < 20){
- width = 160;
- height = 30;
- }
-
- this.currentletterObj = new
lz.baseDrawWords(canvas,{refObj:this,x:xProp+stx,
- y:yProp+sty,width:width,height:height});
-
- if ($debug)
Debug.write("currentletterObj: ",this.currentletterObj);
+ <method name="endLetter">
+ <![CDATA[
+ if ($debug) Debug.write("endLetter: ",
this.currentlayer);
+ this.currentlayer.destroy();
+ var xProp = 0;
+ var yProp = 0;
+ if (this.startx <= this.endx) {
+ var stx = this.startx;
+ } else {
+ var stx = this.endx;
+ }
+ if (this.starty <= this.endy) {
+ var sty = this.starty;
+ } else {
+ var sty = this.endy;
+ }
+ var width = Math.abs(this.startx - this.endx);
+ var height = Math.abs(this.starty - this.endy);
+ if (width < 20 && height < 20) {
+ width = 160;
+ height = 30;
+ }
+
+ this.currentletterObj = new lz.baseDrawWords(this, {
+ refObj : this,
+ x : xProp + stx,
+ y : yProp + sty,
+ width : width,
+ height : height
+ });
+
+ if ($debug) Debug.write("currentletterObj: ", this.currentletterObj.x,
this.currentletterObj.y);
]]>
- </method>
+ </method>
<method name="updateByEditLetterObject" >
@@ -250,12 +257,23 @@
this.doSWFDocumentStatus(this.currentlayer,actionObject[actionObject.length-7]);
</method>
- <method name="newTextField"
args="obj,naming,textforfield,width,height,x,y,fontsize,fgcolor,fontstyle">
- this.currentlayer = new
lz.whiteBoardTextField(obj,{name:naming,x:x,y:y,height:height,multiline:true,width:width,text:textforfield,fontsize:fontsize,fgcolor:fgcolor,fontstyle:fontstyle});
- this.currentlayer.setTextEncoded(textforfield);
- //Add Layer to global Layer
- return this.currentlayer;
- </method>
+ <method name="newTextField"
args="obj,naming,textforfield,width,height,x,y,fontsize,fgcolor,fontstyle">
+ this.currentlayer = new lz.whiteBoardTextField(obj, {
+ name : naming,
+ x : x,
+ y : y,
+ height : height,
+ multiline : true,
+ width : width,
+ text : textforfield,
+ fontsize : fontsize,
+ fgcolor : fgcolor,
+ fontstyle : fontstyle
+ });
+ this.currentlayer.setTextEncoded(textforfield);
+ //Add Layer to global Layer
+ return this.currentlayer;
+ </method>
<method name="drawTextFieldregister"
args="textforfield,width,x,y,fontsize,fgcolor,fontstyle,height,swfObj,zIndex">
var actionObject = new Array();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
Fri Jul 1 05:21:36 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
Fri Sep 9 12:26:53 2011
@@ -92,7 +92,7 @@
currentlayer.lineTo(x2,y2);
currentlayer.lineTo(x2,y1);
currentlayer.lineTo (x1,y1);
- this.closePath();
+ currentlayer.closePath();
if (this.currentrectanglestrokeDis!=-1){
currentlayer.strokeStyle = this.currentrectanglestroke;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Sun Jun 26 09:21:48 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Fri Sep 9 12:26:53 2011
@@ -371,12 +371,18 @@
this.setContextMenu(newMenu);
</handler>
<handler name="ondblclick">
+
//Debug.write("ondblclick:
",this.parent.objRef.typeOfObject);
- if (this.parent.objRef.typeOfObject=="text"){
- var x =
this.parent.objRef.getAttributeRelative('x',canvas);
- var y =
this.parent.objRef.getAttributeRelative('y',canvas);
+ if (this.parent.objRef.typeOfObject == "text") {
+ var x = this.parent.objRef.x;
//this.parent.objRef.getAttributeRelative('x', canvas);
+ var y = this.parent.objRef.y;
//this.parent.objRef.getAttributeRelative('y', canvas);
//Debug.write("x,y ",x,y);
-
this.parent.whiteboardRef.editTextByValues(this.parent.objRef,this.parent.objRef.name,this.parent.objRef.text,x,y,this.parent.objRef.width,this.parent.objRef.height);
+ this.parent.whiteboardRef
+
.editTextByValues(this.parent.objRef,
+
this.parent.objRef.name,
+
this.parent.objRef.text, x, y,
+
this.parent.objRef.width,
+
this.parent.objRef.height);
}
</handler>
<!--
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
