Author: solomax
Date: Mon Feb 20 06:32:03 2017
New Revision: 1783716
URL: http://svn.apache.org/viewvc?rev=1783716&view=rev
Log:
[OPENMEETINGS-1565] element is not being duplicated for creator
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawLetter.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1783716&r1=1783715&r2=1783716&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
Mon Feb 20 06:32:03 2017
@@ -206,34 +206,33 @@
</method>
<method name="clearRemote">
- <![CDATA[
-
- if (this.boundingref!=null) this.boundingref.removeIt();
- while (this.subviews.length > 1) {
- this.subviews[1].prepareForDelete.sendEvent();
- this.subviews[1].destroy();
- }
- while (this.basdrawredoView.subviews.length > 0) {
- this.basdrawredoView.subviews[0].destroy();
- }
+ <![CDATA[
+ if (this.boundingref!=null) this.boundingref.removeIt();
+ while (this.subviews.length > 1) {
+ this.subviews[1].prepareForDelete.sendEvent();
+ this.subviews[1].destroy();
+ }
+ while (this.basdrawredoView.subviews.length > 0) {
+ this.basdrawredoView.subviews[0].destroy();
+ }
- this.setAttribute("x", 0);
- this.setAttribute("y", 0);
+ this.setAttribute("x", 0);
+ this.setAttribute("y", 0);
- this.getDisplayObject().scaleX = 1;
- this.getDisplayObject().scaleY = 1;
+ this.getDisplayObject().scaleX = 1;
+ this.getDisplayObject().scaleY = 1;
- this.onupdateScale.sendEvent(null);
+ this.onupdateScale.sendEvent(null);
- parent.parent.zoombox.setWhiteboardValues(true,100);
+ parent.parent.zoombox.setWhiteboardValues(true,100);
- this.layers = new Array();
- this.redolayers = new Array();
- this.baseactionobjectList = new Array();
- this.baseredoactionobjectList = new Array();
- this.checkStepLayers();
- this.clearDocumentsBar();
- ]]>
+ this.layers = new Array();
+ this.redolayers = new Array();
+ this.baseactionobjectList = new Array();
+ this.baseredoactionobjectList = new Array();
+ this.checkStepLayers();
+ this.clearDocumentsBar();
+ ]]>
</method>
<method name="doAction" args="modi">
@@ -488,14 +487,14 @@
undo/redo
-->
<method name="undoredo">
- <![CDATA[
+ <![CDATA[
if (this.baseactionobjectList.length>0){
if (this.boundingref!=null) this.boundingref.removeIt();
var lastActionObject = this.baseactionobjectList.pop();
this.deleteItemByNameSync(lastActionObject[lastActionObject.length-1]);
this.onsharedMessage('undo',lastActionObject);
}
- ]]>
+ ]]>
</method>
<method name="checkStepLayers">
@@ -925,8 +924,12 @@
-->
<method name="sendWatchObject" args="action,actionObject,isWmlLoader">
<![CDATA[
- if ($debug) Debug.write("sendWatchObject:
",action,actionObject);
if (action=='draw' || action=='redo'){
+ if ($debug) Debug.write("sendWatchObject: ", action,
actionObject);
+ if (!!actionObject &&
getBaseObjectByName(actionObject[actionObject.length - 1]) != null) {
+ if ($debug) Debug.write("Double adding new
Object, RETURN ");
+ return;
+ }
var lastactionObject = actionObject;
//Redraw the View on the paintarea
@@ -1051,10 +1054,10 @@
obj.setAttribute('height',lastactionObject[lastactionObject.length-2]);
this.updateBaseObjectByName(lastactionObject[lastactionObject.length-1],
-
lastactionObject[lastactionObject.length-5],
-
lastactionObject[lastactionObject.length-4],
-
lastactionObject[lastactionObject.length-3],
-
lastactionObject[lastactionObject.length-2]);
+
lastactionObject[lastactionObject.length-5],
+
lastactionObject[lastactionObject.length-4],
+
lastactionObject[lastactionObject.length-3],
+
lastactionObject[lastactionObject.length-2]);
//if ($debug) Debug.write("BaseObject List ??
",this.baseactionobjectList);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawLetter.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawLetter.lzx?rev=1783716&r1=1783715&r2=1783716&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawLetter.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawLetter.lzx
Mon Feb 20 06:32:03 2017
@@ -7,50 +7,45 @@
to you under the Apache License, Version 2.0 (the
"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
-
+
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
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<library>
-
+
<class name="whiteBoardTextField" extends="text" >
<handler name="prepareForDelete" args="tRef">
//Nothing
</handler>
<attribute name="typeOfObject" value="text" type="string" />
<method name="setTextEncoded" args="tString">
- <![CDATA[
-
- while (tString.indexOf("<") > 0) {
- tString = tString.replace("<","<");
- }
-
- while (tString.indexOf(">") > 0) {
- tString = tString.replace(">",">");
- }
-
- this.setAttribute("text",tString);
- ]]>
+ <![CDATA[
+ while (tString.indexOf("<") > 0) {
+ tString = tString.replace("<","<");
+ }
+
+ while (tString.indexOf(">") > 0) {
+ tString = tString.replace(">",">");
+ }
+
+ this.setAttribute("text",tString);
+ ]]>
</method>
</class>
<class name="baseDrawLetter" extends="baseDrawObject">
-
<attribute name="currentletterObj" value="null" />
-
<attribute name="letterObjectIsActive" value="false" type="boolean" />
-
<attribute name="edittextLetterObject" value="null" />
-
<attribute name="edittextLetter" value="false" type="boolean" />
-
+
<method name="letterObjectFree" args="obj">
this.setAttribute('letterObjectIsActive',false);
if (this.edittextLetter){
@@ -61,90 +56,89 @@
<method name="letterObjectClose" args="obj">
this.setAttribute('letterObjectIsActive',true);
</method>
-
- <!-- The Color of the letter Object -->
- <attribute name="currentlayerletter" value="0x000000"
setter="this.setNewLayerLetter(currentlayerletter)" />
-
- <!-- The Size of the Letter Object -->
- <attribute name="currentlayersize" value="12" type="number"
setter="this.setNewLayerSize(currentlayersize)" />
-
- <!-- "plain", "bold" , "italic" or "bolditalic". -->
- <attribute name="currentlayerstyle" value="plain" type="string"
setter="this.setNewLayerStyle(currentlayerstyle)" />
-
- <method name="setNewLayerLetter" args="cl">
- this.currentlayerletter=cl;
- this.sendNewStyle.sendEvent();
- </method>
-
- <method name="setNewLayerSize" args="cs">
- this.currentlayersize=cs;
- this.sendNewStyle.sendEvent();
- </method>
-
- <method name="setNewLayerStyle" args="cs">
- this.currentlayerstyle=cs;
- this.sendNewStyle.sendEvent();
- </method>
-
- <!-- Send Update Events to current Letter Object -->
- <handler name="sendNewStyle">
- if (this.letterObjectIsActive){
- this.currentletterObj.newStyleEvent.sendEvent()
- }
- </handler>
-
- <attribute name="italic" value="false" type="boolean"
setter="this.setitalic(italic)" />
- <attribute name="bold" value="false" type="boolean"
setter="this.setbold(bold)" />
- <method name="setitalic" args="b">
- this.italic = b;
- this.doalterStyle();
- </method>
- <method name="setbold" args="b">
- this.bold = b;
- this.doalterStyle();
- </method>
- <method name="doalterStyle">
- <![CDATA[
- if (this.isinited){
- if (this.bold && this.italic){
-
this.setAttribute('currentlayerstyle','bolditalic');
- } else if(!this.bold && this.italic){
- this.setAttribute('currentlayerstyle','italic');
- } else if(this.bold && !this.italic){
- this.setAttribute('currentlayerstyle','bold');
- } else if(!this.bold && !this.italic){
- this.setAttribute('currentlayerstyle','plain');
- }
- //Debug.write("d:
",this.getAttribute('currentlayerstyle'));
- }
- ]]>
- </method>
-
+
+ <!-- The Color of the letter Object -->
+ <attribute name="currentlayerletter" value="0x000000"
setter="this.setNewLayerLetter(currentlayerletter)" />
+
+ <!-- The Size of the Letter Object -->
+ <attribute name="currentlayersize" value="12" type="number"
setter="this.setNewLayerSize(currentlayersize)" />
+
+ <!-- "plain", "bold" , "italic" or "bolditalic". -->
+ <attribute name="currentlayerstyle" value="plain" type="string"
setter="this.setNewLayerStyle(currentlayerstyle)" />
+
+ <method name="setNewLayerLetter" args="cl">
+ this.currentlayerletter=cl;
+ this.sendNewStyle.sendEvent();
+ </method>
+
+ <method name="setNewLayerSize" args="cs">
+ this.currentlayersize=cs;
+ this.sendNewStyle.sendEvent();
+ </method>
+
+ <method name="setNewLayerStyle" args="cs">
+ this.currentlayerstyle=cs;
+ this.sendNewStyle.sendEvent();
+ </method>
+
+ <!-- Send Update Events to current Letter Object -->
+ <handler name="sendNewStyle">
+ if (this.letterObjectIsActive){
+ this.currentletterObj.newStyleEvent.sendEvent()
+ }
+ </handler>
+
+ <attribute name="italic" value="false" type="boolean"
setter="this.setitalic(italic)" />
+ <attribute name="bold" value="false" type="boolean"
setter="this.setbold(bold)" />
+ <method name="setitalic" args="b">
+ this.italic = b;
+ this.doalterStyle();
+ </method>
+ <method name="setbold" args="b">
+ this.bold = b;
+ this.doalterStyle();
+ </method>
+ <method name="doalterStyle">
+ <![CDATA[
+ if (this.isinited){
+ if (this.bold && this.italic){
+
this.setAttribute('currentlayerstyle','bolditalic');
+ } else if(!this.bold && this.italic){
+ this.setAttribute('currentlayerstyle','italic');
+ } else if(this.bold && !this.italic){
+ this.setAttribute('currentlayerstyle','bold');
+ } else if(!this.bold && !this.italic){
+ this.setAttribute('currentlayerstyle','plain');
+ }
+ //Debug.write("d:
",this.getAttribute('currentlayerstyle'));
+ }
+ ]]>
+ </method>
+
<method name="editTextByValues" args="obj,txtName,txt,x,y,width,height">
- <![CDATA[
- if (!this.letterObjectIsActive){
- //Debug.write("editTextByValues",height);
- this.edittextLetterObject = obj;
- 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>
-
+ <![CDATA[
+ if (!this.letterObjectIsActive){
+ //Debug.write("editTextByValues",height);
+ this.edittextLetterObject = obj;
+ 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>
+
<!-- editModus -->
<method name="setTextFieldByName"
args="txtName,textforfield,width,x,y,height" >
if ($debug) Debug.write("drawTextFieldByName
",txtName,textforfield,width,x,y);
@@ -160,95 +154,92 @@
this.updateObjectBounds();
this.updateByEditLetterObject();
//this.setModus('hand');
- </method>
-
+ </method>
+
<method name="startLetter" args="oid_name">
if (oid_name == null) {
oid_name = 'letterTemp'+this.getCounter();
- }
- this.currentlayer = new
lz.drawViewNew(this,{name:oid_name,width:this.width+2,height:this.height+2});
+ }
+ this.currentlayer = new
lz.drawViewNew(this,{name:oid_name,width:this.width+2,height:this.height+2});
</method>
-
+
<method name="drawletterBoundingBox" args="x1,y1,x2,y2">
- <![CDATA[
-
- currentlayer.lineWidth = 1;
- currentlayer.beginPath();
- currentlayer.moveTo(x1,y1);
- currentlayer.lineTo(x1,y2);
- currentlayer.lineTo(x2,y2);
- currentlayer.lineTo(x2,y1);
- currentlayer.lineTo (x1,y1);
- currentlayer.closePath();
-
- currentlayer.strokeStyle = 0x000000;
- currentlayer.stroke();
-
- ]]>
- </method>
-
+ <![CDATA[
+ currentlayer.lineWidth = 1;
+ currentlayer.beginPath();
+ currentlayer.moveTo(x1,y1);
+ currentlayer.lineTo(x1,y2);
+ currentlayer.lineTo(x2,y2);
+ currentlayer.lineTo(x2,y1);
+ currentlayer.lineTo (x1,y1);
+ currentlayer.closePath();
+
+ currentlayer.strokeStyle = 0x000000;
+ currentlayer.stroke();
+ ]]>
+ </method>
+
<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;
- }
+ <![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
- });
+ 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);
- ]]>
+ if ($debug) Debug.write("currentletterObj: ",
this.currentletterObj.x, this.currentletterObj.y);
+ ]]>
</method>
-
-
+
<method name="updateByEditLetterObject" >
- <![CDATA[
+ <![CDATA[
if ($debug) Debug.write("UpdateByObject :
",this.edittextLetterObject,this.edittextLetterObject.name);
var objName = this.edittextLetterObject.name;
for (var eg=0;eg<this.baseactionobjectList.length;eg++){
if
(this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-1]==objName)
{
if ($debug) Debug.write("Found Object:
",this.baseactionobjectList[eg]);
- this.baseactionobjectList[eg][1] =
this.edittextLetterObject.text;
- this.baseactionobjectList[eg][2] =
this.edittextLetterObject.fgcolor;
- this.baseactionobjectList[eg][3] =
this.edittextLetterObject.fontsize;
- this.baseactionobjectList[eg][4] =
this.edittextLetterObject.fontstyle;
+ this.baseactionobjectList[eg][1] =
this.edittextLetterObject.text;
+ this.baseactionobjectList[eg][2] =
this.edittextLetterObject.fgcolor;
+ this.baseactionobjectList[eg][3] =
this.edittextLetterObject.fontsize;
+ this.baseactionobjectList[eg][4] =
this.edittextLetterObject.fontstyle;
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-5] =
this.edittextLetterObject.x
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-4] =
this.edittextLetterObject.y;
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-3] =
this.edittextLetterObject.width;
this.baseactionobjectList[eg][this.baseactionobjectList[eg].length-2] =
this.edittextLetterObject.height;
var newA = this.baseactionobjectList[eg];
- if (newA[0]=='paint') newA[1] = new Array();
- this.onsharedMessage('editText',newA);
- break;
+ if (newA[0]=='paint') newA[1] = new Array();
+ this.onsharedMessage('editText',newA);
+ break;
}
- }
-
- ]]>
- </method>
-
+ }
+
+ ]]>
+ </method>
+
<method name="editTextByHistory" args="actionObject,obj">
var editObj =
this.getObjectByName(actionObject[actionObject.length-1]);
//Debug.write("editTextByHistory:
",editObj,actionObject,actionObject.length);
@@ -260,61 +251,60 @@
editObj.setAttribute('fgcolor',actionObject[2]);
editObj.setAttribute('fontstyle',actionObject[4]);
</method>
-
+
<method name="checkForChanges"
args="txtName,textforfield,width,x,y,height">
- <![CDATA[
- //Debug.write("checkForChanges: 1
",txtName,textforfield,width,x,y,height);
- //Debug.write("checkForChanges: 2
",this.edittextLetterObject.name,this.edittextLetterObject.text,this.edittextLetterObject.width,this.edittextLetterObject.x,this.edittextLetterObject.y,this.edittextLetterObject.height);
- //there is always a change
-
- ]]>
- </method>
-
+ <![CDATA[
+ //Debug.write("checkForChanges: 1
",txtName,textforfield,width,x,y,height);
+ //Debug.write("checkForChanges: 2
",this.edittextLetterObject.name,this.edittextLetterObject.text,this.edittextLetterObject.width,this.edittextLetterObject.x,this.edittextLetterObject.y,this.edittextLetterObject.height);
+ //there is always a change
+ ]]>
+ </method>
+
<method name="drawactionHistory" args="actionObject,obj">
this.newTextField(obj,actionObject[actionObject.length-1],actionObject[1],
-
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
-
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
- actionObject[3],actionObject[2],actionObject[4]);
-
+
actionObject[actionObject.length-3],actionObject[actionObject.length-2],
+
actionObject[actionObject.length-5],actionObject[actionObject.length-4],
+
actionObject[3],actionObject[2],actionObject[4]);
+
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();
- actionObject[0] = "letter";
- actionObject[1] = textforfield;
- actionObject[2] = fgcolor;
- actionObject[3] = fontsize;
- actionObject[4] = fontstyle;
- actionObject[5] = zIndex;//-8
- actionObject[6] = swfObj;//-7
+ actionObject[0] = "letter";
+ actionObject[1] = textforfield;
+ actionObject[2] = fgcolor;
+ actionObject[3] = fontsize;
+ actionObject[4] = fontstyle;
+ actionObject[5] = zIndex;//-8
+ actionObject[6] = swfObj;//-7
actionObject[7] = this.counter;//-6
- actionObject[8] = x;//-5
- actionObject[9] = y;//-4
- actionObject[10] = width;//-3
- actionObject[11] = height;//-2
- actionObject[12] = this.currentlayer.name;//-1
- this.baseactionobjectList.push(actionObject);
- this.checkStepLayers();
- this.onsharedMessage('draw',actionObject);
+ actionObject[8] = x;//-5
+ actionObject[9] = y;//-4
+ actionObject[10] = width;//-3
+ actionObject[11] = height;//-2
+ actionObject[12] = this.currentlayer.name;//-1
+ this.baseactionobjectList.push(actionObject);
+ this.checkStepLayers();
+ this.onsharedMessage('draw',actionObject);
</method>
</class>
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=1783716&r1=1783715&r2=1783716&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
Mon Feb 20 06:32:03 2017
@@ -7,16 +7,16 @@
to you under the Apache License, Version 2.0 (the
"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
-
+
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
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<library>
<include href="utils/states/resizestatemin.lzx"/>
@@ -24,37 +24,37 @@
<!--
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"
- width="24" height="24" resource="bounding_item_rsc">
-
+
+<class name="boundingBoxAllRotationMarger" extends="view"
+ width="24" height="24" resource="bounding_item_rsc">
+
<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();
@@ -66,18 +66,12 @@
parent.endDrawClipArtDrag();
lz.Cursor.unlock();
</handler>
-
- <dragstate name="dragger" />
-
-</class>
-
+
+ <dragstate name="dragger" />
+
+</class>
+
<class name="boundingBoxAll" extends="view" focusable="true">
-
-<!--
- <method name="removeIt">
- canvas._drawarea.setAttribute('boundingIsActive',true);
- </method>
- -->
<method name="removeIt">
//Debug.write("removeIt +**********",this.isinited);
this.whiteboardRef.setAttribute('boundingIsActive',false);
@@ -90,22 +84,22 @@
<attribute name="ey" value="0" type="number" />
<attribute name="ewidth" value="0" type="number" />
<attribute name="eheight" value="0" type="number" />
-
+
<attribute name="innerInsetScrollbars" value="0" type="number"/>
-
+
<attribute name="startdragX" value="0" type="number" />
<attribute name="startdragY" value="0" type="number" />
<attribute name="startdragWidth" value="0" type="number" />
<attribute name="startdragHeight" value="0" type="number" />
-
+
<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="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"/>
@@ -113,41 +107,41 @@
<!--- 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);
//Debug.write("__LZRemoveItem");
</method>
-
+
<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");
}
-
+
this.setAttribute('x',this.ex);
this.setAttribute('y',this.ey);
this.setAttribute('width',this.ewidth);
- this.setAttribute('height',this.eheight);
- this.setStartValues();
+ this.setAttribute('height',this.eheight);
+ this.setStartValues();
if ($debug) Debug.write("Update Property Panel Settings
to Object Properties ",this.objRef.name);
-
- lz.Focus.setFocus(this, false);
-
+
+ lz.Focus.setFocus(this, false);
+
if (this.objRef.typeOfObject == "text") {
this._editText.setAttribute("visibility","visible");
}
-
+
//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);
if (this.objRef._innerRect.strokeStyle ==
'#000000') {
if ($debug) Debug.write("strokeStyle
EMPTY ");
@@ -156,7 +150,7 @@
this.whiteboardRef.currentrectanglestroke = this.objRef._innerRect.strokeStyle;
this.whiteboardRef.currentrectanglestrokeDis = 1;
}
-
+
if ($debug) Debug.write("fillStyle:
",this.objRef._innerRect.fillStyle);
if (this.objRef._innerRect.fillStyle ==
'#000000') {
if ($debug) Debug.write("fillStyle
EMPTY ");
@@ -165,44 +159,44 @@
this.whiteboardRef.currentrectanglestrokeFill =
this.objRef._innerRect.fillStyle;
this.whiteboardRef.currentrectanglestrokeFillDis = 1;
}
-
+
if ($debug) Debug.write("lineWidth:
",this.objRef._innerRect.lineWidth);
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
- });
-
+
x:this.objRef.clipart.clipArtEndx-12,
+
y:this.objRef.clipart.clipArtEndy-12
+ });
+
}
-
-
+
+
this.whiteboardRef._propPanel.loadPanelByBoundingBox(this.whiteboardRef,this.objRef);
-
+
this.doUpdateAction();
]]>
</handler>
-
+
<method name="doStartDragPoint">
this.whiteboardRef.setStartPoint(this.objRef.clipart.x+this.x,this.objRef.clipart.y+this.y);
</method>
-
+
<method name="doMoveDragPoint" args="x,y">
this.whiteboardRef.trackDrawClipArtDraw(this.x+x,this.y+y,this.objRef.clipart);
</method>
-
+
<method name="endDrawClipArtDrag">
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
@@ -219,12 +213,12 @@
this.ex = this.objRef.x;
this.ey = this.objRef.y;
this.ewidth = this.objRef.width;
- this.eheight = this.objRef.height;
+ this.eheight = this.objRef.height;
this.setAttribute('x',this.objRef.x);
this.setAttribute('y',this.objRef.y);
this.setAttribute('width',this.objRef.width);
- this.setAttribute('height',this.objRef.height);
- this.setStartValues();
+ this.setAttribute('height',this.objRef.height);
+ this.setStartValues();
</method>
<method name="doUpdateAction" >
@@ -233,43 +227,43 @@
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){
+
+ 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){
+
+ 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>
@@ -282,7 +276,7 @@
if (key == 46) {
this.__LZRemoveItem(this.objRef);
} else if (key == 40) {
- var shiftPressed = lz.Keys.isKeyDown("shift");
+ var shiftPressed = lz.Keys.isKeyDown("shift");
if ($debug) Debug.write("shiftPressed ",shiftPressed);
this.doHandlerUpdates = true;
this.setAttribute("y",this.y+(shiftPressed ? 20 : 2));
@@ -290,21 +284,21 @@
this.objRef.parent.UpdateByObject(this.objRef);
this.setStartValues();
} else if (key == 38) {
- var shiftPressed = lz.Keys.isKeyDown("shift");
+ 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");
+ 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");
+ var shiftPressed = lz.Keys.isKeyDown("shift");
this.doHandlerUpdates = true;
this.setAttribute("x",this.x-(shiftPressed ? 20 : 2));
this.doHandlerUpdates = false;
@@ -321,7 +315,7 @@
</method>
<method name="_applyResizestateFromThis">
- lz.Focus.setFocus(this, true);
+ lz.Focus.setFocus(this, true);
if ($debug) Debug.write("Apply resize State");
if (!this.canBeResized) {
return;
@@ -336,7 +330,7 @@
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");
this.objRef.parent.UpdateByObject(this.objRef);
@@ -347,7 +341,7 @@
</method>
<method name="_applyDragstateFromThis">
- lz.Focus.setFocus(this, true);
+ lz.Focus.setFocus(this, true);
if (!this.canBeDragged) {
return;
}
@@ -361,7 +355,7 @@
return;
}
this.dragger.remove();
-
+
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);
@@ -377,15 +371,15 @@
</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);
- }
+ <![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">
@@ -402,14 +396,14 @@
</resizestatemin>
<dragstate name="dragger">
- <text x="2" y="2" text="${ 'x:
'+parent.getAttributeRelative('x',parent.objRef)+' y:
'+parent.getAttributeRelative('y',parent.objRef) }" bgcolor="white"/>
+ <text x="2" y="2" text="${ 'x:
'+parent.getAttributeRelative('x',parent.objRef)+' y:
'+parent.getAttributeRelative('y',parent.objRef) }" bgcolor="white"/>
</dragstate>
- <view name="_innerDrag" width="${
parent.width-parent.innerInsetScrollbars }"
- height="${ parent.height-parent.innerInsetScrollbars }"
- onmouseover="parent.applyScrollbarToObject()"
+ <view name="_innerDrag" width="${
parent.width-parent.innerInsetScrollbars }"
+ height="${ parent.height-parent.innerInsetScrollbars }"
+ onmouseover="parent.applyScrollbarToObject()"
onmouseout="parent.removeScrollbarToObject()"
- onmousedown="parent._applyDragstateFromThis()"
+ onmousedown="parent._applyDragstateFromThis()"
onmouseup="parent._removeDragstateFromThis()">
<contextmenu>
@@ -430,7 +424,7 @@
this.parent.objRef.width,
this.parent.objRef.height);
}
- </handler>
+ </handler>
<handler name="onmouseover">
if (this.parent.objRef.typeOfObject != "swf") {
@@ -449,8 +443,8 @@
this.parent.whiteboardRef
.editTextByValues(this.parent.objRef,
this.parent.objRef.name,
-
this.parent.objRef.text,
- this.parent.x,
+
this.parent.objRef.text,
+ this.parent.x,
this.parent.y,
this.parent.objRef.width,
this.parent.objRef.height);
@@ -489,7 +483,7 @@
<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 }"
+ 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");
@@ -499,7 +493,7 @@
</handler>
<labelTooltip labelid="252" />
</view>
- <view name="_gripperNoResize" visibility="hidden"
+ <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>
