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/05/17 04:22:51 UTC
openmeetings git commit: no jira: Jquery need to switched to V3
Repository: openmeetings
Updated Branches:
refs/heads/master fb8e34bfe -> a2aee9856
no jira: Jquery need to switched to V3
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a2aee985
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a2aee985
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a2aee985
Branch: refs/heads/master
Commit: a2aee985613ccb3b9d320a9b4a783bf75a5a8aba
Parents: fb8e34b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed May 17 11:22:44 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed May 17 11:22:44 2017 +0700
----------------------------------------------------------------------
.../openmeetings/web/admin/labels/LabelsForm.java | 8 ++++----
.../apache/openmeetings/web/admin/labels/LangPanel.java | 2 +-
.../org/apache/openmeetings/web/app/Application.java | 5 ++---
.../openmeetings/web/room/sidebar/RoomSidebar.java | 4 ++--
.../web/user/calendar/calendar-functions.js | 10 +++-------
.../java/org/apache/openmeetings/web/user/chat/chat.js | 12 +++++++++++-
pom.xml | 2 +-
7 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
index 95d5538..e61f2db 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
@@ -57,14 +57,14 @@ public class LabelsForm extends AdminBaseForm<StringLabel> {
value = null;
setModelObject(new StringLabel(key, value));
target.add(this);
- target.appendJavaScript("labelsInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new StringLabel(key, value));
target.add(this);
- target.appendJavaScript("labelsInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -76,7 +76,7 @@ public class LabelsForm extends AdminBaseForm<StringLabel> {
}
hideNewRecord();
target.add(panel.listContainer);
- target.appendJavaScript("labelsInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -87,7 +87,7 @@ public class LabelsForm extends AdminBaseForm<StringLabel> {
error("Unexpected error while deleting label:" + e.getMessage()); //TODO localize
}
target.add(panel.listContainer);
- target.appendJavaScript("labelsInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index b280d8a..a8ce7a5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -125,7 +125,7 @@ public class LangPanel extends AdminPanel {
form.setModelObject(fv);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("labelsInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.append("class", getRowClass(fv.getId(), form.getModelObject().getId())));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 18242a5..9c38780 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -25,6 +25,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicati
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
+import static org.apache.wicket.resource.JQueryResourceReference.getV3;
import static org.red5.logging.Red5LoggerFactory.getLogger;
import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
@@ -108,7 +109,6 @@ import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
-import org.apache.wicket.resource.JQueryResourceReference;
import org.apache.wicket.util.collections.ConcurrentHashSet;
import org.apache.wicket.validation.validator.UrlValidator;
import org.slf4j.Logger;
@@ -148,8 +148,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
//chain of Resource Loaders, if not found it will search in Wicket's internal
//Resource Loader for a the property key
getResourceSettings().getStringResourceLoaders().add(0, new LabelResourceLoader());
- //FIXME TODO v3 on the way
- getJavaScriptLibrarySettings().setJQueryReference(JQueryResourceReference.getV2());
+ getJavaScriptLibrarySettings().setJQueryReference(getV3());
getRequestCycleListeners().add(new CsrfPreventionRequestCycleListener() {
@Override
public void onEndRequest(RequestCycle cycle) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 1607d0a..ca190d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -45,6 +45,7 @@ import org.apache.openmeetings.web.room.RoomPanel.Action;
import org.apache.openmeetings.web.room.VideoSettings;
import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -52,7 +53,6 @@ import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -301,7 +301,7 @@ public class RoomSidebar extends Panel {
@Override
protected WebMarkupContainer newTabContainer(String id, String tabId, ITab tab, int index) {
WebMarkupContainer t = super.newTabContainer(id, tabId, tab, index);
- Label link = newTitleLabel("link", tab.getTitle());
+ Component link = newTitleLabel("link", tab.getTitle());
link.add(AttributeModifier.replace("href", "#" + tabId));
link.add(AttributeModifier.append("class", ((OmTab)tab).getCssClass()));
link.add(AttributeModifier.append("title", tab.getTitle()));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
index fe10b46..86ec265 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
@@ -20,20 +20,17 @@
* @author Sebastien Briquet
*/
function getCalendarHeight() {
- return $(window).height() - $('#${markupId}').position().top - 20;
+ return $(window).height() - $('#${markupId}').position().top - 20;
}
-
function setCalendarHeight() {
var cal = $('#${markupId}');
if (cal.length) {
- cal.fullCalendar('option', 'height', getCalendarHeight());
+ cal.fullCalendar('option', 'height', getCalendarHeight());
}
}
-
$(function() {
- $(window).load(function() { setCalendarHeight(); } );
+ $(window).on("load", function() { setCalendarHeight(); } );
});
-
function toggleDatePicker(id) {
var dp = $("#" + id);
dp.datepicker(dp.datepicker("widget").is(":visible") ? "hide" : "show");
@@ -74,7 +71,6 @@ function addCalButton(rtl, id) {
});
dp.hide();
}
-
function setDatepickerDate(id, date) {
$("#"+id).datepicker('setDate', date);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
index ca6548d..cb040b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
@@ -146,7 +146,17 @@ var Chat = function() {
if ($('#chat').length > 0 && m && m.type == "chat") {
if (isClosed()) {
$('#chatPopup .control.block').addClass('ui-state-highlight');
- audio.play();
+ var playPromise = audio.play();
+
+ // In browsers that don’t yet support this functionality,
+ // playPromise won’t be defined.
+ if (playPromise !== undefined) {
+ playPromise.then(function() {
+ // Automatic playback started!
+ }).catch(function(error) {
+ // Automatic playback failed.
+ });
+ }
}
var msg, cm;
while (!!(cm = m.msg.pop())) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a2aee985/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9091953..07d0769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<maven.surefire.version>2.20</maven.surefire.version>
<maven-site.version>3.3</maven-site.version>
<wicket.version>8.0.0-SNAPSHOT</wicket.version>
- <wicketju.version>8.0.0-M5</wicketju.version>
+ <wicketju.version>8.0.0-SNAPSHOT</wicketju.version>
<wickets.version>8.0.0-M5</wickets.version>
<red5-server.version>1.0.9-M6</red5-server.version>
<red5-client.version>1.0.9-M6</red5-client.version>