Repository: openmeetings Updated Branches: refs/heads/4.0.x 73472bf0b -> 07c7325e6
[OPENMEETINGS-1768] OmAjaxClientInfoBehavior code improved, minor JS clean-up Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/07c7325e Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/07c7325e Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/07c7325e Branch: refs/heads/4.0.x Commit: 07c7325e6089a5cb033c5801d82cb04514091199 Parents: 73472bf Author: Maxim Solodovnik <[email protected]> Authored: Wed Nov 22 14:20:49 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Nov 22 14:20:49 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/admin/admin.js | 2 +- .../web/common/OmAjaxClientInfoBehavior.java | 16 ++++++++++++++-- .../org/apache/openmeetings/web/room/RoomPanel.java | 8 ++++---- .../openmeetings/web/room/activities/activities.js | 2 +- .../java/org/apache/openmeetings/web/room/room.js | 8 ++++---- .../org/apache/openmeetings/web/room/settings.js | 4 ++-- .../org/apache/openmeetings/web/room/wb/player.js | 2 +- .../org/apache/openmeetings/web/room/wb/wb-area.js | 2 +- .../openmeetings/web/user/chat/ChatPanel.java | 2 +- .../org/apache/openmeetings/web/user/chat/chat.js | 8 ++++---- 10 files changed, 33 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js index f5ed65f..6abd9de 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/admin.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ function adminPanelInit() { - if (typeof extAdminPanelInit === 'function') { + if (typeof(extAdminPanelInit) === 'function') { extAdminPanelInit(); } const f = $('#adminForm'), t = $('#adminTable') http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java index 41f4e2b..d087a11 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmAjaxClientInfoBehavior.java @@ -18,9 +18,12 @@ */ package org.apache.openmeetings.web.common; +import java.util.List; + import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxClientInfoBehavior; +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; @@ -31,12 +34,21 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; public class OmAjaxClientInfoBehavior extends AjaxClientInfoBehavior { private static final long serialVersionUID = 1L; + private static final JavaScriptResourceReference MAIN_JS = new JavaScriptResourceReference(MainPanel.class, "main.js") { + private static final long serialVersionUID = 1L; + + @Override + public List<HeaderItem> getDependencies() { + List<HeaderItem> list = super.getDependencies(); + list.add(JavaScriptHeaderItem.forReference(BrowserInfoForm.JS)); + return list; + } + }; @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); - response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(BrowserInfoForm.JS))); - response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(MainPanel.class, "main.js")))); + response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(MAIN_JS))); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index c489d14..44a4c39 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -596,7 +596,7 @@ public class RoomPanel extends BasePanel { return; } if (!getClient().getUid().equals(c.getUid())) { - handler.appendJavaScript(String.format("if (typeof VideoManager !== 'undefined') {VideoManager.micActivity('%s', %s);}", c.getUid(), obj.getBoolean("active"))); + handler.appendJavaScript(String.format("if (typeof(VideoManager) !== 'undefined') {VideoManager.micActivity('%s', %s);}", c.getUid(), obj.getBoolean("active"))); } } break; @@ -609,7 +609,7 @@ public class RoomPanel extends BasePanel { return; } if (!getClient().getUid().equals(c.getUid())) { - handler.appendJavaScript(String.format("if (typeof VideoManager !== 'undefined') {VideoManager.mute('%s', %s);}", obj.getString("uid"), obj.getBoolean("mute"))); + handler.appendJavaScript(String.format("if (typeof(VideoManager) !== 'undefined') {VideoManager.mute('%s', %s);}", obj.getString("uid"), obj.getBoolean("mute"))); } } break; @@ -621,7 +621,7 @@ public class RoomPanel extends BasePanel { // no luck return; } - handler.appendJavaScript(String.format("if (typeof VideoManager !== 'undefined') {VideoManager.exclusive('%s');}", uid)); + handler.appendJavaScript(String.format("if (typeof(VideoManager) !== 'undefined') {VideoManager.exclusive('%s');}", uid)); } break; } @@ -716,7 +716,7 @@ public class RoomPanel extends BasePanel { if (r.isHidden(RoomElement.Chat)) { getMainPanel().getChat().toggle(handler, true); } - handler.appendJavaScript("if (typeof Room !== 'undefined') { Room.unload(); }"); + handler.appendJavaScript("if (typeof(Room) !== 'undefined') { Room.unload(); }"); Application.exitRoom(getClient()); getMainPanel().getChat().roomExit(r, handler); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js index 0f9e191..635f51f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js @@ -5,7 +5,7 @@ var Activities = function() { function _load() { const s = Settings.load(); - if (typeof s.activity === 'undefined') { + if (typeof(s.activity) === 'undefined') { s.activity = {}; } return s; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index d20509b..edafe4c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -670,7 +670,7 @@ var Room = (function() { holder.removeClass('big').addClass('small'); } Chat.setHeight(h); - if (typeof WbArea !== 'undefined') { + if (typeof(WbArea) !== 'undefined') { const chW = chat.width(); WbArea.resize(sbW + 5, chW + 5, w - chW, h); } @@ -728,11 +728,11 @@ var Room = (function() { $(window).off('resize.openmeetings'); Wicket.Event.unsubscribe("/websocket/closed", _close); Wicket.Event.unsubscribe("/websocket/error", _close); - if (typeof WbArea !== 'undefined') { + if (typeof(WbArea) !== 'undefined') { WbArea.destroy(); WbArea = undefined; } - if (typeof VideoSettings !== 'undefined') { + if (typeof(VideoSettings) !== 'undefined') { VideoSettings.close(); } $('.ui-dialog.user-video').remove(); @@ -760,7 +760,7 @@ var Room = (function() { self.init = _init; self.getMenuHeight = function() { return menuHeight; }; - self.getOptions = function() { return typeof options === 'object' ? JSON.parse(JSON.stringify(options)) : {}; }; + self.getOptions = function() { return typeof(options) === 'object' ? JSON.parse(JSON.stringify(options)) : {}; }; self.setRights = function(_r) { return options.rights = _r; }; self.setSize = _setSize; self.load = _load; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js index a6f5c38..08769bb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js @@ -11,10 +11,10 @@ var VideoSettings = (function() { } function _save(refr) { const _s = Settings.save(s); - if (typeof avSettings === 'function') { + if (typeof(avSettings) === 'function') { avSettings(_s); } - if (refr && typeof VideoManager !== 'undefined' && o.uid) { + if (refr && typeof(VideoManager) !== 'undefined' && o.uid) { VideoManager.refresh(o.uid, s.video); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js index 658b9cd..e764929 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js @@ -27,7 +27,7 @@ var Player = (function() { video.visible = false; poster.width = _o.width; poster.height = _o.height; - if (typeof _o.status === 'undefined') { + if (typeof(_o.status) === 'undefined') { _o.status = {paused: true}; } let playable = false; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js index a6ce597..85a5b8d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js @@ -341,7 +341,7 @@ $(function() { return; //ping } const m = jQuery.parseJSON(msg); - if (m && 'wb' === m.type && typeof WbArea !== 'undefined' && !!m.func) { + if (m && 'wb' === m.type && typeof(WbArea) !== 'undefined' && !!m.func) { WbArea[m.func](m.param); } } catch (err) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java index 6c2f905..9505de7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java @@ -63,7 +63,7 @@ public class ChatPanel extends Panel { if (r.isHidden(RoomElement.Chat)) { return; } - handler.appendJavaScript(String.format("if (typeof Chat == 'object') { Chat.removeTab('%1$s%2$d'); }", ID_ROOM_PREFIX, r.getId())); + handler.appendJavaScript(String.format("if (typeof(Chat) === 'object') { Chat.removeTab('%1$s%2$d'); }", ID_ROOM_PREFIX, r.getId())); StringBuilder sb = new StringBuilder("$(function() {") .append("Chat.setRoomMode(false);"); if (!chat.isShowDashboardChat()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/07c7325e/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 1faaaf0..fadff49 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 @@ -34,7 +34,7 @@ var Chat = function() { } function _load() { const s = Settings.load(); - if (typeof s.chat === 'undefined') { + if (typeof(s.chat) === 'undefined') { s.chat = {}; } return s; @@ -274,7 +274,7 @@ var Chat = function() { $('#chat .messageArea').each(function() { $(this).scrollTop($(this)[0].scrollHeight); }); - if (typeof handler === 'function') { + if (typeof(handler) === 'function') { handler(); } }); @@ -293,7 +293,7 @@ var Chat = function() { } pp.animate(opts, 1000, function() { p.addClass('closed'); - if (typeof handler === 'function') { + if (typeof(handler) === 'function') { handler(); } }); @@ -356,7 +356,7 @@ $(function() { Chat.addMessage(m); break; case "typing": - if (typeof typingActivity === "function") { + if (typeof(typingActivity) === "function") { typingActivity(m.uid, m.active); } break;
