You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/25 04:35:08 UTC
svn commit: r1788643 - in /openmeetings/application/trunk:
openmeetings-server/pom.xml
openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
pom.xml
Author: solomax
Date: Sat Mar 25 04:35:08 2017
New Revision: 1788643
URL: http://svn.apache.org/viewvc?rev=1788643&view=rev
Log:
[OPENMEETINGS-980] red5 version is updated
Modified:
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1788643&r1=1788642&r2=1788643&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Sat Mar 25 04:35:08 2017
@@ -117,7 +117,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
- <missing>red5-server/red5-server-1.0.9-M4.tar.gz</missing> <!-- TODO should be in-sync with global property -->
+ <missing>red5-server/red5-server-1.0.9-M6.tar.gz</missing> <!-- TODO should be in-sync with global property -->
</file>
</activation>
<build>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js?rev=1788643&r1=1788642&r2=1788643&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js Sat Mar 25 04:35:08 2017
@@ -565,6 +565,31 @@ var Wb = function() {
});
}
+ //events
+ var objAddedHandler = function (e) {
+ var obj = e.target;
+ console.log('Object Added', obj);
+ };
+ var objModifiedHandler = function (e) {
+ var obj = e.target;
+ console.log('Object Modified', obj);
+ };
+ var objRemovedHandler = function (e) {
+ var obj = e.target;
+ console.log('Object Removed', obj);
+ };
+ var pathCreatedHandler = function (e) {
+ var obj = e.target;
+ console.log('Path Created', obj);
+ };
+ var textEditedHandler = function (e) {
+ var obj = e.target;
+ console.log('Text Edit Exit', obj);
+ };
+ var textChangedHandler = function (e) {
+ var obj = e.target;
+ console.log('Text Changed', obj);
+ };
return {
init: function(_wbId, tid) {
wbId = _wbId;
@@ -572,6 +597,13 @@ var Wb = function() {
t = a.find('.tools'), c = a.find('canvas'), s = a.find(".wb-settings");
c.attr('id', 'can-' + tid);
canvas = new fabric.Canvas(c.attr('id'));
+ //TODO create via WS canvas:cleared
+ canvas.on('object:added', objAddedHandler);
+ canvas.on('object:modified', objModifiedHandler);
+ canvas.on('object:removed', objRemovedHandler);
+ canvas.on('path:created', pathCreatedHandler);
+ canvas.on('text:editing:exited', textEditedHandler);
+ canvas.on('text:changed', textChangedHandler);
internalInit(t);
setRoomSizes();
}
Modified: openmeetings/application/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1788643&r1=1788642&r2=1788643&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Sat Mar 25 04:35:08 2017
@@ -43,8 +43,8 @@
<wicket.version>8.0.0-SNAPSHOT</wicket.version>
<wicketju.version>8.0.0-M4.1</wicketju.version>
<wickets.version>8.0.0-SNAPSHOT</wickets.version>
- <red5-server.version>1.0.9-M4</red5-server.version>
- <red5-client.version>1.0.9-M4</red5-client.version>
+ <red5-server.version>1.0.9-M6</red5-server.version>
+ <red5-client.version>1.0.9-M6</red5-client.version>
<spring.version>4.3.6.RELEASE</spring.version>
<mina.version>2.0.16</mina.version>
<tomcat.version>8.5.11</tomcat.version>