Author: sebawagner
Date: Wed May 16 18:02:34 2012
New Revision: 1339288
URL: http://svn.apache.org/viewvc?rev=1339288&view=rev
Log:
OPENMEETINGS-271 Whiteboad Undo tool does not remove all objects from the
Whiteboard
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDraw.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1339288&r1=1339287&r2=1339288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
Wed May 16 18:02:34 2012
@@ -62,7 +62,7 @@
}
</method>
- <method name="showText">
+ <method name="showText" args="refObj">
if (this.doBlink) {
if ($debug)
Debug.write("showText",this._newMessage.opacity);
lz.Timer.addTimer( this.fadeDelegate , 1000 );
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=1339288&r1=1339287&r2=1339288&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
Wed May 16 18:02:34 2012
@@ -486,6 +486,8 @@
}
}
+ if ($debug) Debug.write("deleteItemByNameSync Found Object:
",eg);
+
var newA = this.baseactionobjectList[pos];
for (var eg=0;eg<this.baseactionobjectList.length;eg++){
@@ -553,81 +555,13 @@
<!-- ##############
undo/redo
-->
- <method name="doredo">
- //Debug.write("redo");
- <![CDATA[
- if (this.redolayers.length>0){
- if (this.boundingref!=null) this.boundingref.removeIt();
- var lastelement = this.redolayers.pop();
- var lastActionObject =
this.baseredoactionobjectList.pop();
- //Debug.write(lastActionObject);
- //Redraw the View on the paintarea
- if (lastActionObject[0]=='paint'){
-
this.paintactionHistory(lastActionObject,this);lineactionHistory
- } else if (lastActionObject[0]=='line'){
- this.lineactionHistory(lastActionObject,this);
- } else if (lastActionObject[0]=='uline'){
- this.ulineactionHistory(lastActionObject,this);
- } else if (lastActionObject[0]=='drawarrow'){
-
this.drawarrowlineactionHistory(lastActionObject,this);
- } else if(lastActionObject[0]=='letter'){
- this.drawactionHistory(lastActionObject,this);
- } else if(lastActionObject[0]=='image'){
-
this.addImageToLayerHistory(lastActionObject,this,false);
- } else if(lastActionObject[0]=='swf'){
-
this.addSWFToLayerHistory(lastActionObject,this,false);
- } else if(lastActionObject[0]=='rectangle'){
-
this.drawrectangleToHistory(lastActionObject,this);
- } else if(lastActionObject[0]=='ellipse'){
-
this.drawellipseToHistory(lastActionObject,this);
- }
- //Push to redolayers,ObjectList
- this.layers.push(this.currentlayer);
- this.baseactionobjectList.push(lastActionObject);
- //Remove this View
- lastelement.prepareForDelete.sendEvent();
- lastelement.destroy();
- this.checkStepLayers();
- this.onsharedMessage('redo',lastActionObject);
- }
- ]]>
- </method>
<method name="undoredo">
<![CDATA[
- if (this.layers.length>0){
+ if (this.baseactionobjectList.length>0){
if (this.boundingref!=null) this.boundingref.removeIt();
- var lastelement = this.layers.pop();
var lastActionObject = this.baseactionobjectList.pop();
- //Debug.write(lastActionObject);
- //Redraw the View on the Invisible paintarea
- if (lastActionObject[0]=='paint'){
- //Debug.write("Undo Paint: ",lastActionObject);
-
this.paintactionHistory(lastActionObject,this.basdrawredoView);
- } else if (lastActionObject[0]=='line'){
-
this.lineactionHistory(lastActionObject,this.basdrawredoView);
- } else if (lastActionObject[0]=='uline'){
-
this.ulineactionHistory(lastActionObject,this.basdrawredoView);
- } else if (lastActionObject[0]=='drawarrow'){
-
this.drawarrowlineactionHistory(lastActionObject,this.basdrawredoView);
- } else if(lastActionObject[0]=='letter'){
-
this.drawactionHistory(lastActionObject,this.basdrawredoView);
- } else if(lastActionObject[0]=='image'){
-
this.addImageToLayerHistory(lastActionObject,this.basdrawredoView,false);
- } else if(lastActionObject[0]=='swf'){
-
this.addSWFToLayerHistory(lastActionObject,this.basdrawredoView,false);
- } else if(lastActionObject[0]=='rectangle'){
-
this.drawrectangleToHistory(lastActionObject,this.basdrawredoView);
- } else if(lastActionObject[0]=='ellipse'){
-
this.drawellipseToHistory(lastActionObject,this.basdrawredoView);
- }
- //Push to redolayers,redoObjectList
- this.redolayers.push(this.currentlayer);
- this.baseredoactionobjectList.push(lastActionObject);
- //Remove this View
- lastelement.prepareForDelete.sendEvent();
- lastelement.destroy();
- this.checkStepLayers();
+
this.deleteItemByNameSync(lastActionObject[lastActionObject.length-1]);
this.onsharedMessage('undo',lastActionObject);
}
]]>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1339288&r1=1339287&r2=1339288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Wed May 16 18:02:34 2012
@@ -302,9 +302,12 @@
<handler name="onwidth" args="newSub">
parent.addNewItemButton.updatePosition();
</handler>
+
+ <!--
<handler name="oninit">
this.currentBtn = this._button1;
</handler>
+ -->
<!--
<whiteboardMiniButton name="_button1" isactive="true">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx?rev=1339288&r1=1339287&r2=1339288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
Wed May 16 18:02:34 2012
@@ -35,9 +35,6 @@
<attribute name="modi" value="" type="string"/>
</mainToolsHPanelSeperator>
<redoUndoToolsPanelItem name="revert" doredo="false" labelid="70"
resourceItem="revert" />
- <!--
- <redoUndoToolsPanelItem name="next" doredo="true" labelid="71"
resourceItem="next" />
- -->
<mainToolsHPanelSeperator>
<attribute name="modi" value="" type="string"/>
</mainToolsHPanelSeperator>
@@ -102,9 +99,6 @@
<attribute name="modi" value="" type="string"/>
</mainToolsVPanelSeperator>
<redoUndoToolsPanelItem name="revert" doredo="false" labelid="70"
resourceItem="revert" />
- <!--
- <redoUndoToolsPanelItem name="next" doredo="true" labelid="71"
resourceItem="next" />
- -->
<mainToolsVPanelSeperator>
<attribute name="modi" value="" type="string"/>
</mainToolsVPanelSeperator>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1339288&r1=1339287&r2=1339288&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
Wed May 16 18:02:34 2012
@@ -169,7 +169,6 @@
<labelText y="60" labelid="377" x="140" width="180" fgcolor="0x0000CC">
<handler name="oninit">
<![CDATA[
- if($debug)
Debug.write("dashboard/getNumberUnreadMessages: ",value);
this.setAttribute("text","<u>..."+canvas.getLabelName(377)+"</u>");
]]>
</handler>
