Repository: openmeetings Updated Branches: refs/heads/3.3.x 66efad90b -> cae53cbb0
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/cae53cbb Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cae53cbb Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cae53cbb Branch: refs/heads/3.3.x Commit: cae53cbb0480d23b787ab159154e6508cd676fb3 Parents: 66efad9 Author: Maxim Solodovnik <[email protected]> Authored: Wed May 17 11:22:44 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed May 17 11:27:52 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/web/admin/labels/LabelsForm.java | 8 ++++---- .../apache/openmeetings/web/admin/labels/LangPanel.java | 2 +- .../org/apache/openmeetings/web/app/Application.java | 6 ++---- .../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 | 4 ++-- 7 files changed, 25 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cae53cbb/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/cae53cbb/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 afef420..0465bcf 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 @@ -122,7 +122,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/cae53cbb/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 19fb3b0..a59c083 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; @@ -107,8 +108,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.request.resource.JavaScriptResourceReference; -import org.apache.wicket.resource.DynamicJQueryResourceReference; import org.apache.wicket.util.collections.ConcurrentHashSet; import org.apache.wicket.validation.validator.UrlValidator; import org.slf4j.Logger; @@ -148,8 +147,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(new JavaScriptResourceReference(DynamicJQueryResourceReference.class, DynamicJQueryResourceReference.VERSION_2)); + getJavaScriptLibrarySettings().setJQueryReference(getV3()); getRequestCycleListeners().add(new CsrfPreventionRequestCycleListener() { @Override public void onEndRequest(RequestCycle cycle) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cae53cbb/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 b09e688..46d3cfd 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 @@ -41,6 +41,7 @@ import org.apache.openmeetings.web.room.RoomBroadcaster; import org.apache.openmeetings.web.room.RoomPanel; import org.apache.openmeetings.web.room.RoomPanel.Action; 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; @@ -48,7 +49,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; @@ -300,7 +300,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/cae53cbb/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/cae53cbb/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/cae53cbb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 317fef8..ca871e7 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ <maven.javadoc.version>2.10.3</maven.javadoc.version> <maven.surefire.version>2.19.1</maven.surefire.version> <maven-site.version>3.3</maven-site.version> - <wicket.version>8.0.0-M5</wicket.version> - <wicketju.version>8.0.0-M5</wicketju.version> + <wicket.version>8.0.0-SNAPSHOT</wicket.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>
