Author: sebawagner
Date: Thu Apr 12 09:05:46 2012
New Revision: 1325163
URL: http://svn.apache.org/viewvc?rev=1325163&view=rev
Log:
OPENMEETINGS-156 3. in the room, when you add a file, it does not appear to the
list of "my files" unless click the arrow and expand it again
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1325163&r1=1325162&r2=1325163&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Thu Apr 12 09:05:46 2012
@@ -135,7 +135,7 @@
fileExplorerItem.fileHash,"videoconf1","/","files",hib.conferencedomain);
}
}
-
+
if (parent.isdefaultreturn) {
var tempSendArray = new Array ();
@@ -146,17 +146,19 @@
//Debug.write("Setting Message");
tempSendArray[2] = 'newfile';
tempSendArray[3] = canvas.currentusename;
- //Debug.write("send: ",tempSendArray);
+ //if ($debug) Debug.write("send: ",tempSendArray);
canvas.objMessage = tempSendArray;
- canvas.thishib.sendMessage.doCall();
+ canvas.thishib.sendMessageAll.doCall();
} else {
parent.returnObj.sendRefresh();
}
- this.parent.close();
+
if (parent.fileExplorerRef != null) {
parent.fileExplorerRef.onClose.sendEvent();
}
+
+ parent.close();
</method>
<method name="onProgress" args="fr, bytesLoaded, bytesTotal">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1325163&r1=1325162&r2=1325163&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Apr 12 09:05:46 2012
@@ -1478,6 +1478,17 @@
]]>
</handler>
</netRemoteCallHib>
+
+ <netRemoteCallHib name="sendMessageAll" funcname="sendMessageAll">
+ <netparam name="vars"><method name="getValue">return
canvas.objMessage;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ //Debug.write("getValue : ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
<netRemoteCallHib name="sendVarsToMessage"
funcname="sendVarsToMessage">
<handler name="ondata" args="value">
<![CDATA[
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1325163&r1=1325162&r2=1325163&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
Thu Apr 12 09:05:46 2012
@@ -37,9 +37,8 @@
lz.Track.register(this._trashBar._trashIcon,
canvas.currentImagesListdraw.currentTrackGroupName);
</handler>
-
-
<handler name="onvisible">
+ if ($debug) Debug.write("fileExplorer::onvisible this._selected
",this._selected);
//This is thrown whenever an uploaded Document has completed
if (this._selected == null) {
this.loadFiles();
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1325163&r1=1325162&r2=1325163&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Thu Apr 12 09:05:46 2012
@@ -2226,6 +2226,17 @@ public class ScopeApplicationAdapter ext
}
return 1;
}
+
+ public synchronized int sendMessageAll(Object newMessage) {
+ try {
+
+ syncMessageToCurrentScope("sendVarsToMessage",
newMessage, true);
+
+ } catch (Exception err) {
+ log.error("[sendMessage]", err);
+ }
+ return 1;
+ }
/**
* send status for shared browsing to all members except self
