Author: sebawagner
Date: Tue Apr 3 17:00:08 2012
New Revision: 1309038
URL: http://svn.apache.org/viewvc?rev=1309038&view=rev
Log:
OPENMEETINGS-128 More cleaned up folders
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/menu/chooseDrawAreaObjectCombobox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/baseToolbarMenu.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/documentMenu.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/documentToolsPalette.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/paintMenu.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/paintToolsPalette.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/resources/colorize.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/resources/kpaint.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/resources/kpdf.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/toolbar/toolbarTabList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/chooseDrawAreaObjectWindow.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/loadWhiteboardWindow.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx?rev=1309038&r1=1309037&r2=1309038&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
Tue Apr 3 17:00:08 2012
@@ -661,12 +661,10 @@
if ($debug) Debug.write("onmousedownMethod this.drawmodus:
",this.drawmodus);
- if(this.selectedObjects.length > 0){
+ if(this.selectedObjects != null && this.selectedObjects.length
> 0){
for (var eg=0;eg<this.selectedObjects.length;eg++){
-
var objectToUpdate =
this.getObjectByName(this.selectedObjects[eg][this.selectedObjects[eg].length-1]);
objectToUpdate.setAttribute('opacity', 1);
-
}
}
@@ -952,16 +950,13 @@
////Debug.write("doSetHandBodus: ");
var objList =
this.getObjectInBounds(this.getMouse('x'),this.getMouse('y'));
if(objList.length==1){
-
//this.parent.canvas._drawareaobjectcombobox.preselectedName=objList[0][objList[0].length-1];
this.setAttribute('drawmodus','pointer');
////Debug.write(objList[0][objList[0].length-1]);
this.doShowObjectBounds(objList[0][objList[0].length-1]);
} else if (objList.length>1){
-
//this.parent.canvas._drawareaobjectcombobox.preselectedName=objList[objList.length-1][objList[objList.length-1].length-1];
this.setAttribute('drawmodus','pointer');
////Debug.write(objList[objList.length-1][objList[objList.length-1].length-1]);
this.doShowObjectBounds(objList[objList.length-1][objList[objList.length-1].length-1]);
- //new
lz.chooseDrawAreaObjectWindow(canvas,{x:300,y:200,refObj:this,listV:objList});
} else {
this.startSelect(null);
this.startx = currentlayer.getMouse('x');
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx?rev=1309038&r1=1309037&r2=1309038&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Tue Apr 3 17:00:08 2012
@@ -308,7 +308,6 @@
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);
-
//this.whiteboardRef.parent.canvas._drawareaalterposition.updateVal(this.objRef.name);
this.setStartValues();
}
if (parent.onBoundingBox) parent.onBoundingBox.sendEvent(this);
@@ -329,13 +328,11 @@
if (!this.canBeDragged) {
return;
}
- ////Debug.write("onmouseup invoke");
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);
-
//this.whiteboardRef.parent.canvas._drawareaalterposition.updateVal(this.objRef.name);
this.setStartValues();
}
if (parent.onBoundingBox) parent.onBoundingBox.sendEvent(this);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx?rev=1309038&r1=1309037&r2=1309038&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
Tue Apr 3 17:00:08 2012
@@ -83,10 +83,8 @@
<include href="incubator/lzcombobox.lzx"/>
<include href="base/" />
- <include href="menu/" />
<include href="windows/" />
<include href="helper/" />
- <include href="toolbar/" />
<include href="panels/" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx?rev=1309038&r1=1309037&r2=1309038&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
Tue Apr 3 17:00:08 2012
@@ -394,27 +394,12 @@
</method>
- <simplelayout axis="y" spacing="2" xinset="2" />
+ <simplelayout axis="y" spacing="2" inset="2" />
</view>
<om_vscrollbar />
</view>
- <!--
- <simpleLabelButton labelid="1072" width="150" x="4" y="$once{
parent.height-22 }">
- <handler name="onclick">
- if ($debug) Debug.write("Upload More");
- </handler>
- </simpleLabelButton>
-
- <simpleLabelButton labelid="1073" width="120" x="158" y="$once{
parent.height-22 }">
- <handler name="onclick">
- if ($debug) Debug.write("Upload More");
- parent.chooseSelect();
- </handler>
- </simpleLabelButton>
- -->
-
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/library.lzx?rev=1309038&r1=1309037&r2=1309038&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/library.lzx
Tue Apr 3 17:00:08 2012
@@ -20,7 +20,6 @@
-->
<library>
- <include href="chooseDrawAreaObjectWindow.lzx" />
<include href="saveAsWmlWindow.lzx" />
<include href="loadWhiteboardWindow.lzx" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/loadWhiteboardWindow.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/loadWhiteboardWindow.lzx?rev=1309038&r1=1309037&r2=1309038&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/loadWhiteboardWindow.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/windows/loadWhiteboardWindow.lzx
Tue Apr 3 17:00:08 2012
@@ -40,28 +40,4 @@
</class>
-<!--
-<class name="loadWhiteboardWindow" extends="labelExplorerBox" labelid="205"
- docking="true" width="260" x="$once{ parent.width/2 - this.width/2 }"
y="200" height="100">
-
- <attribute name="refObj" value="null" />
-
- <handler name="oninit">
- lz.ModeManager.makeModal(this);
- </handler>
-
- <handler name="onclose">
- lz.ModeManager.release(this);
- </handler>
-
- <method name="setMessage" args="mess">
- this._loadMessage.setAttribute('text',mess);
- </method>
-
- <labelText y="22" name="_loadMessage" multiline="true"
- width="250" x="5" resize="false" />
-
-</class>
- -->
-
</library>
