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 2019/09/19 02:16:20 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2093]
setResponsePage with page params is replaced with plain url
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 535e522 [OPENMEETINGS-2093] setResponsePage with page params is replaced with plain url
535e522 is described below
commit 535e522952ba188e4a74269d85ae07cff495a230
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Sep 19 09:16:07 2019 +0700
[OPENMEETINGS-2093] setResponsePage with page params is replaced with plain url
---
.../openmeetings/web/pages/auth/SignInDialog.java | 12 +++--------
.../openmeetings/web/room/VideoSettings.java | 15 +++++++++++++-
.../apache/openmeetings/web/room/raw-settings.js | 24 ++++++++++++++++++++--
.../web/user/dashboard/StartWidgetView.java | 12 ++++-------
.../web/user/dashboard/WelcomeWidgetView.java | 24 +++++++---------------
5 files changed, 50 insertions(+), 37 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index f880d7a..8ad70e4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -56,12 +56,12 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.StatelessForm;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
@@ -267,14 +267,8 @@ public class SignInDialog extends NonClosableDialog<String> {
f.open(target);
}
});
- add(new Link<Void>("netTest") {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick() {
- setResponsePage(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK));
- }
- });
+ add(new WebMarkupContainer("netTest").add(AttributeModifier.append("href"
+ , RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK)).toString())));
add(new WebMarkupContainer("oauthContainer").add(
new ListView<>("oauthList", oauthDao.getActive()) {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
index 7a648d2..2561749 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
@@ -20,6 +20,9 @@ package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getRoomSettings;
+import java.util.List;
+
+import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
@@ -29,10 +32,20 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import com.github.openjson.JSONObject;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
public class VideoSettings extends Panel {
private static final long serialVersionUID = 1L;
- private static final ResourceReference SETTINGS_JS_REFERENCE = new JavaScriptResourceReference(VideoSettings.class, "settings.js");
+ private static final ResourceReference SETTINGS_JS_REFERENCE = new JavaScriptResourceReference(VideoSettings.class, "settings.js") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> list = super.getDependencies();
+ list.add(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference()));
+ return list;
+ }
+ };
public static final String URL = "url";
public static final String FALLBACK = "fallback";
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 9438788..d08969d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -16,8 +16,25 @@ $.widget('openmeetings.iconselectmenu', $.ui.selectmenu, {
return li.append(wrapper).appendTo(ul);
}
});
+var RingBuffer = (function(length) {
+ const buffer = [];
+ let pos = 0;
+
+ return {
+ get: function(key){
+ return buffer[key];
+ }
+ , push: function(item) {
+ buffer[pos] = item;
+ pos = (pos + 1) % length;
+ }
+ , min: function(){
+ return Math.min.apply(Math, buffer);
+ }
+ };
+});
var MicLevel = (function() {
- let ctx, mic, analyser, vol = .0;
+ let ctx, mic, analyser, vol = .0, vals = RingBuffer(100);
function _meterPeer(rtcPeer, cnvs, _micActivity, _error, connectAudio) {
if (!rtcPeer || ('function' !== typeof(rtcPeer.getLocalStream) && 'function' !== typeof(rtcPeer.getRemoteStream))) {
@@ -45,8 +62,9 @@ var MicLevel = (function() {
_error(err);
}
}
- function _meter(analyser, cnvs, _micActivity, _error) {
+ function _meter(_analyser, cnvs, _micActivity, _error) {
try {
+ analyser = _analyser;
analyser.minDecibels = -90;
analyser.maxDecibels = -10;
analyser.fftSize = 256;
@@ -67,6 +85,8 @@ var MicLevel = (function() {
favg += arr[i] * arr[i];
}
vol = Math.sqrt(favg / al);
+ vals.push(vol);
+ console.info(vals.min());
_micActivity(vol);
canvasCtx.fillStyle = color;
if (horiz) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
index c717842..1a503c7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
@@ -27,12 +27,13 @@ import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.HashPage;
import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -50,14 +51,9 @@ public class StartWidgetView extends WidgetView {
protected void onInitialize() {
add(new WebMarkupContainer("step1").add(new PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step2").add(new PublicRoomsEventBehavior()));
- add(new WebMarkupContainer("step3").add(new Link<Void>("avTest") {
- private static final long serialVersionUID = 1L;
+ add(new WebMarkupContainer("step3").add(new WebMarkupContainer("avTest").add(AttributeModifier.append("href"
+ , RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP, APP_TYPE_SETTINGS)).toString()))));
- @Override
- public void onClick() {
- setResponsePage(HashPage.class, new PageParameters().add(APP, APP_TYPE_SETTINGS));
- }
- }));
add(new WebMarkupContainer("step4").add(new PublicRoomsEventBehavior()));
add(new Label("123msg", Application.getString("widget.start.desc")) //Application here is used to substitute {0}
.setEscapeModelStrings(false));
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
index 87a56a9..81f3296 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
@@ -32,11 +32,13 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.pages.HashPage;
import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.wicketstuff.dashboard.Widget;
@@ -73,21 +75,9 @@ public class WelcomeWidgetView extends WidgetView {
((MainPage)getPage()).updateContents(PROFILE_EDIT, target);
}
});
- add(new Link<Void>("netTest") {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick() {
- setResponsePage(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK));
- }
- });
- add(new Link<Void>("avTest") {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick() {
- setResponsePage(HashPage.class, new PageParameters().add(APP, APP_TYPE_SETTINGS));
- }
- });
+ add(new WebMarkupContainer("netTest").add(AttributeModifier.append("href"
+ , RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK)).toString())));
+ add(new WebMarkupContainer("avTest").add(AttributeModifier.append("href"
+ , RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP, APP_TYPE_SETTINGS)).toString())));
}
}