Author: solomax
Date: Fri Aug 12 12:16:13 2016
New Revision: 1756174
URL: http://svn.apache.org/viewvc?rev=1756174&view=rev
Log:
[OPENMEETINGS-1408] labels are transfered to the app
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
Fri Aug 12 12:16:13 2016
@@ -8,8 +8,8 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
+ http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -38,9 +38,9 @@
<method name="getColorForUser">
<![CDATA[
- var colorArray =
[0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
+ var colorArray =
[0x92E8A4,0xC2F1FF,0xFFFCAE,0xE8C792,0xFF8073,
0xE8DB87,0xAFFFB8,0xBED4FF,0xE0BBE8,0xFFBBA5];
- return colorArray[Math.round(Math.random()*10)];
+ return colorArray[Math.round(Math.random()*10)];
]]>
</method>
@@ -58,20 +58,20 @@
</method>
<method name="getHttpHost">
- <![CDATA[
+ <![CDATA[
if (canvas.httphostlocal != null && canvas.httphostlocal.length
> 0) {
return canvas.httphostlocal;
}
return canvas.rtmphostlocal;
]]>
</method>
-
+
<method name="getUrl">
<![CDATA[
return canvas.protocol + '://' + getHttpHost() + ':' +
canvas.red5httpport + canvas.httpRootKey;
]]>
</method>
-
+
<method name="getServicesUrl">
<![CDATA[
return getUrl() + 'services/';
@@ -100,7 +100,7 @@
//Set Config-values by public/config.xml, see comments on
public/config.xml
if (!canvas.isCluster) {
this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));
- }
+ }
this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));
this.setAttribute('rtmpsslport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()')));
@@ -211,6 +211,15 @@
canvas.myinit();
} else {
canvas.showWindowEffect = 'n';
+ var params:Object =
getDisplayObject().loaderInfo.parameters;
+ if ($debug) Debug.info("###################### -3 ",
params);
+ if ($debug) Debug.info("###################### -3 ",
params.labels);
+ if (params && params.labels) {
+ if ($debug) Debug.info("######################
-3 ", JSON);
+ var lbls = JSON.parse(params.labels);
+ if ($debug) Debug.info("######################
-3 ", lbls);
+ setLabelObjectByHundred(0, lbls);
+ }
new lz.editRecordStreamSWF10(canvas.main_content,{
allowDragging: false,
dropShadow: false,
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Fri Aug 12 12:16:13 2016
@@ -346,7 +346,7 @@ public class RoomPanel extends BasePanel
}
super.onEvent(event);
}
-
+
@Override
protected void onBeforeRender() {
super.onBeforeRender();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
Fri Aug 12 12:16:13 2016
@@ -36,10 +36,13 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.entity.server.SOAPLogin;
import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.json.JSONArray;
+import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -50,6 +53,7 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -98,8 +102,7 @@ public class SwfPanel extends BasePanel
if (roomId != null) {
spp.mergeWith(new PageParameters().add(WICKET_ROOM_ID,
roomId));
}
- String swf = getFlashFile(pp.get("swf")) + new
PageParametersEncoder().encodePageParameters(spp);
- add(new Label("init", String.format("initSwf('%s');",
swf)).setEscapeModelStrings(false));
+ add(new Label("init",
getInitFunction(spp)).setEscapeModelStrings(false));
add(new AbstractAjaxTimerBehavior(Duration.minutes(5)) {
private static final long serialVersionUID = 1L;
@@ -127,6 +130,18 @@ public class SwfPanel extends BasePanel
}
}
+ public String getInitFunction(PageParameters pp) {
+ String initStr = null;
+ String swf = getFlashFile(pp.get("swf"));
+ if (!Strings.isEmpty(swf)) {
+ initStr = String.format("initSwf(%s);", new JSONObject()
+ .put("src", swf + new
PageParametersEncoder().encodePageParameters(pp))
+ .put("labels", getStringLabels(448,
449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54,
761, 762, 144))
+ .toString());
+ }
+ return initStr;
+ }
+
private String getFlashFile(StringValue type) {
String fmt;
if (SWF_TYPE_SETTINGS.equals(type.toString())) {
@@ -138,7 +153,15 @@ public class SwfPanel extends BasePanel
}
return String.format(fmt, DEVELOPMENT ==
getApplication().getConfigurationType() ? "debug" : "");
}
-
+
+ public static String getStringLabels(long... ids) {
+ JSONArray arr = new JSONArray();
+ for (long id : ids) {
+ arr.put(new JSONObject().put("id", id).put("value",
Application.getString(id)));
+ }
+ return arr.toString();
+ }
+
private static PageParameters addServer(PageParameters pp, Server s) {
return pp.add("protocol", s.getProtocol()).add("host",
s.getAddress()).add("port", s.getPort()).add("context", s.getWebapp());
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Fri Aug 12 12:16:13 2016
@@ -17,25 +17,30 @@
* under the License.
*/
-function initSwf(swfurl) {
- var general = {
- url : swfurl,
- bgcolor : '#ffffff',
- width : '100%',
- height : '100%',
- id : 'lzapp',
- __lzminimumversion : 8
- };
- var options = $.extend({}, general, {allowfullscreen : 'true'});
+function initSwf(_options) {
+ var options = $.extend({
+ allowfullscreen : 'true',
+ bgcolor : '#ffffff',
+ width : '100%',
+ height : '100%',
+ id : 'lzapp',
+ __lzminimumversion : 8
+ }, _options);
$('div[id="contents"], div[id="contents"] > div').css('height', '100%');
- var embed = $('<embed>').attr('quality', 'high').attr('bgcolor',
options.bgcolor)
- .attr('src', "public/" + options.url)
- .attr('wmode', 'direct').attr('allowfullscreen', true)
+ var embed = $('<embed>')
+ .attr('quality', 'high')
+ .attr('bgcolor', options.bgcolor)
+ .attr('src', "public/" + options.src)
+ .attr('wmode', 'direct')
+ .attr('allowfullscreen', true)
.attr('width', options.width).attr('height', options.height)
- .attr('id', 'lzapp').attr('name', 'lzapp')
- .attr('flashvars', escape($.param(general)))
- .attr('swliveconnect', true).attr('align', 'middle')
- .attr('allowscriptaccess', 'sameDomain').attr('type',
'application/x-shockwave-flash')
+ .attr('id', 'lzapp')
+ .attr('name', 'lzapp')
+ .attr('flashvars', $.param(options))
+ .attr('swliveconnect', true)
+ .attr('align', 'middle')
+ .attr('allowscriptaccess', 'sameDomain')
+ .attr('type', 'application/x-shockwave-flash')
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Fri Aug 12 12:16:13 2016
@@ -58,8 +58,6 @@ import org.apache.openmeetings.web.room.
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONException;
import org.apache.wicket.ajax.json.JSONObject;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -123,7 +121,7 @@ public class RoomPanel extends BasePanel
.put("host", url.getHost())
//.put("port",
cfgDao.getConfValue(CONFIG_FLASH_PORT, String.class, ""))
.put("app", path + r.getId())
- .put("labels",
getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452,
767, 764, 765, 918, 54, 761, 762))
+ .put("labels",
SwfPanel.getStringLabels(448, 449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775,
452, 767, 764, 765, 918, 54, 761, 762))
.toString()
));
broadcast(new RoomMessage(r.getId(),
getUserId(), RoomMessage.Type.roomEnter));
@@ -350,18 +348,6 @@ public class RoomPanel extends BasePanel
}
super.onEvent(event);
}
-
- private String getStringLabels(long... ids) {
- JSONArray arr = new JSONArray();
- try {
- for (long id : ids) {
- arr.put(new JSONObject().put("id",
id).put("value", Application.getString(id)));
- }
- } catch (JSONException e) {
- log.error("", e);
- }
- return arr.toString();
- }
@Override
protected void onBeforeRender() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
Fri Aug 12 12:16:13 2016
@@ -21,7 +21,10 @@ package org.apache.openmeetings.web.room
import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.BasePanel;
+import org.apache.wicket.ajax.json.JSONArray;
+import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -46,17 +49,19 @@ public class SwfPanel extends BasePanel
public String getInitFunction() {
return getInitFunction(new PageParameters());
}
-
+
public String getInitFunction(PageParameters pp) {
String initStr = null;
String swf = getFlashFile(pp.get("swf"));
if (!Strings.isEmpty(swf)) {
- swf += new
PageParametersEncoder().encodePageParameters(pp);
- initStr = String.format("initSwf('%s');", swf);
+ initStr = String.format("initSwf(%s);", new JSONObject()
+ .put("src", swf + new
PageParametersEncoder().encodePageParameters(pp))
+ .put("labels", getStringLabels(448,
449, 450, 451, 758, 447, 52, 53, 1429, 1430, 775, 452, 767, 764, 765, 918, 54,
761, 762, 144))
+ .toString());
}
return initStr;
}
-
+
private String getFlashFile(StringValue type) {
String fmt;
if (SWF_TYPE_SETTINGS.equals(type.toString())) {
@@ -68,7 +73,15 @@ public class SwfPanel extends BasePanel
}
return String.format(fmt, DEVELOPMENT ==
getApplication().getConfigurationType() ? "debug" : "");
}
-
+
+ public static String getStringLabels(long... ids) {
+ JSONArray arr = new JSONArray();
+ for (long id : ids) {
+ arr.put(new JSONObject().put("id", id).put("value",
Application.getString(id)));
+ }
+ return arr.toString();
+ }
+
public SwfPanel(String id, PageParameters pp) {
super(id);
add(new Label("init",
getInitFunction(pp)).setEscapeModelStrings(false));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1756174&r1=1756173&r2=1756174&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Fri Aug 12 12:16:13 2016
@@ -17,25 +17,30 @@
* under the License.
*/
-function initSwf(swfurl) {
- var general = {
- url : swfurl,
- bgcolor : '#ffffff',
- width : '100%',
- height : '100%',
- id : 'lzapp',
- __lzminimumversion : 8
- };
- var options = $.extend({}, general, {allowfullscreen : 'true'});
+function initSwf(_options) {
+ var options = $.extend({
+ allowfullscreen : 'true',
+ bgcolor : '#ffffff',
+ width : '100%',
+ height : '100%',
+ id : 'lzapp',
+ __lzminimumversion : 8
+ }, _options);
$('div[id="contents"], div[id="contents"] > div').css('height', '100%');
- var embed = $('<embed>').attr('quality', 'high').attr('bgcolor',
options.bgcolor)
- .attr('src', "public/" + options.url)
- .attr('wmode', 'direct').attr('allowfullscreen', true)
+ var embed = $('<embed>')
+ .attr('quality', 'high')
+ .attr('bgcolor', options.bgcolor)
+ .attr('src', "public/" + options.src)
+ .attr('wmode', 'direct')
+ .attr('allowfullscreen', true)
.attr('width', options.width).attr('height', options.height)
- .attr('id', 'lzapp').attr('name', 'lzapp')
- .attr('flashvars', escape($.param(general)))
- .attr('swliveconnect', true).attr('align', 'middle')
- .attr('allowscriptaccess', 'sameDomain').attr('type',
'application/x-shockwave-flash')
+ .attr('id', 'lzapp')
+ .attr('name', 'lzapp')
+ .attr('flashvars', $.param(options))
+ .attr('swliveconnect', true)
+ .attr('align', 'middle')
+ .attr('allowscriptaccess', 'sameDomain')
+ .attr('type', 'application/x-shockwave-flash')
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
