Revision: 2833
Author: seba.wagner
Date: Tue Jan 26 07:08:58 2010
Log: Fixes Scrollbars not clickable in Whiteboard for Documents
http://code.google.com/p/openmeetings/source/detail?r=2833
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/messageRecordingWin.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Fri Nov 27 07:11:08 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Tue Jan 26 07:08:58 2010
@@ -12,8 +12,7 @@
-->
<class name="boundingBoxAll" extends="view"
- onmouseover="this.applyScrollbarToObject()"
- onmouseout="this.removeScrollbarToObject()" >
+ >
<!--
<method name="removeIt">
@@ -33,6 +32,8 @@
<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" />
@@ -62,7 +63,7 @@
<![CDATA[
if (!this.boundingDoUpdateOnInit) {
if ($debug) Debug.write("DESTROY the clickable view");
- this._innerDrag.destroy();
+ //this._innerDrag.destroy();
}
this.setAttribute('x',this.ex);
@@ -97,7 +98,9 @@
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);
+ }
this.whiteboardRef.parent.parent._propertyPanel.loadPanelByBoundingBox(this.whiteboardRef,this.objRef);
@@ -268,8 +271,12 @@
<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 }" height="${
parent.height }"
- onmousedown="parent._applyDragstateFromThis()"
onmouseup="parent._removeDragstateFromThis()">
+ <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()">
<handler name="oninit">
var newMenu = new LzContextMenu();
newMenu.hideBuiltInItems();
@@ -304,7 +311,8 @@
</view>
-->
- <baseChooseIcon resourceN="deleteIcon" x="${ parent.width-this.width }"
y="0" labelid="80" width="22" height="22">
+ <baseChooseIcon resourceN="deleteIcon" y="0" labelid="80" width="22"
height="22"
+ x="${
parent.width-this.width-parent.innerInsetScrollbars }" >
<handler name="onclick">
//Debug.write("this.parent.objRef.name:
",this.parent.objRef.name);
this.parent.whiteboardRef.deleteItemByName(this.parent.objRef.name);
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Tue Jan 26 05:46:46 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Tue Jan 26 07:08:58 2010
@@ -96,7 +96,7 @@
} else {
- new
lz.labelerrorPopup(canvas,{errorlabelid:887});
+ new
lz.labelerrorPopup(canvas,{errorlabelid:888});
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
Sun Jan 17 07:43:00 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/lzRecordNavigation.lzx
Tue Jan 26 07:08:58 2010
@@ -366,7 +366,7 @@
<labelText name="_flvRoom" y="60" x="80" />
<simpleLabelButton y="100" align="right" text_padding_x="40"
- height="26" width="$once{ parent.width / 2
}" labelid="867">
+ height="26" width="$once{ parent.width / 2
}" labelid="884">
<view resource="flv_download_rsc" x="4" y="2" />
<handler name="onclick">
<![CDATA[
@@ -391,7 +391,7 @@
<simpleLabelButton y="100" align="left" text_padding_x="40"
- height="26" width="$once{ parent.width / 2
}" labelid="867">
+ height="26" width="$once{ parent.width / 2
}" labelid="883">
<view resource="flv_download_rsc" x="4" y="2" />
<handler name="onclick">
<![CDATA[
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/messageRecordingWin.lzx
Tue Jan 26 05:46:46 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzrecordcontent/messageRecordingWin.lzx
Tue Jan 26 07:08:58 2010
@@ -14,7 +14,7 @@
<view x="2" width="${ parent.width - 4 }" clip="true"
y="48" height="$once{ parent.height-74
}">
- <labelText text="$once{ parent.parent.error }" width="${
parent.width - 14 }"
+ <labelText text="$once{ parent.parent.error }" width="${
parent.width - 18 }"
multiline="true" resize="false" selectable="true" />
<vscrollbar />
</view>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Jan 5 07:43:24 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/FlvRecordingDaoImpl.java
Tue Jan 26 07:08:58 2010
@@ -44,6 +44,9 @@
query.setLong("flvRecordingId", flvRecordingId);
FlvRecording flvRecording = (FlvRecording)
query.uniqueResult();
+
+ session.refresh(flvRecording);
+
tx.commit();
HibernateUtil.closeSession(idf);
--
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.
